cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #6087

Browse Source
This commit is contained in:
Rob Nelson
2015-10-12 19:01:11 -07:00
parent 17877acb3b
commit c468e0a8c0
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/verbs/randomverbs.dm
View File

@@ -544,7 +544,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
data_core.manifest_inject(new_character)
if(alert(new_character,"Would you like an active AI to announce this character?",,"No","Yes")=="Yes")
call(/mob/new_player/proc/AnnounceArrival)(new_character, new_character.mind.assigned_role)
AnnounceArrival(new_character, new_character.mind.assigned_role)
message_admins("<span class='notice'>[admin] has respawned [player_key] as [new_character.real_name].</span>", 1)

7
code/modules/mob/new_player/new_player.dm
View File

@@ -386,19 +386,18 @@
character.Robotize()
del(src)
/mob/new_player/proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank)
/proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank)
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\/mob/new_player/proc/AnnounceArrival() called tick#: [world.time]")
if (ticker.current_state == GAME_STATE_PLAYING)
if(character.mind.role_alt_title)
rank = character.mind.role_alt_title
//say("[character.real_name],[rank ? " [rank]," : " visitor," ] has arrived on the station.", "Arrivals Announcement Computer")
//Broadcast_Message(speaker, vmask, radio, message, name, job, realname, data, compression, zlevels, frequency)
var/datum/speech/speech = announcement_intercom.create_speech("[character.real_name],[rank ? " [rank]," : " visitor," ] has arrived on the station.", transmitter=announcement_intercom)
speech.name = "Arrivals Announcement Computer"
speech.job = "Automated Announcement"
speech.as_name = "Arrivals Announcement Computer"
speech.frequency = 1459
Broadcast_Message(speech, vmask=null, data=0, compression=0, zlevels=list(0,1), frequency=1459)
Broadcast_Message(speech, vmask=null, data=0, compression=0, level=list(0,1))
returnToPool(speech)
/mob/new_player/proc/LateChoices()

2
code/modules/supermatter/supermatter.dm
View File

@@ -184,7 +184,7 @@
speech.name = "Supermatter [short_name] Monitor"
speech.job = "Automated Announcement"
speech.as_name = "Supermatter [short_name] Monitor"
Broadcast_Message(speech, zlevels = list(0,1))
Broadcast_Message(speech, level = list(0,1))
returnToPool(speech)
lastwarning = world.timeofday - offset