cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fire announcement for Engineering (#10194)

Browse Source
This commit is contained in:
Guti
2025-02-18 10:06:02 +01:00
committed by GitHub
parent 90232aedcc
commit 0ad9e8b2e7
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/fire_alarm.dm
View File

@@ -228,6 +228,8 @@ FIRE ALARM
if(!(working)) if(!(working))
return return
var/area/area = get_area(src) var/area/area = get_area(src)
if(!firewarn && !alarms_hidden) // CHOMPAdd
global_announcer.autosay("Tripped [area]", "Fire Alarm Monitor", DEPARTMENT_ENGINEERING)
for(var/obj/machinery/firealarm/FA in area) for(var/obj/machinery/firealarm/FA in area)
fire_alarm.triggerAlarm(loc, FA, duration, hidden = alarms_hidden) fire_alarm.triggerAlarm(loc, FA, duration, hidden = alarms_hidden)
FA.soundloop.start() // CHOMPEdit: Soundloop FA.soundloop.start() // CHOMPEdit: Soundloop

6
modular_chomp/code/ZAS/Fire.dm
View File

@@ -89,7 +89,7 @@
if(air_contents.temperature < FIRE_MAX_TEMP) // May as well limit this if(air_contents.temperature < FIRE_MAX_TEMP) // May as well limit this
var/starting_energy = air_contents.temperature * air_contents.heat_capacity() var/starting_energy = air_contents.temperature * air_contents.heat_capacity()
if(starting_energy > 0) if(starting_energy > 0)
air_contents.temperature = min((starting_energy + vsc.fire_fuel_energy_release * (gas_exchange * 1.05)) / air_contents.heat_capacity(), FIRE_MAX_TEMP) air_contents.temperature = min((starting_energy + vsc.fire_fuel_energy_release * (gas_exchange * 1.025)) / air_contents.heat_capacity(), FIRE_MAX_TEMP)
air_contents.update_values() air_contents.update_values()
// Affect contents // Affect contents
@@ -122,12 +122,12 @@
firelevel /= 2 firelevel /= 2
continue continue
if(firelevel >= 0.15 && prob(60) && my_tile.CanPass(src, enemy_tile) && enemy_tile.CanPass(src, my_tile)) if(firelevel >= 0.15 && prob(20) && my_tile.CanPass(src, enemy_tile) && enemy_tile.CanPass(src, my_tile))
var/splitrate = 0.85 var/splitrate = 0.85
enemy_tile.lingering_fire(firelevel * splitrate) enemy_tile.lingering_fire(firelevel * splitrate)
firelevel -= (1 - splitrate) firelevel -= (1 - splitrate)
else if(prob(20)) else if(prob(10))
enemy_tile.adjacent_fire_act(loc, air_contents, air_contents.temperature, air_contents.volume) enemy_tile.adjacent_fire_act(loc, air_contents, air_contents.temperature, air_contents.volume)
var/total_oxidizers = 0 var/total_oxidizers = 0

2
modular_chomp/code/modules/event/electrical_fire.dm
View File

@@ -44,7 +44,7 @@
sparks.start() sparks.start()
var/turf/T = get_turf(M) var/turf/T = get_turf(M)
T.lingering_fire(0.6) T.lingering_fire(0.3)
var/area/A = get_area(T) var/area/A = get_area(T)
log_admin("Electrical event: [M] in [A] caught fire.") log_admin("Electrical event: [M] in [A] caught fire.")