shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #545 from Citadel-Station-13/upstream-merge-26397

Browse Source 
[MIRROR] Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker
This commit is contained in:
LetterJay
2017-04-25 01:02:38 -05:00
committed by GitHub
parent 6dd45dee7f 4baa357739
commit e27c5c8db3
39 changed files with 227 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/names.dm
+12 -14
View File
@@ -55,20 +55,25 @@ GLOBAL_VAR(command_name)
return capitalize(name)
/proc/station_name()
if(GLOB.station_name)
return GLOB.station_name
if(!GLOB.station_name)
var/newname
if(config && config.station_name)
newname = config.station_name
else
newname = new_station_name()
if(config && config.station_name)
GLOB.station_name = config.station_name
else
GLOB.station_name = new_station_name()
set_station_name(newname)
return GLOB.station_name
/proc/set_station_name(newname)
GLOB.station_name = newname
if(config && config.server_name)
world.name = "[config.server_name][config.server_name==GLOB.station_name ? "" : ": [GLOB.station_name]"]"
else
world.name = GLOB.station_name
return GLOB.station_name
/proc/new_station_name()
var/random = rand(1,5)
@@ -235,10 +240,3 @@ GLOBAL_VAR(syndicate_code_response) //Code response for traitors.
code_phrase += ", "
return code_phrase
/proc/change_station_name(designation)
if(config && config.server_name)
world.name = "[config.server_name]: [designation]"
else
world.name = designation
GLOB.station_name = designation