cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update announce.dm

Browse Source
This commit is contained in:
Novacat
2020-03-15 14:42:57 -04:00
committed by GitHub
parent 8d2b41ad2c
commit 972deeae2d
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/defines/procs/announce.dm
View File

@@ -113,10 +113,5 @@ datum/announcement/proc/Log(message as text, message_title as text)
rank = character.mind.role_alt_title rank = character.mind.role_alt_title
AnnounceArrivalSimple(character.real_name, rank, join_message) AnnounceArrivalSimple(character.real_name, rank, join_message)
<<<<<<< HEAD /proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "will arrive at the station shortly", new_sound = 'sound/misc/notice3.ogg') //VOREStation Edit - Remove shuttle reference
/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "will arrive at the station shortly") //VOREStation Edit - Remove shuttle reference
=======
/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "will arrive to the station shortly by shuttle", new_sound = 'sound/misc/notice3.ogg')
>>>>>>> 22e28f2... Merge pull request #6804 from Cerebulon/bigsounds
global_announcer.autosay("[name], [rank], [join_message].", "Arrivals Announcement Computer") global_announcer.autosay("[name], [rank], [join_message].", "Arrivals Announcement Computer")