Skip to content

Fix instances of duplicate variable definitions in types#50627

Merged
spookydonut merged 8 commits intotgstation:masterfrom
sohpeach:dupe_fixes
Apr 24, 2020
Merged

Fix instances of duplicate variable definitions in types#50627
spookydonut merged 8 commits intotgstation:masterfrom
sohpeach:dupe_fixes

Conversation

@sohpeach
Copy link
Copy Markdown

@sohpeach sohpeach commented Apr 23, 2020

About The Pull Request

I'm removing bits of code that were defining the same variable inside a type multiple times.
It's like this PR: #46978

Why It's Good For The Game

Cleans code and re-adds some things that were accidentally removed. I'll provide details:

  • The box of beanbags (/obj/item/storage/box/beanbag) lost its icon at some point. It seems like this was a mistake, so I've re-added that and remove the duplicate vars.
    image
  • The Shambler's Vendor had a typo leading to its light_color not being set. Now it's set (you'll have to squint):
    image
  • The cargo export for micro batteries was overriding the export for nano batteries. I fixed this, but there's another bug involving them (cargo exports no longer include subtypes when they shouldn't #50628) that makes testing this change awkward (I did test it though.)
  • I also fixed the bag that cops in Families were spawning with being broken duped vars. @Iamgoofball says this change is the intended behaviour.

The rest is obvious enough.

Changelog

🆑
tweak: Beat cop in families now spawn with a cop dufflebag
fix: box of beanbags now has its correct icon instead of a generic box
fix: Shambler's Vendor now has correctly coloured ominous glow
fix: serving trays are no longer hidden from the autolathe
code: removed some instances of duplicate variables being defined in types
/:cl:

@tgstation-server tgstation-server added Code Improvement Code is now easier to copy paste. Fix Rewrites a bug so it appears in different circumstances Tweak labels Apr 23, 2020
@Iamgoofball
Copy link
Copy Markdown
Member

this fixes the issue with cops not getting all their gear

@spookydonut spookydonut merged commit 9db363b into tgstation:master Apr 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Code Improvement Code is now easier to copy paste. Fix Rewrites a bug so it appears in different circumstances

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants