From dfc74ebde685339ae5849f9175716defb79c7c87 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Wed, 29 Apr 2015 16:56:12 -0700 Subject: [PATCH] Modify fire_act to temperature_expose where needed This commit changes a bunch of objects fire_act's to temperature_expose, to allow for superhot gas to act like an actual hotspot. This behaviour is consistant with -tg-. --- code/game/machinery/alarm.dm | 2 +- code/game/machinery/atmoalter/canister.dm | 2 +- code/game/mecha/mecha.dm | 2 +- code/game/objects/effects/aliens.dm | 4 ++-- code/game/objects/effects/effect_system.dm | 2 +- code/game/objects/effects/glowshroom.dm | 2 +- code/game/objects/effects/spiders.dm | 2 +- code/game/objects/items/latexballoon.dm | 2 +- code/game/objects/items/stacks/sheets/leather.dm | 2 +- code/game/objects/structures/false_walls.dm | 10 ++++++++++ code/game/objects/structures/grille.dm | 2 +- code/game/objects/structures/window.dm | 2 +- code/modules/events/spacevine.dm | 1 + .../mob/living/carbon/alien/special/facehugger.dm | 2 +- code/modules/power/lighting.dm | 2 +- 15 files changed, 25 insertions(+), 14 deletions(-) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index b13feb9f822..92ae8adfaab 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -1099,7 +1099,7 @@ FIRE ALARM else icon_state = "fire0" -/obj/machinery/firealarm/fire_act(datum/gas_mixture/air, temperature, volume) +/obj/machinery/firealarm/temperature_expose(datum/gas_mixture/air, temperature, volume) if(src.detecting) if(temperature > T0C+200) src.alarm() // added check of detector status here diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 714961758d8..99782c1b022 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -240,7 +240,7 @@ update_flag return 1 return 0 -/obj/machinery/portable_atmospherics/canister/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/machinery/portable_atmospherics/canister/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature > temperature_resistance) health -= 5 healthcheck() diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 521716c44a5..0785ff11b29 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -668,7 +668,7 @@ check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT),1) return -/obj/mecha/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/mecha/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature>src.max_temperature) src.log_message("Exposed to dangerous temperature.",1) src.take_damage(5,"fire") diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index 2b0aa6a79f7..cca19e50a98 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -231,7 +231,7 @@ del(src) -/obj/structure/alien/weeds/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/structure/alien/weeds/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature > 300) health -= 5 healthcheck() @@ -389,7 +389,7 @@ del(src) //Remove the egg after it has been hit after bursting. -/obj/structure/alien/egg/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/structure/alien/egg/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature > 500) health -= 5 healthcheck() diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index d1fb5e583d1..d5d3555e12d 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -952,7 +952,7 @@ steam.start() -- spawns the effect // foam disolves when heated // except metal foams -/obj/effect/effect/foam/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/effect/effect/foam/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(!metal && prob(max(0, exposed_temperature - 475))) flick("[icon_state]-disolve", src) diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index e8b8cc4bdaf..edb7031f1e4 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -156,7 +156,7 @@ else return -/obj/effect/glowshroom/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/effect/glowshroom/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature > 300) endurance -= 5 CheckEndurance() diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index ad68762c631..53178432ef6 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -47,7 +47,7 @@ if(health <= 0) qdel(src) -/obj/effect/spider/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/effect/spider/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature > 300) health -= 5 healthcheck() diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index daab9b55a69..9b02799e496 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -38,7 +38,7 @@ /obj/item/latexballon/bullet_act() burst() -/obj/item/latexballon/fire_act(datum/gas_mixture/air, temperature, volume) +/obj/item/latexballon/temperature_expose(datum/gas_mixture/air, temperature, volume) if(temperature > T0C+100) burst() return diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 97bf00120ef..ab86e4994cf 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -117,7 +117,7 @@ //Step two - washing..... it's actually in washing machine code. //Step three - drying -/obj/item/stack/sheet/wetleather/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/item/stack/sheet/wetleather/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) ..() if(exposed_temperature >= drying_threshold_temperature) wetness-- diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 035c3d472d3..b69126768e0 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -261,6 +261,16 @@ mineral = "plasma" walltype = "plasma" +/obj/structure/falsewall/plasma/proc/burnbabyburn(user) + playsound(src, 'sound/items/Welder.ogg', 100, 1) + atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 400) + new /obj/structure/girder/displaced(loc) + qdel(src) + +/obj/structure/falsewall/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) + if(exposed_temperature > 300) + burnbabyburn() + //-----------wtf?-----------start /obj/structure/falsewall/clown name = "bananium wall" diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 548bcbe0986..bb5838ceffd 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -258,7 +258,7 @@ return 0 return 0 -/obj/structure/grille/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/structure/grille/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(!destroyed) if(exposed_temperature > T0C + 1500) health -= 1 diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 51f95e36b07..ef1e93f2db2 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -381,7 +381,7 @@ var/global/wcColored /obj/structure/window/update_icon() return -/obj/structure/window/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/structure/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature > T0C + 800) hit(round(exposed_volume / 100), 0) ..() diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 6bbd20f0d29..d3d93dccf06 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -7,3 +7,4 @@ else biomass_infestation() spacevines_spawned = 1 +v \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index b7bb4ee6dd2..37381273369 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -65,7 +65,7 @@ var/const/MAX_ACTIVE_TIME = 400 Die() return -/obj/item/clothing/mask/facehugger/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/item/clothing/mask/facehugger/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature > 300) Die() return diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 9d7166614f2..26fb14f92e8 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -579,7 +579,7 @@ // called when on fire -/obj/machinery/light/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) +/obj/machinery/light/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(prob(max(0, exposed_temperature - 673))) //0% at <400C, 100% at >500C broken()