From f6b8fe55476401b380911dfb91c52a06b6332963 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Fri, 18 Sep 2020 10:44:38 -0400 Subject: [PATCH] Makes CNS rebooter stun on EMP (#14234) * Makes CNS rebooter stun on EMP * Kyets requests Co-authored-by: Qwertytoforty --- code/datums/outfits/outfit_admin.dm | 2 +- code/datums/uplink_item.dm | 6 +++--- code/game/jobs/job/central.dm | 2 +- code/modules/surgery/organs/augments_internal.dm | 9 +++++++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index 2b48d5da5f7..d5be5f50f35 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -242,7 +242,7 @@ /obj/item/organ/internal/cyberimp/eyes/shield, /obj/item/organ/internal/cyberimp/eyes/hud/security, /obj/item/organ/internal/cyberimp/eyes/xray, - /obj/item/organ/internal/cyberimp/brain/anti_stun, + /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened, /obj/item/organ/internal/cyberimp/chest/nutriment/plus, /obj/item/organ/internal/cyberimp/arm/combat/centcom ) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 8a29d2cb0d0..42f74e234a0 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -1563,11 +1563,11 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 10 /datum/uplink_item/cyber_implants/antistun - name = "CNS Rebooter Implant" - desc = "This implant will help you get back up on your feet faster after being stunned. \ + name = "Hardened CNS Rebooter Implant" + desc = "This implant will help you get back up on your feet faster after being stunned. It is invulnerable to EMPs. \ Comes with an automated implanting tool." reference = "CIAS" - item = /obj/item/organ/internal/cyberimp/brain/anti_stun + item = /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened cost = 12 /datum/uplink_item/cyber_implants/reviver diff --git a/code/game/jobs/job/central.dm b/code/game/jobs/job/central.dm index f91460ba234..8684ca7d1b0 100644 --- a/code/game/jobs/job/central.dm +++ b/code/game/jobs/job/central.dm @@ -94,7 +94,7 @@ ) cybernetic_implants = list( /obj/item/organ/internal/cyberimp/eyes/xray, - /obj/item/organ/internal/cyberimp/brain/anti_stun, + /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened, /obj/item/organ/internal/cyberimp/chest/nutriment/plus, /obj/item/organ/internal/cyberimp/arm/combat/centcom ) diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index b211d903e8a..8e007f60f89 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -128,6 +128,14 @@ origin_tech = "materials=5;programming=4;biotech=5" var/stun_max_amount = 2 +/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened + name = "Hardened CNS Rebooter implant" + emp_proof = TRUE + +/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened/Initialize(mapload) + . = ..() + desc += " The implant has been hardened. It is invulnerable to EMPs." + /obj/item/organ/internal/cyberimp/brain/anti_stun/on_life() ..() if(crit_fail) @@ -138,6 +146,7 @@ owner.SetWeakened(stun_max_amount) /obj/item/organ/internal/cyberimp/brain/anti_stun/emp_act(severity) + ..() if(crit_fail || emp_proof) return crit_fail = TRUE