From c5a0e14acbc306c2f552ab4719a73657be474484 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 8 Jun 2018 12:53:11 +0000 Subject: [PATCH] Tones down values for a lot of different hotspot_expose calls (#38232) * Tones down values for a lot of different hotspot_expose calls * Update LINDA_fire.dm (#38217) * Automatic changelog compile, [ci skip] * Slight changes to camera network code (#38223) * Removes a useless var and corrects two cameras to use the automatic naming system to reduce dv usage. * Damn github didnt notice this was here.... * Fixes datediff not returning (#38215) * Fixes pocket items being deleted when monkeyizing (#38220) * Automatic changelog generation for PR #38220 [ci skip] * readds atmos heating from hotspot_expose(), as requested by naksu * Tones down hotspot_expose values for sparks moving and destroying * tones down item heat by a lot. no more burning your face off after smoking a cigarette --- code/game/machinery/igniter.dm | 4 ++-- code/game/objects/effects/effect_system/effects_sparks.dm | 6 +++--- code/game/objects/items.dm | 2 +- code/game/objects/items/tools/weldingtool.dm | 2 +- code/game/objects/structures/fireplace.dm | 2 +- code/modules/assembly/igniter.dm | 2 +- code/modules/atmospherics/environmental/LINDA_fire.dm | 5 +++++ code/modules/holodeck/computer.dm | 2 +- code/modules/hydroponics/grown/towercap.dm | 2 +- code/modules/mob/living/life.dm | 2 +- code/modules/projectiles/projectile/bullets/_incendiary.dm | 2 +- 11 files changed, 18 insertions(+), 13 deletions(-) diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index d20a1059f92..acc05052564 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -40,7 +40,7 @@ if (src.on && !(stat & NOPOWER) ) var/turf/location = src.loc if (isturf(location)) - location.hotspot_expose(1000,500,1) + location.hotspot_expose(700,10,1) return 1 /obj/machinery/igniter/Initialize() @@ -126,7 +126,7 @@ use_power(1000) var/turf/location = src.loc if (isturf(location)) - location.hotspot_expose(1000,500,1) + location.hotspot_expose(1000,100,1) return 1 /obj/machinery/sparker/emp_act(severity) diff --git a/code/game/objects/effects/effect_system/effects_sparks.dm b/code/game/objects/effects/effect_system/effects_sparks.dm index 695c835a89c..b74175b5ad1 100644 --- a/code/game/objects/effects/effect_system/effects_sparks.dm +++ b/code/game/objects/effects/effect_system/effects_sparks.dm @@ -28,20 +28,20 @@ playsound(src.loc, "sparks", 100, 1) var/turf/T = loc if(isturf(T)) - T.hotspot_expose(1000,100) + T.hotspot_expose(700,5) QDEL_IN(src, 20) /obj/effect/particle_effect/sparks/Destroy() var/turf/T = loc if(isturf(T)) - T.hotspot_expose(1000,100) + T.hotspot_expose(700,1) return ..() /obj/effect/particle_effect/sparks/Move() ..() var/turf/T = loc if(isturf(T)) - T.hotspot_expose(1000,100) + T.hotspot_expose(700,1) /datum/effect_system/spark_spread effect_type = /obj/effect/particle_effect/sparks diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index f97f144d53a..9f5d271f550 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -597,7 +597,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) if(success) location = get_turf(M) if(isturf(location)) - location.hotspot_expose(flame_heat, 5) + location.hotspot_expose(flame_heat, 1) /obj/item/proc/ignition_effect(atom/A, mob/user) if(is_hot()) diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 08d0b8bd309..4707ba9b474 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -129,7 +129,7 @@ if(isOn()) use(1) var/turf/location = get_turf(user) - location.hotspot_expose(700, 50, 1) + location.hotspot_expose(550, 10, 1) if(get_fuel() <= 0) set_light(0) diff --git a/code/game/objects/structures/fireplace.dm b/code/game/objects/structures/fireplace.dm index 2735bd7e81a..b670fe5cf0c 100644 --- a/code/game/objects/structures/fireplace.dm +++ b/code/game/objects/structures/fireplace.dm @@ -111,7 +111,7 @@ playsound(src, 'sound/effects/comfyfire.ogg',50,0, 0, 1) var/turf/T = get_turf(src) - T.hotspot_expose(700, 5) + T.hotspot_expose(500, 5) update_icon() adjust_light() diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index 2aae7db5e20..1f62bfaaef4 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -26,7 +26,7 @@ return FALSE//Cooldown check var/turf/location = get_turf(loc) if(location) - location.hotspot_expose(1000,1000) + location.hotspot_expose(700,10) sparks.start() return TRUE diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm index ba4b9c8b27d..ede69a6b222 100644 --- a/code/modules/atmospherics/environmental/LINDA_fire.dm +++ b/code/modules/atmospherics/environmental/LINDA_fire.dm @@ -42,6 +42,11 @@ active_hotspot.just_spawned = (current_cycle < SSair.times_fired) //remove just_spawned protection if no longer processing this cell SSair.add_to_active(src, 0) + else + var/datum/gas_mixture/heating = air_contents.remove_ratio(exposed_volume/air_contents.volume) + heating.temperature = exposed_temperature + heating.react() + assume_air(heating) return igniting //This is the icon for fire on turfs, also helps for nurturing small fires until they are full tile diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index a1f1394e16b..4590d581748 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -136,7 +136,7 @@ if(prob(30)) do_sparks(2, 1, T) T.ex_act(EXPLODE_LIGHT) - T.hotspot_expose(1000,500,1) + T.hotspot_expose(700,25,1) if(!(obj_flags & EMAGGED)) for(var/item in spawned) diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index 013c3b9a885..6f5a1a0ee43 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -203,7 +203,7 @@ /obj/structure/bonfire/proc/Burn() var/turf/current_location = get_turf(src) - current_location.hotspot_expose(1000,500,1) + current_location.hotspot_expose(1000,100,1) for(var/A in current_location) if(A == src) continue diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index da683579ac7..817e3c3f3bd 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -110,7 +110,7 @@ ExtinguishMob() //If there's no oxygen in the tile we're on, put out the fire return var/turf/location = get_turf(src) - location.hotspot_expose(700, 50, 1) + location.hotspot_expose(700, 10, 1) /mob/living/proc/handle_stomach() return diff --git a/code/modules/projectiles/projectile/bullets/_incendiary.dm b/code/modules/projectiles/projectile/bullets/_incendiary.dm index d0cf74421c8..b6cca4a31a0 100644 --- a/code/modules/projectiles/projectile/bullets/_incendiary.dm +++ b/code/modules/projectiles/projectile/bullets/_incendiary.dm @@ -14,4 +14,4 @@ var/turf/location = get_turf(src) if(location) new /obj/effect/hotspot(location) - location.hotspot_expose(700, 50, 1) + location.hotspot_expose(700, 5, 1)