Commit Graph

13 Commits

Author SHA1 Message Date
HMBGERDO
ecc109915a Stamina damage no longer bypass some checks (#23447)
* adjusting stamina damage no longer bypass some checks

* no illness changes

* i surrender on this, let it be
2024-02-04 21:15:20 +00:00
DGamerL
79a7558df7 Revives Organ Datumization (#23397)
* first runthrough lol

* okay make this shit actually work

* nerfs slime people

* fixes

* more changes

* fix

* bim bim bam bam

* ok back in the head becuz i dont give a shit

* Sirryan review

* Sirryan review

* Fixes CI

* Stealthy CI fail

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-01-21 22:23:51 +00:00
Luc
9f9db15c8b Defibs now shock people giving CPR (#23257)
* defibs now shock people giving CPR

* use isnull instead

* humanoid like me
2023-11-24 15:33:01 +00:00
Contrabang
48d7b00a0d CI now bans the use of weird spacing in conditionals (#22777)
* no more spaces

* Matthew 10:22

* fixes

* dgamerl review

* Update code/modules/hydroponics/plant_genes.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/bot/ed209bot.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/pda/PDA.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* fuck

* bah

* Update tools/ci/check_grep2.py

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* oops

* guh

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-11-12 20:59:43 +00:00
Luc
d392209cb5 Reworks CPR, allowing it to extend defibrillation time (#21754)
* Update traditional CPR to loop automatically

* Implement most of the base stuff

* Bring over most defib changes so far

* Checks and fixes

* cleans up some leftovers, getting it ready for review

* Little bit of IPC flavor

* excludes non oxy-breathers, sorry!

* Better rescue breath handling

* Refactor revivability into a status effect

* Adds a little bit of feedback

* Removes the original variables

* Allows for CPR to activate cavity bombs

* Update code/modules/mob/living/carbon/human/human_mob.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* snake case time

* breathid instead

* remove unused proc

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-09 21:59:47 -05:00
DGamerL
db1ed68a7d Tweaks some nuclear agent items (#22119)
* First changes

* Dont forget to do cooldown shit

* I HATE PEOPLE AAAAA

* Defib almost done

* Okay we ball

* Defib done

* I hate bullets

* Sniper done

* More stamina damage

* GDN review + Oops I forgor this

* Update code/datums/components/defibrillator.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Disintegrate go brrrr

* Lewc review

* Ghhhhh

* Final oopsie fixed

* Almost made an oopsie daisy myself

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-07 10:52:48 +01:00
DGamerL
fd46ed6c67 [s] Fixes Nukie modsuit combat defibs not subtracting charge on harm mode (#22186)
* Fixes the oopsie daisy

* Fixes another oopsie daisy
2023-08-31 18:10:04 -05:00
GDN
067ce5670e removes uses of << sound, replaces with send_sound (#21774)
* removes uses of << sound, replaces with send_sound

* readds sound wrappers
2023-07-27 15:57:04 +01:00
Luc
aa9fe479e0 Adds some missing checks for suicides on revivals, prevents clings from suiciding (#21588)
* Add some missing suicide checks on some revives

* Adds a check to morgue trays as well

* Rework defib messaging slightly
2023-07-16 11:32:44 -05:00
Nathan Winters
40927ac3eb Fix some defib bugs (#21353)
* Slightly clean up `undergoing_cardiac_arrest`

* Fix runtime when defibbing a heartless slimeperson

* Slightly clean up `defibrillate`

* Deduplicate this

* Yeet this unused signal

* Yeet these unused return flags

* Minor cleanup

* More cleanup and readability; fix defibs reporting outdated brain damage

* Fix defibrillators healing brain damage

* Fix defib brain damage scaling the wrong way (who the fuck)

* Fix this macro expansion bug (I'm going to become the joker)
2023-07-15 14:52:04 -05:00
Contrabang
4f11b2c875 defib no longer flashes all ghost's screens (#21075) 2023-05-22 22:24:19 +02:00
Luc
b940c1eb21 Allows clings to regenerate without a brain. (#19856)
* 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>
2023-01-20 19:25:51 -05:00
Luc
8b91d8b48e Refactors defib code into a component (#19987)
* Start to datumize the defib.

* Wire everything else up

* connect some loose wires from testing

* More changes from testing

* More cleanups and documentation

* Revert CMO defib to have a 10% heart-attack chance

* Review, clean up giant if statement

* other review things

* sirryan review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* change signals to direct proc calls

* rename variable

* Fix bad argument

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-01-16 20:19:03 -06:00