cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes arrivals shuttle slightly more juicy (#28254)

Browse Source
This commit is contained in:
Jordan Brown
2017-06-11 18:27:57 -04:00
committed by Joan Lung
parent f1f356a290
commit 4754b68736
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/mob/dead/new_player/new_player.dm
View File

@@ -304,11 +304,13 @@
alert(src, "An administrator has disabled late join spawning.") alert(src, "An administrator has disabled late join spawning.")
return FALSE return FALSE
var/arrivals_docked = TRUE
if(SSshuttle.arrivals) if(SSshuttle.arrivals)
close_spawn_windows() //In case we get held up close_spawn_windows() //In case we get held up
if(SSshuttle.arrivals.damaged && config.arrivals_shuttle_require_safe_latejoin) if(SSshuttle.arrivals.damaged && config.arrivals_shuttle_require_safe_latejoin)
src << alert("The arrivals shuttle is currently malfunctioning! You cannot join.") src << alert("The arrivals shuttle is currently malfunctioning! You cannot join.")
return FALSE return FALSE
arrivals_docked = SSshuttle.arrivals.mode != SHUTTLE_CALL
//Remove the player from the join queue if he was in one and reset the timer //Remove the player from the join queue if he was in one and reset the timer
SSticker.queued_players -= src SSticker.queued_players -= src
@@ -322,6 +324,12 @@
character = equip character = equip
SSjob.SendToLateJoin(character) SSjob.SendToLateJoin(character)
if(!arrivals_docked)
var/obj/screen/splash/Spl = new(character.client, TRUE)
Spl.Fade(TRUE)
character.playsound_local(get_turf(character), 'sound/voice/ApproachingTG.ogg', 25)
character.update_parallax_teleport() character.update_parallax_teleport()
SSticker.minds += character.mind SSticker.minds += character.mind

BIN
sound/voice/ApproachingTG.ogg Normal file
View File

Binary file not shown.