From df23244a020dd3801b4ed9528e92ba8b111ed5a4 Mon Sep 17 00:00:00 2001 From: Spookerton Date: Thu, 1 Sep 2022 10:57:53 +0100 Subject: [PATCH 1/2] Merge pull request #8697 from Atermonera/organ-implant-emp Organs transfer EMPs to their contents --- code/modules/organs/organ.dm | 3 +++ code/modules/organs/organ_external.dm | 3 +++ 2 files changed, 6 insertions(+) diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 646787d088..bd77804b09 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -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++) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 9ef9460c60..02eddbcc05 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -114,6 +114,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