Merge remote-tracking branch 'upstream/master' into upstream-merge

This commit is contained in:
BongaTheProto
2024-04-06 19:06:12 -05:00
9 changed files with 27 additions and 24 deletions
+1 -1
View File
@@ -1494,7 +1494,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
to_chat(usr, "<span class='warning'>[C] is dead!")
return
else
C.goodbye(C) //sandstorm punish and ends here.
C.goodbye() //sandstorm punish and ends here.
if(ADMIN_PUNISHMENT_TABLETIDESTATIONWIDE) //SPLURT punishments start here
priority_announce(html_decode("[target] has brought the wrath of the gods upon themselves and is now being tableslammed across the station. Please stand by."), null, 'sound/misc/announce.ogg', "CentCom")
var/list/areas = list()