New() goes in the trash, we've gotta Initialize()

This commit is contained in:
CitadelStationBot
2017-04-26 17:15:48 -05:00
parent e7df2bc14a
commit bcab389ca2
69 changed files with 358 additions and 245 deletions
+2 -2
View File
@@ -223,8 +223,8 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
/obj/effect/proc_holder/spell/proc/playMagSound()
playsound(get_turf(usr), sound,50,1)
/obj/effect/proc_holder/spell/New()
..()
/obj/effect/proc_holder/spell/Initialize()
. = ..()
action = new(src)
still_recharging_msg = "<span class='notice'>[name] is still recharging.</span>"
+2 -2
View File
@@ -26,8 +26,8 @@
/obj/effect/forcefield/wizard
var/mob/wizard
/obj/effect/forcefield/wizard/New(atom/loc, mob/summoner)
..()
/obj/effect/forcefield/wizard/Initialize(mapload, mob/summoner)
. = ..()
wizard = summoner
QDEL_IN(src, 300)
+3 -3
View File
@@ -14,9 +14,9 @@
throw_range = 0
throw_speed = 0
/obj/item/weapon/melee/touch_attack/New(var/spell)
attached_spell = spell
..()
/obj/item/weapon/melee/touch_attack/Initialize()
attached_spell = loc
. = ..()
/obj/item/weapon/melee/touch_attack/attack(mob/target, mob/living/carbon/user)
if(!iscarbon(user)) //Look ma, no hands
+2 -2
View File
@@ -5,8 +5,8 @@
var/list/linked_spells = list() //those are just referenced by the trigger spell and are unaffected by it directly
var/list/starting_spells = list() //those are added on New() to contents from default spells and are deleted when the trigger spell is deleted to prevent memory leaks
/obj/effect/proc_holder/spell/targeted/trigger/New()
..()
/obj/effect/proc_holder/spell/targeted/trigger/Initialize()
. = ..()
for(var/spell in starting_spells)
var/spell_to_add = text2path(spell)