From 713e0cc95f702801bebedcffabbcae30c4398ed3 Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Sun, 11 Sep 2022 07:02:27 +1000
Subject: [PATCH] Merge pull request #13622 from
 VOREStation/upstream-merge-8697

[MIRROR] 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 c91fa50481..718234893e 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 48604444bf..fe69463090 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -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