* First commit for ERT medic kit rework
* Value adjustment for pill bottles and patch pack
This was intended for the first commit
* removes the empty containers previously created
* Update code/game/objects/items/weapons/storage/firstaid.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/game/objects/items/weapons/storage/firstaid.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Merge conflict resolution
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* moves the combat defib out of the first aid kit, tweaks both costs
* no more synthflesh patches
* i just a little stupid
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* we just a little stupid
* deletes stims, really not needed
webedit lol
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Janitorial equipment tweaks and advanced cleaner
* cleaner availability tweaks
* old cleaner for drones
* Mop capacity buff
* advanced cleaner for sol traders
* conflict part 1
* Merge branch 'master' into janitorial_tweaks
* Revert "Merge branch 'master' into janitorial_tweaks"
This reverts commit 47129ea819.
* Revert "Revert "Merge branch 'master' into janitorial_tweaks""
This reverts commit a8c520b069.
* hahahahaha
* hahaha part 2
* hahaha part 3
* cerestation edit
* adv cleaner comes with 500 now and ERT belt
* lube spray upper case and moving it to spray.dm
* Move brain organ code where it belongs
* Rename too
* WIP, but hey, it kinda works now.
* Account for a few missing heads
* Remove vital check, killing the user on death
* Let defibs and scanners better deal with these
* Remove debug brains
* Clean up some more contingencies
* More head checks
* Update code/modules/antagonists/changeling/datum_changeling.dm
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* Fixes up signal business
* some stuff from sean's review
* Add some type safety checks for heads
* oops
* Update code/game/objects/items/weapons/cosmetics.dm
get this in there too
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* Remove decap sword
* Quick suggestions
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Addresses shedding problems
* Add new defib changes
* this is why we have CI
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* technically functional
* technically functional
* more logically coded, credit to Contra and Mira
* yes this is more logical
* Sean and Fox reviews
* webeditor heresy
* Readability & styling
* Fix cryocells not respecting mob's max health/not ignoring robotic limbs
* Only process occupant if we have power
* Fix cryocell injection cooldown being tracked improperly
* Don't kick them while they're down
* Minor cleanup
* Fix for a hacky fix
* Fix Cryoxadone sometimes using outdated cryocell temperature
* This didn't do anything
* Bitflag ops: readability+styling
* screwdriver_act my beloved
* convert to returns instead of . / lewcc review
* it will be done
* i'm a little bit stupid, but now time to test
* sometimes I get excited and press the commit
* The great test has been completed
* oh wow oh wow, lewc review
* found one last one
* Steel review
* Lewc review
* quick sirryan review
* removes stupid comments (old coders I blame)
* sirryan review two
* whoops...
* hal review
* the fix to the fix to the fix
* Revert "the fix to the fix to the fix"
FUCK I pushed to the wrong branch
This reverts commit a96fe98781.
* Allows for deepfrying ice
* formatting
* Almost forgot this
* Spacing
* Sure, scream too
* Changes oil reaction a bit
- Cooking oil now burns off to an inert version
- The oil deposits yellow oil on the ground too
* FUck I deleted iodine
* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
* Steel review
* review
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
