cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 15:14:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

standardize temperature_expose args (#30903)

Browse Source 
* 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:
Toastical
2025-12-01 20:58:38 +02:00
committed by GitHub
parent 27a4e05fdf
commit a1fc8db55f
12 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/windowdoor.dm
-1
View File
@@ -524,4 +524,3 @@
var/previouscolor = color
color = "#960000"
animate(src, color = previouscolor, time = 8)
code/game/machinery/firealarm.dm
+2 -2
View File
@@ -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)
code/game/objects/items/latexballoon.dm
+2 -2
View File
@@ -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)
code/game/objects/structures/false_walls.dm
+1 -1
View File
@@ -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()
code/game/objects/structures/girders.dm
+1 -1
View File
@@ -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)
code/game/objects/structures/window.dm
+2 -2
View File
@@ -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
code/game/turfs/simulated/walls_mineral.dm
-5
View File
@@ -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)
code/modules/atmospherics/environmental/LINDA_fire.dm
+2 -2
View File
@@ -1,9 +1,9 @@
/atom/proc/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
/atom/proc/temperature_expose(exposed_temperature, exposed_volume)
if(!isnull(reagents))
reagents.temperature_reagents(exposed_temperature)
/turf/simulated/temperature_expose(exposed_temperature)
/turf/simulated/temperature_expose(exposed_temperature, exposed_volume)
if(reagents)
reagents.temperature_reagents(exposed_temperature, 10, 300)
code/modules/clothing/spacesuits/hardsuit.dm
+1 -3
View File
@@ -182,9 +182,7 @@
if(src == user.get_item_by_slot(ITEM_SLOT_OUTER_SUIT)) //Make sure the player is not wearing the suit before applying the upgrade.
to_chat(user, "<span class='warning'>You cannot install the upgrade to [src] while wearing it.</span>")
return
if(user.temperature_expose(I))
I.forceMove(src)
if(user.transfer_item_to(I, src))
jetpack = I
to_chat(user, "<span class='notice'>You successfully install the jetpack into [src].</span>")
return
code/modules/clothing/under/accessories/accessory.dm
+2 -2
View File
@@ -253,9 +253,9 @@
materials = list(MAT_PLASMA = 1000)
cares_about_temperature = TRUE
/obj/item/clothing/accessory/medal/plasma/temperature_expose(temperature, volume)
/obj/item/clothing/accessory/medal/plasma/temperature_expose(exposed_temperature, exposed_volume)
..()
if(temperature > T0C + 200)
if(exposed_temperature > T0C + 200)
burn_up()
/obj/item/clothing/accessory/medal/plasma/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay)
code/modules/events/spacevine.dm
+2 -2
View File
@@ -707,12 +707,12 @@
if(!i && prob(100/severity))
wither()
/obj/structure/spacevine/temperature_expose(temp, volume)
/obj/structure/spacevine/temperature_expose(exposed_temperature, exposed_volume)
..()
var/override = 0
for(var/SM_type in mutations)
var/datum/spacevine_mutation/SM = mutations[SM_type]
override += SM.process_temperature(src, temp, volume)
override += SM.process_temperature(src, exposed_temperature, exposed_volume)
if(!override)
wither()
code/modules/hydroponics/grown/towercap.dm
+1 -1
View File
@@ -182,7 +182,7 @@
if(dangerous)
O.fire_act(1000, 500)
else
O.temperature_expose(exposed_temperature = 400)
O.temperature_expose(400)
else if(isliving(A))
var/mob/living/L = A
if(dangerous)