Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker

This commit is contained in:
CitadelStationBot
2017-04-24 18:07:12 -05:00
parent aea9714228
commit 4baa357739
39 changed files with 227 additions and 178 deletions
+2 -2
View File
@@ -54,7 +54,7 @@
if(standard_station_regex.Find(new_name))
to_chat(user, "Your name has been automatically approved.")
rename_station(new_name, user)
rename_station(new_name, user.name, user.real_name, key_name(user))
return
to_chat(user, "Your name has been sent to your employers for approval.")
@@ -79,7 +79,7 @@
response_timer_id = null
/obj/item/station_charter/proc/rename_station(designation, uname, ureal_name, ukey)
change_station_name(designation)
set_station_name(designation)
minor_announce("[ureal_name] has designated your station as [station_name()]", "Captain's Charter", 0)
log_game("[ukey] has renamed the station as [station_name()].")
+9
View File
@@ -73,3 +73,12 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
/obj/item/stack/rods/cyborg/update_icon()
return
/obj/item/stack/rods/ten
amount = 10
/obj/item/stack/rods/twentyfive
amount = 25
/obj/item/stack/rods/fifty
amount = 50
@@ -78,6 +78,9 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
/obj/item/stack/sheet/metal/fifty
amount = 50
/obj/item/stack/sheet/metal/twenty
amount = 20
/obj/item/stack/sheet/metal/five
amount = 5