Merge remote-tracking branch 'Virgo_Master/master'

This commit is contained in:
Rykka
2019-09-27 15:47:08 -06:00
2 changed files with 4 additions and 0 deletions
@@ -171,6 +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
if(damage > emergency_point)
alert_msg = emergency_alert + alert_msg
@@ -191,6 +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
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()]")
Binary file not shown.