mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
fix runtime, increase sm explosion damage (#7533)
This commit is contained in:
@@ -845,6 +845,8 @@
|
||||
spawn(rand(0,15))
|
||||
update_icon()
|
||||
// CHOMPEdit Start: Looping Alarms
|
||||
if(!soundloop)
|
||||
return
|
||||
if(stat & (NOPOWER | BROKEN))
|
||||
soundloop.stop()
|
||||
else if(atmoswarn)
|
||||
|
||||
@@ -67,11 +67,11 @@ FIRE ALARM
|
||||
causality = new(list(src), FALSE) // CHOMPEdit: Create soundloop
|
||||
|
||||
/obj/machinery/firealarm/Destroy()
|
||||
reset() //CHOMPEdit alarm needs to go when destroyed
|
||||
QDEL_NULL(soundloop) // CHOMPEdit: Just clearing the loop here
|
||||
QDEL_NULL(engalarm) // CHOMPEdit: Clearing the loop here too
|
||||
QDEL_NULL(critalarm) // CHOMPEdit: Clearing the loop here too
|
||||
QDEL_NULL(causality) // CHOMPEdit: Clearing the loop here too
|
||||
reset() //CHOMPEdit alarm needs to go when destroyed
|
||||
return ..()
|
||||
|
||||
/obj/machinery/firealarm/proc/offset_alarm()
|
||||
@@ -183,6 +183,8 @@ FIRE ALARM
|
||||
spawn(rand(0,15))
|
||||
update_icon()
|
||||
// CHOMPEdit Start: Looping Red/Violet/Orange Alarms
|
||||
if(!soundloop)
|
||||
return
|
||||
if(stat & (NOPOWER | BROKEN)) // Are we broken or out of power?
|
||||
soundloop.stop() // Stop the loop once we're out of power
|
||||
engalarm.stop() // Stop these bc we're out of power
|
||||
|
||||
@@ -85,8 +85,8 @@
|
||||
var/pull_radius = 14
|
||||
// Time in ticks between delamination ('exploding') and exploding (as in the actual boom)
|
||||
var/pull_time = 100
|
||||
var/min_explosion_power = 8
|
||||
var/max_explosion_power = 16
|
||||
var/min_explosion_power = 12 // CHOMPEdit some more damage was 8
|
||||
var/max_explosion_power = 24 // CHOMPEdit some more damage was 16
|
||||
|
||||
var/emergency_issued = 0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user