[MIRROR] EMP cleanup (#11939)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-11-08 02:48:48 -07:00
committed by GitHub
parent 18997e2c84
commit e98a9f484a
122 changed files with 222 additions and 358 deletions

View File

@@ -106,7 +106,7 @@
/obj/item/organ/internal/eyes/proc/additional_flash_effects(var/intensity)
return -1
/obj/item/organ/internal/eyes/emp_act(severity)
if(robotic >= ORGAN_ASSISTED)
return
owner.eye_blurry += (4/severity)
/obj/item/organ/internal/eyes/emp_act(severity, recursive)
..()
if(owner && robotic)
owner.eye_blurry += (4/severity)

View File

@@ -370,9 +370,9 @@ var/list/organ_cache = list()
/obj/item/organ/proc/digitize() //Used to make the circuit-brain. On this level in the event more circuit-organs are added/tweaks are wanted.
robotize()
/obj/item/organ/emp_act(severity)
/obj/item/organ/emp_act(severity, recursive)
for(var/obj/O as anything in src.contents)
O.emp_act(severity)
O.emp_act(severity, recursive)
if(!(robotic >= ORGAN_ASSISTED))
return

View File

@@ -127,10 +127,11 @@
return ..()
/obj/item/organ/external/emp_act(severity)
/obj/item/organ/external/emp_act(severity, recursive)
for(var/obj/O as anything in src.contents)
O.emp_act(severity)
if(!(robotic >= ORGAN_ROBOT) || robotic == ORGAN_NANOFORM) //CHOMPEdit - Proteans handle EMP's differently
O.emp_act(severity, recursive)
if(!(robotic >= ORGAN_ROBOT))
return
var/burn_damage = 0
switch (severity)

View File

@@ -18,7 +18,7 @@
owner.set_stat(CONSCIOUS)
owner.visible_message(span_danger("\The [owner] twitches visibly!"))
/obj/item/organ/internal/cell/emp_act(severity)
/obj/item/organ/internal/cell/emp_act(severity, recursive)
..()
owner.adjust_nutrition(-rand(10 / severity, 50 / severity))
@@ -110,9 +110,8 @@
holder_mob.drop_from_inventory(src)
qdel(src)
/obj/item/organ/internal/mmi_holder/emp_act(severity)
// ..() // VOREStation Edit - Don't take damage
owner?.adjustToxLoss(rand(6/severity, 12/severity))
/obj/item/organ/internal/mmi_holder/emp_act(severity, recursive)
stored_mmi.emp_act(severity, recursive)
/obj/item/organ/internal/mmi_holder/posibrain
name = "positronic brain interface"

View File

@@ -185,7 +185,7 @@
stored_mmi.icon_state = "posi1"
stored_mmi.brainmob.languages = owner.languages
/obj/item/organ/internal/mmi_holder/posibrain/nano/emp_act()
/obj/item/organ/internal/mmi_holder/posibrain/nano/emp_act(severity, recursive)
return //Proteans handle EMP's differently
// The 'out on the ground' object, not the organ holder