From d9c2b76522b13e3d9fa3f6744816f6a68d809aa6 Mon Sep 17 00:00:00 2001 From: Tortoise <64306407+OneAsianTortoise@users.noreply.github.com> Date: Sun, 13 Mar 2022 01:59:14 +0800 Subject: [PATCH] You can no longer survive nuke by being inside lockers, however, you are guaranteed to survive it while inside a fridge. (#65287) * Nuke Fridge You can no longer survive a nuke blast by being inside locker, however, you have 10% chance of surviving it while inside a fridge. * Patch Thanks SuperNovaa41, Fikou, and Ebb * var name change Thanks MrMelbert * Var name change 2 turf * 100% survive chance * Yeah * Update code/modules/antagonists/nukeop/equipment/nuclearbomb.dm * Update code/modules/antagonists/nukeop/equipment/nuclearbomb.dm Co-authored-by: ShizCalev --- .../nukeop/equipment/nuclearbomb.dm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index cb2bedfe9ca..c9099b86532 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -615,7 +615,14 @@ GLOBAL_VAR(station_nuke_source) /proc/KillEveryoneOnStation() for(var/mob/living/victim as anything in GLOB.mob_living_list) - if(victim.stat != DEAD && is_station_level(victim.z)) + var/turf/target_turf = get_turf(victim) + if(istype(victim.loc, /obj/structure/closet/secure_closet/freezer)) + var/obj/structure/closet/secure_closet/freezer/freezer = victim.loc + if(!freezer.jones) + to_chat(victim, span_boldannounce("You hold onto \the [victim.loc] as the nuclear bomb goes off. Luckily as \the [victim.loc] is lead-lined, you survive.")) + freezer.jones = TRUE + continue + if(victim.stat != DEAD && target_turf && is_station_level(target_turf.z)) to_chat(victim, span_userdanger("You are shredded to atoms!")) victim.gib() @@ -624,7 +631,14 @@ GLOBAL_VAR(station_nuke_source) return for(var/_victim in GLOB.mob_living_list) var/mob/living/victim = _victim - if(victim.stat != DEAD && victim.z == z) + var/turf/target_turf = get_turf(victim) + if(istype(victim.loc, /obj/structure/closet/secure_closet/freezer)) + var/obj/structure/closet/secure_closet/freezer/freezer = victim.loc + if(!freezer.jones) + to_chat(victim, span_boldannounce("You hold onto \the [victim.loc] as the nuclear bomb goes off. Luckily as \the [victim.loc] is lead-lined, you survive.")) + freezer.jones = TRUE + continue + if(victim.stat != DEAD && target_turf && target_turf.z == z) to_chat(victim, span_userdanger("You are shredded to atoms!")) victim.gib()