diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 978ec182a1f..8e508053e33 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -524,4 +524,3 @@ var/previouscolor = color color = "#960000" animate(src, color = previouscolor, time = 8) - diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index c77bbcf2637..6bffbb9443f 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -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) diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index 58c7c8dc9fb..a8f6215159b 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -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) diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 3a42bdb41c0..4e511d2da7b 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -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() diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 6dd705d67eb..9174589af9d 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -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) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 2fdf19146a8..eec2cc0c76f 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -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 diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index e620a822e38..75aee1efa64 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -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) diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm index 79ab51a4aea..d37fba93d45 100644 --- a/code/modules/atmospherics/environmental/LINDA_fire.dm +++ b/code/modules/atmospherics/environmental/LINDA_fire.dm @@ -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) diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 75272ac4c6c..97d369b9fad 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -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, "You cannot install the upgrade to [src] while wearing it.") return - - if(user.temperature_expose(I)) - I.forceMove(src) + if(user.transfer_item_to(I, src)) jetpack = I to_chat(user, "You successfully install the jetpack into [src].") return diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index c55bcb0832f..11a4110a95d 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -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) diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 1387fe4acf3..6301b96f5fa 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -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() diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index 1fdd70fced9..cb62c75a958 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -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)