From 4e4285dccf8fc363f1786358d7c954d36a7a36c2 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Thu, 30 Apr 2015 13:49:32 -0700 Subject: [PATCH] Fix plasma windows breaking due to temperature So uh, I forgot to define fire_act AND temperature_act as returns for the plasma windows, so the toxins chamber kept breaking open. Whoopsies. --- code/game/objects/structures/window.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index ef1e93f2db2..f0f4c9855f3 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -407,11 +407,17 @@ var/global/wcColored update_nearby_icons() return +/obj/structure/window/plasmabasic/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) + if(exposed_temperature > T0C + 32000) + hit(round(exposed_volume / 1000), 0) + ..() + /obj/structure/window/plasmabasic/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature > T0C + 32000) hit(round(exposed_volume / 1000), 0) ..() + /obj/structure/window/plasmareinforced name = "reinforced plasma window" desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof." @@ -430,6 +436,9 @@ var/global/wcColored update_nearby_icons() return +/obj/structure/window/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) + return + /obj/structure/window/plasmareinforced/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) return