From 6b525c8c6c170d4be582a2516368dcdf40c0ca4e Mon Sep 17 00:00:00 2001 From: Heroman Date: Fri, 16 Sep 2022 08:40:34 +1000 Subject: [PATCH] Fixes a few more runtimes. --- code/game/area/areas.dm | 2 +- code/game/objects/items/weapons/storage/backpack_vr.dm | 5 +++-- code/modules/events/prison_break.dm | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index d0cdeb0187..5125b09278 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -465,7 +465,7 @@ var/list/mob/living/forced_ambiance_list = new /area/proc/prison_break(break_lights = TRUE, open_doors = TRUE, open_blast_doors = TRUE) var/obj/machinery/power/apc/theAPC = get_apc() - if(theAPC.operating) + if(theAPC && theAPC.operating) if(break_lights) for(var/obj/machinery/power/apc/temp_apc in src) temp_apc.overload_lighting(70) diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index 5588969224..1a872e99ac 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -45,8 +45,9 @@ return var/datum/sprite_accessory/tail/taur/TT = H.tail_style - item_state = "[icon_base]_[TT.icon_sprite_tag]" //icon_sprite_tag is something like "deer" - return 1 + if(istype(TT)) + item_state = "[icon_base]_[TT.icon_sprite_tag]" //icon_sprite_tag is something like "deer" + return 1 diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm index 2575873aae..44b30fe298 100644 --- a/code/modules/events/prison_break.dm +++ b/code/modules/events/prison_break.dm @@ -64,7 +64,7 @@ var/obj/machinery/power/apc/theAPC = null for(var/area/A in areas) theAPC = A.get_apc() - if(theAPC.operating) //If the apc's off, it's a little hard to overload the lights. + if(theAPC && theAPC.operating) //If the apc's off, it's a little hard to overload the lights. for(var/obj/machinery/light/L in A) L.flicker(10)