From 24addbd6cea6e7d6f8a4743441f767cb05c2f3d9 Mon Sep 17 00:00:00 2001 From: Regen Date: Thu, 17 Mar 2016 19:29:02 +0100 Subject: [PATCH 1/7] Makes robotic hearts fail when EMP'd People with robotic hearts will now get a heart attack if subject to an EMP Engineers stay away from the singularity --- code/modules/surgery/organs/organ.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index e3b7f49abc4..b4b20f0bec2 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -256,6 +256,11 @@ var/list/organ_cache = list() if(3.0) take_damage(0,3) +/obj/item/organ/internal/heart/emp_act(intensity) + if(owner && robotic) + owner.heart_attack = 1 + owner.visible_message("[owner] clutches their chest and gasps!","You clutch your chest in pain!") + /obj/item/organ/proc/remove(var/mob/living/user,special = 0) if(!istype(owner)) return From e00a15b579dc32a251f5ada81d2c6e65c0e60a81 Mon Sep 17 00:00:00 2001 From: Regen Date: Thu, 17 Mar 2016 19:33:55 +0100 Subject: [PATCH 2/7] Internal organ fix This should fix internal robotic organs not being damaged by EMP's according to @Crazylemon64 --- code/modules/surgery/organs/organ.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index b4b20f0bec2..33bb8a41718 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -248,13 +248,13 @@ var/list/organ_cache = list() return switch (severity) if (1.0) - take_damage(0,20) + take_damage(20,0) return if (2.0) - take_damage(0,7) + take_damage(7,0) return if(3.0) - take_damage(0,3) + take_damage(3,0) /obj/item/organ/internal/heart/emp_act(intensity) if(owner && robotic) From 509683af8c5e326fba5e9a5cb63fac80f95bfff6 Mon Sep 17 00:00:00 2001 From: Regen Date: Thu, 17 Mar 2016 21:20:01 +0100 Subject: [PATCH 3/7] Changes --- code/modules/surgery/organs/organ.dm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index 33bb8a41718..32bca624bc6 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -256,10 +256,29 @@ var/list/organ_cache = list() if(3.0) take_damage(3,0) +/obj/item/organ/internal/emp_act(severity) + if(!robotic) + return + if(ORGAN_ROBOT) + switch (severity) + if (1.0) + take_damage(20,1) + return + if (2.0) + take_damage(7,1) + return + if(3.0) + take_damage(3,1) + else if(ORGAN_ASSISTED) + take_damage(11,1) + /obj/item/organ/internal/heart/emp_act(intensity) - if(owner && robotic) + if(owner && robotic == 2) owner.heart_attack = 1 owner.visible_message("[owner] clutches their chest and gasps!","You clutch your chest in pain!") + return + else if(owner && robotic == 1) + take_damage(11,1) /obj/item/organ/proc/remove(var/mob/living/user,special = 0) if(!istype(owner)) From 76f77dc514842aa4ea56a3f2720243b2faa2b631 Mon Sep 17 00:00:00 2001 From: Regen Date: Fri, 18 Mar 2016 15:25:31 +0100 Subject: [PATCH 4/7] Tigercat's fix's Don't blame me if shit's wack anymore --- code/modules/surgery/organs/organ.dm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index 32bca624bc6..154a7eb5337 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -257,26 +257,21 @@ var/list/organ_cache = list() take_damage(3,0) /obj/item/organ/internal/emp_act(severity) - if(!robotic) - return - if(ORGAN_ROBOT) + if(robotic == ORGAN_ROBOT) switch (severity) if (1.0) take_damage(20,1) - return if (2.0) take_damage(7,1) - return if(3.0) take_damage(3,1) - else if(ORGAN_ASSISTED) + else if(robotic == ORGAN_ASSISTED) take_damage(11,1) /obj/item/organ/internal/heart/emp_act(intensity) if(owner && robotic == 2) owner.heart_attack = 1 owner.visible_message("[owner] clutches their chest and gasps!","You clutch your chest in pain!") - return else if(owner && robotic == 1) take_damage(11,1) From 8aab1d9438dfe63fbe1865529421ba21f203816a Mon Sep 17 00:00:00 2001 From: Regen Date: Fri, 18 Mar 2016 17:57:49 +0100 Subject: [PATCH 5/7] Fuck sake tiger --- code/modules/surgery/organs/organ.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index 154a7eb5337..73ab9237596 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -257,7 +257,9 @@ var/list/organ_cache = list() take_damage(3,0) /obj/item/organ/internal/emp_act(severity) - if(robotic == ORGAN_ROBOT) + if(!robotic) + return + if(ORGAN_ROBOT) switch (severity) if (1.0) take_damage(20,1) @@ -265,7 +267,7 @@ var/list/organ_cache = list() take_damage(7,1) if(3.0) take_damage(3,1) - else if(robotic == ORGAN_ASSISTED) + else if(ORGAN_ASSISTED) take_damage(11,1) /obj/item/organ/internal/heart/emp_act(intensity) From 626e1f650b1794681238f30b704ff1a88e2d09c6 Mon Sep 17 00:00:00 2001 From: Regen Date: Sat, 19 Mar 2016 01:19:19 +0100 Subject: [PATCH 6/7] I hope this is the last one --- code/modules/surgery/organs/organ.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index 73ab9237596..7c67c3ea730 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -259,7 +259,7 @@ var/list/organ_cache = list() /obj/item/organ/internal/emp_act(severity) if(!robotic) return - if(ORGAN_ROBOT) + if(robotic == 2) switch (severity) if (1.0) take_damage(20,1) @@ -267,7 +267,7 @@ var/list/organ_cache = list() take_damage(7,1) if(3.0) take_damage(3,1) - else if(ORGAN_ASSISTED) + else if(robotic == 1) take_damage(11,1) /obj/item/organ/internal/heart/emp_act(intensity) From 9e409dd89c3f04178695c95a53b669d36425e795 Mon Sep 17 00:00:00 2001 From: Regen Date: Sat, 19 Mar 2016 02:23:27 +0100 Subject: [PATCH 7/7] People giving wrong information is fun External organs will now take burn damage from EMP's again --- code/modules/surgery/organs/organ.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index 7c67c3ea730..b6686b83b8d 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -248,13 +248,13 @@ var/list/organ_cache = list() return switch (severity) if (1.0) - take_damage(20,0) + take_damage(0,20) return if (2.0) - take_damage(7,0) + take_damage(0,7) return if(3.0) - take_damage(3,0) + take_damage(0,3) /obj/item/organ/internal/emp_act(severity) if(!robotic)