tiny suit jacket suit storage fix #6393
Conversation
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Mapping
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
cm13-github
removed
the
Merge Conflict
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
code/modules/clothing/suits/jobs.dm
Outdated
| /obj/item/device/analyzer, | ||
| /obj/item/device/multitool, | ||
| /obj/item/device/pipe_painter, | ||
| /obj/item/device/radio, | ||
| /obj/item/device/t_scanner, | ||
| /obj/item/tool/crowbar, | ||
| /obj/item/tool/screwdriver, | ||
| /obj/item/tool/weldingtool, | ||
| /obj/item/tool/wirecutters, | ||
| /obj/item/tool/wrench, | ||
| /obj/item/clothing/mask/gas, | ||
|
|
||
| /obj/item/weapon/gun, | ||
| /obj/item/tool/lighter, | ||
| /obj/item/weapon/baton, | ||
| /obj/item/restraint/handcuffs, | ||
| /obj/item/device/binoculars, | ||
| /obj/item/attachable/bayonet, | ||
| /obj/item/storage/belt/gun/m4a3, | ||
| /obj/item/storage/belt/gun/m44, | ||
| /obj/item/storage/belt/gun/mateba, | ||
| /obj/item/storage/belt/gun/smartpistol, | ||
|
|
||
| /obj/item/device/flashlight, | ||
| /obj/item/device/healthanalyzer, | ||
| /obj/item/device/radio, | ||
| /obj/item/tank/emergency_oxygen, | ||
| /obj/item/tool/crowbar, | ||
| /obj/item/tool/crew_monitor, | ||
| /obj/item/storage/large_holster/machete, | ||
| /obj/item/storage/large_holster/katana, | ||
| /obj/item/device/motiondetector, |
There was a problem hiding this comment.
There's a bunch of duplicates in this list. And why are we allowing all these things in a lawyer jacket? A whole machete holster? A whole crowbar? Entire gun belts?
There was a problem hiding this comment.
I'll fix the duplicates wasn't very careful with my code
Machete holster is on a sling
crowbar I can remove (just let me know if u want it gone)
gun belts are belts (https://www.everydaymarksman.co/wp-content/uploads/2019/02/old-battle-belt-3.jpg), you clip them around your waist ingame. you can do it to any jacket in CM including the one given to Marines. if its bad then I can remove it from all of the code but I am pretty sure its intended in lore, in nature and in code
This was brought to me as a bug fix because other jackets CAN carry waist/belts/buckled things while this jacket in particular can't carry much at all
So all I did in this PR was bring it up to the standard of similar jackets being used in CM
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
|
stale exempt until reviewed |
Drulikar
added
Stale Exempt
About the pull request
allows blue suit jacket to hold stuff
some caps spellchecks on some suits
makes lawyer/bluesuit into just /lawyer as a parent
Explain why it's good for the game
smelly brought to me the bug with the lawyer suit, bug fix good
Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the screenshots and the
<details>tags.spawned jacket fine, put jacket on, can use suit store fine
Changelog
🆑
fix: suit jacket etc can now hold items in suit storage
spellcheck: decapitalized suit jacket etc
code: makes suit/storage/lawyer parent(previously blue) instead of being 2 childs purple & blue.
del: removes suits ability to hold misc items such as casings, pipe painter, tscanner, pen/cigs in suit storage as they are either nonexistant, generally unused or otherwise can be placed in more appropiate spaces
/:cl: