Merge remote-tracking branch 'upstream/master'

This commit is contained in:
BongaTheProto
2022-10-28 16:43:28 -05:00
26 changed files with 182 additions and 49 deletions
+1 -1
View File
@@ -440,7 +440,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
GLOB.data_core.manifest_inject(new_character)
if(alert(new_character,"Would you like an active AI to announce this character?",,"No","Yes")=="Yes")
AnnounceArrival(new_character, new_character.mind.assigned_role)
announce_arrival(new_character, new_character.mind.assigned_role)
var/msg = "<span class='adminnotice'>[admin] has respawned [player_key] as [new_character.real_name].</span>"
message_admins(msg)