cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes FEA temperature_expose() being used...

Browse Source 
...instead of ZAS fire_act().
This commit is contained in:
mwerezak
2014-06-22 00:13:22 -04:00
parent baeca85704
commit 37e63dfcb0
21 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/WorkInProgress/Susan/susan_desert_turfs.dm
View File

@@ -227,7 +227,7 @@ Alien plants should do something if theres a lot of poison
del(src) del(src)
/obj/effect/alien/flesh/weeds/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/effect/alien/flesh/weeds/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 300) if(exposed_temperature > 300)
health -= 5 health -= 5
healthcheck() healthcheck()

2
code/game/gamemodes/blob/theblob.dm
View File

@@ -87,7 +87,7 @@
return 1 return 1
return 0 return 0
/* temperature_expose(datum/gas_mixture/air, temperature, volume) Blob is currently fireproof /* fire_act(datum/gas_mixture/air, temperature, volume) Blob is currently fireproof
if(temperature > T0C+200) if(temperature > T0C+200)
health -= 0.01 * temperature health -= 0.01 * temperature
update() update()

2
code/game/gamemodes/events/biomass.dm
View File

@@ -154,7 +154,7 @@
return return
return return
/obj/effect/biomass/temperature_expose(null, temp, volume) //hotspots kill biomass /obj/effect/biomass/fire_act(null, temp, volume) //hotspots kill biomass
del src del src

2
code/game/gamemodes/events/spacevines.dm
View File

@@ -239,7 +239,7 @@
return return
return return
/obj/effect/spacevine/temperature_expose(null, temp, volume) //hotspots kill vines /obj/effect/spacevine/fire_act(null, temp, volume) //hotspots kill vines
del src del src
//Carn: Spacevines random event. //Carn: Spacevines random event.

2
code/game/machinery/alarm.dm
View File

@@ -1338,7 +1338,7 @@ FIRE ALARM
else else
icon_state = "fire0" icon_state = "fire0"
/obj/machinery/firealarm/temperature_expose(datum/gas_mixture/air, temperature, volume) /obj/machinery/firealarm/fire_act(datum/gas_mixture/air, temperature, volume)
if(src.detecting) if(src.detecting)
if(temperature > T0C+200) if(temperature > T0C+200)
src.alarm() // added check of detector status here src.alarm() // added check of detector status here

2
code/game/machinery/atmoalter/canister.dm
View File

@@ -110,7 +110,7 @@ update_flag
overlays += "can-o3" overlays += "can-o3"
return return
/obj/machinery/portable_atmospherics/canister/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/machinery/portable_atmospherics/canister/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > temperature_resistance) if(exposed_temperature > temperature_resistance)
health -= 5 health -= 5
healthcheck() healthcheck()

2
code/game/machinery/doors/airlock.dm
View File

@@ -264,7 +264,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
icon = 'icons/obj/doors/Doorphoron.dmi' icon = 'icons/obj/doors/Doorphoron.dmi'
mineral = "phoron" mineral = "phoron"
/obj/machinery/door/airlock/phoron/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/machinery/door/airlock/phoron/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 300) if(exposed_temperature > 300)
PhoronBurn(exposed_temperature) PhoronBurn(exposed_temperature)

2
code/game/mecha/mecha.dm
View File

@@ -618,7 +618,7 @@
check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT),1) check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT),1)
return return
/obj/mecha/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/mecha/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature>src.max_temperature) if(exposed_temperature>src.max_temperature)
src.log_message("Exposed to dangerous temperature.",1) src.log_message("Exposed to dangerous temperature.",1)
src.take_damage(5,"fire") src.take_damage(5,"fire")

4
code/game/objects/effects/aliens.dm
View File

@@ -287,7 +287,7 @@ Alien plants should do something if theres a lot of poison
del(src) del(src)
/obj/effect/alien/weeds/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/effect/alien/weeds/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 300) if(exposed_temperature > 300)
health -= 5 health -= 5
healthcheck() healthcheck()
@@ -469,7 +469,7 @@ Alien plants should do something if theres a lot of poison
if(health <= 0) if(health <= 0)
Burst() Burst()
/obj/effect/alien/egg/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/effect/alien/egg/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 500) if(exposed_temperature > 500)
health -= 5 health -= 5
healthcheck() healthcheck()

2
code/game/objects/effects/effect_system.dm
View File

@@ -541,7 +541,7 @@ steam.start() -- spawns the effect
// foam disolves when heated // foam disolves when heated
// except metal foams // except metal foams
/obj/effect/effect/foam/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/effect/effect/foam/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(!metal && prob(max(0, exposed_temperature - 475))) if(!metal && prob(max(0, exposed_temperature - 475)))
flick("[icon_state]-disolve", src) flick("[icon_state]-disolve", src)

2
code/game/objects/effects/glowshroom.dm
View File

@@ -154,7 +154,7 @@
else else
return return
/obj/effect/glowshroom/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/effect/glowshroom/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 300) if(exposed_temperature > 300)
endurance -= 5 endurance -= 5
CheckEndurance() CheckEndurance()

2
code/game/objects/effects/spiders.dm
View File

@@ -47,7 +47,7 @@
if(health <= 0) if(health <= 0)
del(src) del(src)
/obj/effect/spider/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/effect/spider/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 300) if(exposed_temperature > 300)
health -= 5 health -= 5
healthcheck() healthcheck()

2
code/game/objects/items/latexballoon.dm
View File

@@ -38,7 +38,7 @@
/obj/item/latexballon/bullet_act() /obj/item/latexballon/bullet_act()
burst() burst()
/obj/item/latexballon/temperature_expose(datum/gas_mixture/air, temperature, volume) /obj/item/latexballon/fire_act(datum/gas_mixture/air, temperature, volume)
if(temperature > T0C+100) if(temperature > T0C+100)
burst() burst()
return return

2
code/game/objects/items/stacks/sheets/leather.dm
View File

@@ -117,7 +117,7 @@
//Step two - washing..... it's actually in washing machine code. //Step two - washing..... it's actually in washing machine code.
//Step three - drying //Step three - drying
/obj/item/stack/sheet/wetleather/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/item/stack/sheet/wetleather/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
..() ..()
if(exposed_temperature >= drying_threshold_temperature) if(exposed_temperature >= drying_threshold_temperature)
wetness-- wetness--

2
code/game/objects/structures/grille.dm
View File

@@ -216,7 +216,7 @@
return 0 return 0
return 0 return 0
/obj/structure/grille/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/structure/grille/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(!destroyed) if(!destroyed)
if(exposed_temperature > T0C + 1500) if(exposed_temperature > T0C + 1500)
health -= 1 health -= 1

2
code/game/objects/structures/mineral_doors.dm
View File

@@ -198,7 +198,7 @@
TemperatureAct(100) TemperatureAct(100)
..() ..()
temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 300) if(exposed_temperature > 300)
TemperatureAct(exposed_temperature) TemperatureAct(exposed_temperature)

6
code/game/objects/structures/window.dm
View File

@@ -361,7 +361,7 @@
return return
/obj/structure/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/structure/window/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > T0C + 800) if(exposed_temperature > T0C + 800)
hit(round(exposed_volume / 100), 0) hit(round(exposed_volume / 100), 0)
..() ..()
@@ -381,7 +381,7 @@
shardtype = /obj/item/weapon/shard/phoron shardtype = /obj/item/weapon/shard/phoron
health = 120 health = 120
/obj/structure/window/phoronbasic/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/structure/window/phoronbasic/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > T0C + 32000) if(exposed_temperature > T0C + 32000)
hit(round(exposed_volume / 1000), 0) hit(round(exposed_volume / 1000), 0)
..() ..()
@@ -395,7 +395,7 @@
reinf = 1 reinf = 1
health = 160 health = 160
/obj/structure/window/phoronreinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/structure/window/phoronreinforced/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
return return
/obj/structure/window/reinforced /obj/structure/window/reinforced

2
code/game/turfs/simulated/walls_mineral.dm
View File

@@ -111,7 +111,7 @@
for(var/obj/machinery/door/airlock/phoron/D in range(3,src)) for(var/obj/machinery/door/airlock/phoron/D in range(3,src))
D.ignite(temperature/4) D.ignite(temperature/4)
/turf/simulated/wall/mineral/phoron/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)//Doesn't fucking work because walls don't interact with air :( /turf/simulated/wall/mineral/phoron/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)//Doesn't fucking work because walls don't interact with air :(
if(exposed_temperature > 300) if(exposed_temperature > 300)
PhoronBurn(exposed_temperature) PhoronBurn(exposed_temperature)

2
code/modules/mob/living/carbon/alien/special/facehugger.dm
View File

@@ -72,7 +72,7 @@ var/const/MAX_ACTIVE_TIME = 400
Die() Die()
return return
/obj/item/clothing/mask/facehugger/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/item/clothing/mask/facehugger/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > 300) if(exposed_temperature > 300)
Die() Die()
return return

2
code/modules/power/lighting.dm
View File

@@ -618,7 +618,7 @@
// called when on fire // called when on fire
/obj/machinery/light/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/machinery/light/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(prob(max(0, exposed_temperature - 673))) //0% at <400C, 100% at >500C if(prob(max(0, exposed_temperature - 673))) //0% at <400C, 100% at >500C
broken() broken()

2
code/modules/reagents/reagent_dispenser.dm
View File

@@ -166,7 +166,7 @@
if(src) if(src)
del(src) del(src)
/obj/structure/reagent_dispensers/fueltank/temperature_expose(datum/gas_mixture/air, temperature, volume) /obj/structure/reagent_dispensers/fueltank/fire_act(datum/gas_mixture/air, temperature, volume)
if(temperature > T0C+500) if(temperature > T0C+500)
explode() explode()
return ..() return ..()