Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Delam scram counter penalty #2885

Merged
merged 1 commit into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/modules/power/supermatter/supermatter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
QDEL_NULL(radio)
QDEL_NULL(countdown)
if(is_main_engine && GLOB.main_supermatter_engine == src)
SSpersistence.reset_delam_counter() // NOVA EDIT ADDITION BEGIN - DELAM SCRAM
GLOB.main_supermatter_engine = null
QDEL_NULL(soundloop)
return ..()
Expand Down
8 changes: 8 additions & 0 deletions modular_nova/modules/delam_emergency_stop/code/scram.dm
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@

// Fire bell close, that nice 'are we gonna die?' rumble out far
on = TRUE
SSpersistence.reset_delam_counter()
alert_sound_to_playing('sound/misc/earth_rumble_distant3.ogg', override_volume = TRUE)
update_appearance()

Expand Down Expand Up @@ -461,6 +462,13 @@

return ..()

/// Resets the safety incident display internal counter back to -1 (delam event happened)
/datum/controller/subsystem/persistence/proc/reset_delam_counter()
delam_highscore = rounds_since_engine_exploded
rounds_since_engine_exploded = -1
for(var/obj/machinery/incident_display/sign as anything in GLOB.map_delamination_counters)
sign.update_delam_count(rounds_since_engine_exploded)

MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/atmospherics/components/unary/delam_scram, 0)
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/delam_procedure, 32)

Expand Down
Loading