mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
[MIRROR] bunch of inits without return and a few easy new to init (#9773)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
052034eb7b
commit
a3ac1d26d7
@@ -11,8 +11,8 @@
|
||||
var/obj/item/inserted_spell/inserting = null
|
||||
var/allow_stacking = 0
|
||||
|
||||
/obj/item/spell/insert/New()
|
||||
..()
|
||||
/obj/item/spell/insert/Initialize()
|
||||
. = ..()
|
||||
set_light(spell_light_range, spell_light_intensity, l_color = light_color)
|
||||
|
||||
/obj/item/inserted_spell
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
var/spell_light_intensity = 2
|
||||
var/spell_light_range = 3
|
||||
|
||||
/obj/item/spell/modifier/New()
|
||||
..()
|
||||
/obj/item/spell/modifier/Initialize()
|
||||
. = ..()
|
||||
set_light(spell_light_range, spell_light_intensity, l_color = light_color)
|
||||
|
||||
/obj/item/spell/modifier/on_melee_cast(atom/hit_atom, mob/user)
|
||||
@@ -38,4 +38,4 @@
|
||||
|
||||
// Technomancer specific subtype which keeps track of spell power and gets targeted specificially by Dispel.
|
||||
/datum/modifier/technomancer
|
||||
var/spell_power = null // Set by on_add_modifier.
|
||||
var/spell_power = null // Set by on_add_modifier.
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
cast_methods = CAST_USE
|
||||
aspect = ASPECT_TELE
|
||||
|
||||
/obj/item/spell/phase_shift/New()
|
||||
..()
|
||||
/obj/item/spell/phase_shift/Initialize()
|
||||
. = ..()
|
||||
set_light(3, 2, l_color = "#FA58F4")
|
||||
|
||||
/obj/effect/phase_shift
|
||||
@@ -28,8 +28,8 @@
|
||||
/obj/effect/phase_shift/ex_act()
|
||||
return
|
||||
|
||||
/obj/effect/phase_shift/New()
|
||||
..()
|
||||
/obj/effect/phase_shift/Initialize()
|
||||
. = ..()
|
||||
set_light(3, 5, l_color = "#FA58F4")
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
adjust_instability(4)
|
||||
..()
|
||||
|
||||
/obj/item/spell/spawner/darkness/New()
|
||||
..()
|
||||
/obj/item/spell/spawner/darkness/Initialize()
|
||||
. = ..()
|
||||
set_light(6, -20, l_color = "#FFFFFF")
|
||||
|
||||
/obj/effect/temporary_effect/darkness
|
||||
@@ -28,4 +28,4 @@
|
||||
invisibility = 101
|
||||
light_range = 6
|
||||
light_power = -20
|
||||
light_on = TRUE
|
||||
light_on = TRUE
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
aspect = ASPECT_UNSTABLE
|
||||
spawner_type = /obj/effect/temporary_effect/destablize
|
||||
|
||||
/obj/item/spell/spawner/destablize/New()
|
||||
..()
|
||||
/obj/item/spell/spawner/destablize/Initialize()
|
||||
. = ..()
|
||||
set_light(3, 2, l_color = "#C26DDE")
|
||||
|
||||
/obj/item/spell/spawner/destablize/on_ranged_cast(atom/hit_atom, mob/user)
|
||||
@@ -51,4 +51,4 @@
|
||||
var/outgoing_instability = instability_power * ( 1 / (radius**2) )
|
||||
L.receive_radiated_instability(outgoing_instability)
|
||||
pulses_remaining--
|
||||
qdel(src)
|
||||
qdel(src)
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
aspect = ASPECT_EMP
|
||||
spawner_type = /obj/effect/temporary_effect/pulse/pulsar
|
||||
|
||||
/obj/item/spell/spawner/pulsar/New()
|
||||
..()
|
||||
/obj/item/spell/spawner/pulsar/Initialize()
|
||||
. = ..()
|
||||
set_light(3, 2, l_color = "#2ECCFA")
|
||||
|
||||
/obj/item/spell/spawner/pulsar/on_ranged_cast(atom/hit_atom, mob/user)
|
||||
@@ -44,7 +44,6 @@
|
||||
. = ..()
|
||||
|
||||
/obj/effect/temporary_effect/pulse/proc/pulse_loop()
|
||||
set waitfor = FALSE
|
||||
|
||||
if(pulses_remaining > 0)
|
||||
pulsetimer = addtimer(CALLBACK(src, PROC_REF(pulse_loop)), pulse_delay, TIMER_STOPPABLE)
|
||||
|
||||
Reference in New Issue
Block a user