cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-13 17:23:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6507 from VOREStation/upstream-merge-6603

Browse Source 
[MIRROR] Add an audible alarm sound to SM Delamination
This commit is contained in:
Novacat
2020-01-25 23:04:14 -05:00
committed by GitHub
parent c44268a96d 2366e865f3
commit 4505684fbd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/supermatter/supermatter.dm
+4 -4
View File
@@ -171,7 +171,7 @@
/obj/machinery/power/supermatter/proc/announce_warning()
var/integrity = get_integrity()
var/alert_msg = " Integrity at [integrity]%"
var/message_sound = 'sound/ambience/matteralarm.ogg' // VOREStation Edit - Rykka adds SM Delam alarm
var/message_sound = 'sound/ambience/matteralarm.ogg'
if(damage > emergency_point)
alert_msg = emergency_alert + alert_msg
@@ -192,9 +192,9 @@
//Public alerts
if((damage > emergency_point) && !public_alert)
global_announcer.autosay("WARNING: SUPERMATTER CRYSTAL DELAMINATION IMMINENT!", "Supermatter Monitor")
for(var/mob/M in player_list) // VOREStation Edit - Rykka adds SM Delam alarm
if(!istype(M,/mob/new_player) && !isdeaf(M)) // VOREStation Edit - Rykka adds SM Delam alarm
M << message_sound // VOREStation Edit - Rykka adds SM Delam alarm
for(var/mob/M in player_list) // Rykka adds SM Delam alarm
if(!istype(M,/mob/new_player) && !isdeaf(M)) // Rykka adds SM Delam alarm
M << message_sound // Rykka adds SM Delam alarm
admin_chat_message(message = "SUPERMATTER DELAMINATING!", color = "#FF2222") //VOREStation Add
public_alert = 1
log_game("SUPERMATTER([x],[y],[z]) Emergency PUBLIC announcement. Power:[power], Oxygen:[oxygen], Damage:[damage], Integrity:[get_integrity()]")