cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes FEA temperature_expose() being used...

Browse Source 
...instead of ZAS fire_act().

Conflicts:
	code/game/gamemodes/blob/theblob.dm
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/window.dm
	code/game/turfs/simulated/walls_mineral.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/reagents/reagent_dispenser.dm
This commit is contained in:
mwerezak
2014-06-22 02:03:42 -04:00
committed by ZomgPonies
parent f83fa70684
commit b64441cb26
19 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/aliens.dm
+2 -2
View File
@@ -312,7 +312,7 @@ Alien plants should do something if theres a lot of poison
qdel(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)
health -= 5
healthcheck()
@@ -498,7 +498,7 @@ Alien plants should do something if theres a lot of poison
if(health <= 0)
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)
health -= 5
healthcheck()
code/game/objects/effects/effect_system.dm
+1 -1
View File
@@ -951,7 +951,7 @@ steam.start() -- spawns the effect
// foam disolves when heated
// 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)))
flick("[icon_state]-disolve", src)
code/game/objects/effects/glowshroom.dm
+1 -1
View File
@@ -156,7 +156,7 @@
else
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)
endurance -= 5
CheckEndurance()
code/game/objects/effects/spiders.dm
+1 -1
View File
@@ -47,7 +47,7 @@
if(health <= 0)
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)
health -= 5
healthcheck()
code/game/objects/items/latexballoon.dm
+1 -1
View File
@@ -38,7 +38,7 @@
/obj/item/latexballon/bullet_act()
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)
burst()
return
code/game/objects/items/stacks/sheets/leather.dm
+1 -1
View File
@@ -117,7 +117,7 @@
//Step two - washing..... it's actually in washing machine code.
//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)
wetness--
code/game/objects/structures/grille.dm
+1 -1
View File
@@ -244,7 +244,7 @@
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(exposed_temperature > T0C + 1500)
health -= 1
code/game/objects/structures/mineral_doors.dm
+1 -1
View File
@@ -201,7 +201,7 @@
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)
TemperatureAct(exposed_temperature)
code/game/objects/structures/window.dm
+5 -4
View File
@@ -365,7 +365,7 @@
/obj/structure/window/update_icon()
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)
hit(round(exposed_volume / 100), 0)
..()
@@ -391,7 +391,7 @@
update_nearby_icons()
return
/obj/structure/window/plasmabasic/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
/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)
..()
@@ -406,8 +406,6 @@
health = 160
explosion_resistance = 4
/obj/structure/window/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
return
/obj/structure/window/plasmareinforced/New(Loc,re=0)
..()
@@ -417,6 +415,9 @@
update_nearby_icons()
return
/obj/structure/window/plasmareinforced/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
return
/obj/structure/window/reinforced
name = "reinforced window"
desc = "It looks rather strong. Might take a few good hits to shatter it."