cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactors Organ Shocking To Use Signals (#15593)

Browse Source 
* Refactors Organ Shocking To Use Signals

* proper source

* hush you
This commit is contained in:
Fox McCloud
2021-02-26 18:43:11 +00:00
committed by GitHub
parent b49a99d46e
commit c73cc5aa68
7 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/heart.dm
+13 -1
View File
@@ -155,6 +155,17 @@
dead_icon = "heart-c-u-off"
var/attempted_restart = FALSE
/obj/item/organ/internal/heart/cybernetic/upgraded/insert(mob/living/carbon/M, special = FALSE)
..()
RegisterSignal(M, COMSIG_LIVING_MINOR_SHOCK, .proc/shock_heart)
RegisterSignal(M, COMSIG_LIVING_ELECTROCUTE_ACT, .proc/shock_heart)
/obj/item/organ/internal/heart/cybernetic/upgraded/remove(mob/living/carbon/M, special = FALSE)
UnregisterSignal(M, COMSIG_LIVING_MINOR_SHOCK)
UnregisterSignal(M, COMSIG_LIVING_ELECTROCUTE_ACT)
return ..()
/obj/item/organ/internal/heart/cybernetic/upgraded/on_life()
if(!ishuman(owner))
return
@@ -234,8 +245,9 @@
return
necrotize()
/obj/item/organ/internal/heart/cybernetic/upgraded/proc/shock_heart(mob/living/carbon/human/source, intensity)
SIGNAL_HANDLER_DOES_SLEEP
/obj/item/organ/internal/heart/cybernetic/upgraded/shock_organ(intensity)
if(!ishuman(owner))
return
if(emp_proof)
code/modules/surgery/organs/organ.dm
-3
View File
@@ -230,9 +230,6 @@
status &= ~ORGAN_SPLINTED
status |= ORGAN_ROBOT
/obj/item/organ/proc/shock_organ(intensity)
return
/obj/item/organ/proc/remove(var/mob/living/user,special = 0)
if(!istype(owner))
return