Fix instances of duplicate variable definitions in types#50627
Merged
spookydonut merged 8 commits intotgstation:masterfrom Apr 24, 2020
sohpeach:dupe_fixes
Merged
Fix instances of duplicate variable definitions in types#50627spookydonut merged 8 commits intotgstation:masterfrom sohpeach:dupe_fixes
spookydonut merged 8 commits intotgstation:masterfrom
sohpeach:dupe_fixes
Conversation
Member
|
this fixes the issue with cops not getting all their gear |
spookydonut
approved these changes
Apr 24, 2020
tgstation-server
added a commit
that referenced
this pull request
Apr 24, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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:
/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.light_colornot being set. Now it's set (you'll have to squint):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: