* 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>
* dignitary, human, items, spawning
* garment bag update
* dignitary icons
* ntrep cap
* gloves and hat fix
* dignitary icons part 2 and misc code
* minor stuff
* hat fix from updates also drask and grey suit slot
* minor description discrepancy
* cane resprite
* added check for STATUS_EFFECT_SILENCED when we want to emit emote sound. If /mob/living has this flag, emote wont emit sound. Less ways to spam sounds when you supposed to be silent
* Revert "added check for STATUS_EFFECT_SILENCED when we want to emit emote sound. If /mob/living has this flag, emote wont emit sound. Less ways to spam sounds when you supposed to be silent"
This reverts commit bc093ba01f.
* new status effect absolute silence, applying when using fiber garrote to silence all emote sounds
* comments update, status set function standartisation
* Update code/datums/emote.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* paperwork so boring it kills you
* it's worth a bit more now
* Backup in case you poison yourself
* Virologist gets it, accurate description
* I promise im literate
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* No more charcoal, time for gloves
* Turns comments into auto-doc
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* and here's the sleeper
* Client-less animals sleep for longer
* Fixes sleep length
* never mind, animals can't be pushed :(
* pronounce
* Ensure they aren't already sleeping
* Apply suggestions from code review
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
---------
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* You asked
* Tweaks
* Update eftpos.dm
* Adding registers
* good luck meta you'll need it
* Update eftpos.dm
* More sounds
* More sounds, you can pay as long as you're close to the register.
* Tone down the edits, chefs will figure it out
* tim allen grunt
* Update eftpos.dm
* Update eftpos.dm
* Update code/modules/economy/economy_machinery/eftpos.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Ceres is a thing now
* Fix merge
* Update eftpos.dm
---------
Co-authored-by: Ryan <80364400+Sirryan2002@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
