mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-10 22:54:32 +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:
@@ -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)
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user