* The Great Toolening
* oops all belts (incoming self conflict lul)
* defines shouldnt lie
* mini crowbar TODOs
* beeeeeeeeeg crowbar
* oops it needs a design
* purple kit + vendor fix
* add mini crowbar dmi
* oops forgot this
* i am an idiot sandwhich
* im bad at code
* scratch that, i cant read my VSC
* wrench undo + readd to boxes
* nukies too
* man i cant code
* power tools should logically follow
* formatting
* maybe im free?
* forgot inhands
* Update toolbox.dm
* bluespace belt buff (unironic)
* undo for now
* fixes bluespace/tot belts + adds w_class override
* adds small crowbar to e-toolboxes and tot tools
* power tool fix
* Rnd build path
Co-authored-by: Adrer <erwin@lombok.demon.nl>
* design fix
* merge conflict + small fix
* small name fixes
---------
Co-authored-by: Adrer <erwin@lombok.demon.nl>
* Slightly buffs the atmos backpack
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull request process. -->
## What Does This PR Do
Increases the water cap of the atmos firefighting backpack from 200 to 500, to be more in line with the janitor cleaning backpack
<!-- Include a small to medium description of what your PR changes. -->
<!-- Document all changes, as not doing this may delay reviews or even discourage maintainers from merging your PR! -->
<!-- If your PR fixes an issue, add "Fixes #1234" somewhere in the PR description. This will automatically close the bug upon PR submission. -->
## Why It's Good For The Game
Currently, nobody uses the backpack for anything other than metal foam, as the water capacity is simply too little for any effective firefighting, or nanofrost usage.
<!-- Add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->
## Testing
<!-- How did you test the PR, if at all? -->
## Changelog
🆑
tweak: Increased atmos firefighting backpack capacity
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 if you want to overwrite your GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
<!-- If a PR has no impact on players (i.e. a code refactor that does not change functionality) then the entire Changelog heading and contents can be removed. -->
* Maybe actually do what the PR says
* Makes N2O not a trace gas
* Back end for nitrous readout on air alarm
* Makes nitrous appear on atmosphere scanners
* adds N2O bar to air alarm UI
* adds nitrous to PDA scanner
* TGUI Rebuild
* Tweaks to greed ruin and die of fate
* Delay between effects
* moved and updaated traitor items
* More tweaks to traitor item list
* Update code/game/objects/items/weapons/dice.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Sirryan review
* Lets decrease the money even more
* experimental KA instead of alien pistol
* emp dmg for machines when interacting
* brainloss
* Code improvment
* forcewall removal
* Turning into a list
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Custom USSP roles for admins
* Added the sprites for new USSP
* conflict part 2
* Elder Gods please make this work
* new style for soviet box
* Added Soviet headset
* lets fix this conflict
* Die conflict!
* Sirryan review
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Lets solve this conflict
* Die conflict!
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* heh, almost made me use ten percent of my power
* appeasing the GC gods (GDN)
* hee hoo
* Update code/modules/martial_arts/cqc.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Update code/game/objects/items/hand_item.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* more return styling
* Update code/modules/martial_arts/cqc.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* no more wrapper
* the extent of my spriting skills
* fixes double slap sound
* slap emote also works
* try to remember the advanced lessons of CQC
* i hope this fixes the merge conflict
* Chefs are no longer perma-combat trained
* Chef CQC now uses signals to activate parrying
* Makes it easier to add it to other martial arts
* resolving merge conflict from ParadiseSS13#20620
* Revert "resolving merge conflict from ParadiseSS13#20620"
This reverts commit 30ea29a6a8.
* Revert "try to remember the advanced lessons of CQC"
This reverts commit e8daeb4d1a.
* try to not conflict the basics of CQC
* Update code/modules/martial_arts/cqc.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Update code/modules/martial_arts/cqc.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* lol, lmao even
* GDN was right, this is funny
* Update code/modules/martial_arts/cqc.dm
farie review pt. 1
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* Update code/modules/martial_arts/martial.dm
farie review pt. 2
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* Update code/modules/mob/living/carbon/human/human_emote.dm
farie review pt. 3
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* hoopefully fix SM message tracking being really weird
* update some more follow targets
* Apply suggestions from code review
hehe
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Cleans up some loose ends, implements for arrivals announcer too
* Changes target to the new deactivated core
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Ports the Bluespace Light Replacer from BeeStation
* advanced replacer for janitor ERT
* wrong place
* Preventing it from being used over cameras
* Update code/game/objects/items/devices/lightreplacer.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
* bluespace replacer only for gamma
---------
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
* donk pocket rework
* Snowball had a far more sensible way to do this
* lewcc review
* Sirryan review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* I fix?
* Revert "I fix?"
This reverts commit 1517d2e21e.
* please work you stupid .dmi
* WORK DAMN YOU
* will this hypothetically work
* re-adds syndie donk kit
* documented these
* just return
* clause guarded
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
