cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13622 from VOREStation/upstream-merge-8697

Browse Source 
[MIRROR] Organs transfer EMPs to their contents
This commit is contained in:
Heroman3003
2022-09-11 07:02:27 +10:00
committed by CHOMPStation2
parent c05c3ea8d9
commit 713e0cc95f
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/organs/organ.dm
View File

@@ -368,6 +368,9 @@ var/list/organ_cache = list()
robotize() robotize()
/obj/item/organ/emp_act(severity) /obj/item/organ/emp_act(severity)
for(var/obj/O as anything in src.contents)
O.emp_act(severity)
if(!(robotic >= ORGAN_ASSISTED)) if(!(robotic >= ORGAN_ASSISTED))
return return
for(var/i = 1; i <= robotic; i++) for(var/i = 1; i <= robotic; i++)

3
code/modules/organs/organ_external.dm
View File

@@ -115,6 +115,9 @@
return ..() return ..()
/obj/item/organ/external/emp_act(severity) /obj/item/organ/external/emp_act(severity)
for(var/obj/O as anything in src.contents)
O.emp_act(severity)
if(!(robotic >= ORGAN_ROBOT)) if(!(robotic >= ORGAN_ROBOT))
return return
var/burn_damage = 0 var/burn_damage = 0