Merge pull request #4907 from CHOMPStation2/upstream-merge-13622

[MIRROR] [MIRROR] Organs transfer EMPs to their contents
This commit is contained in:
Nadyr
2022-09-10 22:07:02 -04:00
committed by GitHub
2 changed files with 6 additions and 0 deletions
+3
View File
@@ -368,6 +368,9 @@ var/list/organ_cache = list()
robotize()
/obj/item/organ/emp_act(severity)
for(var/obj/O as anything in src.contents)
O.emp_act(severity)
if(!(robotic >= ORGAN_ASSISTED))
return
for(var/i = 1; i <= robotic; i++)
+3
View File
@@ -115,6 +115,9 @@
return ..()
/obj/item/organ/external/emp_act(severity)
for(var/obj/O as anything in src.contents)
O.emp_act(severity)
if(!(robotic >= ORGAN_ROBOT))
return
var/burn_damage = 0