Merge pull request #2933 from Citadel-Station-13/upstream-merge-30980

[MIRROR] Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart
This commit is contained in:
LetterJay
2017-09-25 13:28:05 -04:00
committed by GitHub
8 changed files with 297 additions and 299 deletions
+1 -1
View File
@@ -12,7 +12,7 @@
var/turf/T = get_turf(src)
for(var/path in items)
new path(T)
qdel(src)
return INITIALIZE_HINT_QDEL
/obj/effect/spawner/bundle/costume/chicken
name = "chicken costume spawner"
@@ -17,4 +17,4 @@
log_game("An alien egg has been delivered to [A] at [COORD(T)]")
var/message = "Attention [station_name()], we have entrusted you with a research specimen in [A]. Remember to follow all safety precautions when dealing with the specimen."
SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/addtimer, CALLBACK(GLOBAL_PROC, /.proc/print_command_report, message), announcement_time))
qdel(src)
return INITIALIZE_HINT_QDEL
+2 -4
View File
@@ -383,12 +383,10 @@
flags_2 = SLOWS_WHILE_IN_HAND_2
/obj/item/nullrod/tribal_knife/Initialize(mapload)
..()
/obj/item/nullrod/tribal_knife/New()
..()
. = ..()
START_PROCESSING(SSobj, src)
/obj/item/nullrod/tribal_knife/Destroy()
STOP_PROCESSING(SSobj, src)
. = ..()
@@ -122,7 +122,7 @@
golems, so that no golem may ever be forced to serve again.</b>"
/obj/effect/mob_spawn/human/golem/Initialize(mapload, datum/species/golem/species = null, mob/creator = null)
..()
. = ..()
if(species)
name += " ([initial(species.prefix)])"
mob_species = species