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

4
code/modules/admin/secrets.dm
View File

@@ -157,7 +157,7 @@
var/new_name = input(usr, "Please input a new name for the station.", "What?", "") as text|null
if(!new_name)
return
change_station_name(new_name)
set_station_name(new_name)
log_admin("[key_name(usr)] renamed the station to \"[new_name]\".")
message_admins("<span class='adminnotice'>[key_name_admin(usr)] renamed the station to: [new_name].</span>")
priority_announce("[command_name()] has renamed the station to \"[new_name]\".")
@@ -166,7 +166,7 @@
if(!check_rights(R_ADMIN))
return
var/new_name = new_station_name()
change_station_name(new_name)
set_station_name(new_name)
log_admin("[key_name(usr)] reset the station name.")
message_admins("<span class='adminnotice'>[key_name_admin(usr)] reset the station name.</span>")
priority_announce("[command_name()] has renamed the station to \"[new_name]\".")