mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 19:17:50 +01:00
standardize temperature_expose args (#30903)
* standardize temperature_expose args * some i missed * remove dubious use of temperature_expose() * fix hardsuit tank insertion proc * remove unused gas_mixture arg * revert test_tiny.dmm
This commit is contained in:
@@ -524,4 +524,3 @@
|
||||
var/previouscolor = color
|
||||
color = "#960000"
|
||||
animate(src, color = previouscolor, time = 8)
|
||||
|
||||
|
||||
@@ -108,9 +108,9 @@ FIRE ALARM
|
||||
playsound(loc, 'sound/effects/sparks4.ogg', 50, TRUE)
|
||||
return TRUE
|
||||
|
||||
/obj/machinery/firealarm/temperature_expose(temperature, volume)
|
||||
/obj/machinery/firealarm/temperature_expose(exposed_temperature, exposed_volume)
|
||||
..()
|
||||
if(!emagged && detecting && temperature > T0C + 200)
|
||||
if(!emagged && detecting && exposed_temperature > T0C + 200)
|
||||
alarm() // added check of detector status here
|
||||
|
||||
/obj/machinery/firealarm/attack_ai(mob/user)
|
||||
|
||||
@@ -54,9 +54,9 @@
|
||||
burst()
|
||||
return ..()
|
||||
|
||||
/obj/item/latexballon/temperature_expose(temperature, volume)
|
||||
/obj/item/latexballon/temperature_expose(exposed_temperature, exposed_volume)
|
||||
..()
|
||||
if(temperature > T0C+100)
|
||||
if(exposed_temperature > T0C+100)
|
||||
burst()
|
||||
|
||||
/obj/item/latexballon/attackby__legacy__attackchain(obj/item/W, mob/user, params)
|
||||
|
||||
@@ -288,7 +288,7 @@
|
||||
new /obj/structure/girder/displaced(loc)
|
||||
qdel(src)
|
||||
|
||||
/obj/structure/falsewall/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
|
||||
/obj/structure/falsewall/plasma/temperature_expose(exposed_temperature, exposed_volume)
|
||||
..()
|
||||
if(exposed_temperature > 300)
|
||||
burnbabyburn()
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
for(var/i=0;i < metalAmount;i++)
|
||||
new metal_type(get_turf(src))
|
||||
|
||||
/obj/structure/girder/temperature_expose(exposed_temperature)
|
||||
/obj/structure/girder/temperature_expose(exposed_temperature, exposed_volume)
|
||||
..()
|
||||
var/temp_check = exposed_temperature
|
||||
if(temp_check >= GIRDER_MELTING_TEMP)
|
||||
|
||||
@@ -696,7 +696,7 @@
|
||||
superconductivity = ZERO_HEAT_TRANSFER_COEFFICIENT
|
||||
rad_conversion_amount = 2.25
|
||||
|
||||
/obj/structure/window/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
|
||||
/obj/structure/window/plasmareinforced/temperature_expose(exposed_temperature, exposed_volume)
|
||||
return
|
||||
|
||||
/obj/structure/window/full
|
||||
@@ -758,7 +758,7 @@
|
||||
rad_insulation_gamma = RAD_GAMMA_FULL_WINDOW
|
||||
rad_conversion_amount = 2.2
|
||||
|
||||
/obj/structure/window/full/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
|
||||
/obj/structure/window/full/plasmareinforced/temperature_expose(exposed_temperature, exposed_volume)
|
||||
return
|
||||
|
||||
/obj/structure/window/full/reinforced
|
||||
|
||||
@@ -115,11 +115,6 @@
|
||||
ChangeTurf(/turf/simulated/floor)
|
||||
atmos_spawn_air(LINDA_SPAWN_HEAT | LINDA_SPAWN_TOXINS, 400)
|
||||
|
||||
/turf/simulated/wall/mineral/plasma/temperature_expose(exposed_temperature, exposed_volume)//Doesn't fucking work because walls don't interact with air :(
|
||||
..()
|
||||
if(exposed_temperature > 300)
|
||||
PlasmaBurn(exposed_temperature)
|
||||
|
||||
/turf/simulated/wall/mineral/plasma/proc/ignite(exposed_temperature)
|
||||
if(exposed_temperature > 300)
|
||||
PlasmaBurn(exposed_temperature)
|
||||
|
||||
Reference in New Issue
Block a user