mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] some more new to init (#10270)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
3444e3e21d
commit
ad0915a957
@@ -69,8 +69,8 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance
|
||||
// Proc: New()
|
||||
// Parameters: 0
|
||||
// Description: Sets up the catalog, as shown below.
|
||||
/obj/item/technomancer_catalog/New()
|
||||
..()
|
||||
/obj/item/technomancer_catalog/Initialize(mapload)
|
||||
. = ..()
|
||||
set_up()
|
||||
|
||||
// Proc: set_up()
|
||||
|
||||
@@ -37,8 +37,8 @@
|
||||
var/max_summons = 10 // Maximum allowed summoned entities. Some cores will have different caps.
|
||||
var/universal = FALSE // Allows non-technomancers to use the core - VOREStation Add
|
||||
|
||||
/obj/item/technomancer_core/New()
|
||||
..()
|
||||
/obj/item/technomancer_core/Initialize(mapload)
|
||||
. = ..()
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
/obj/item/technomancer_core/Destroy()
|
||||
@@ -142,14 +142,14 @@
|
||||
var/obj/item/technomancer_core/core = null
|
||||
var/ability_icon_state = null
|
||||
|
||||
/obj/spellbutton/New(loc, var/path, var/new_name, var/new_icon_state)
|
||||
if(!path || !ispath(path))
|
||||
message_admins("ERROR: /obj/spellbutton/New() was not given a proper path!")
|
||||
qdel(src)
|
||||
/obj/spellbutton/Initialize(mapload, var/path, var/new_name, var/new_icon_state)
|
||||
. = ..()
|
||||
src.core = loc
|
||||
if(!path || !ispath(path) || !istype(core))
|
||||
message_admins("ERROR: /obj/spellbutton/Initialize() was not given a proper path or not placed into the right location!")
|
||||
return INITIALIZE_HINT_QDEL
|
||||
src.name = new_name
|
||||
src.spellpath = path
|
||||
src.loc = loc
|
||||
src.core = loc
|
||||
src.ability_icon_state = new_icon_state
|
||||
|
||||
/obj/spellbutton/Click()
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
var/datum/effect/effect/system/spark_spread/spark_system = null
|
||||
var/block_percentage = 75
|
||||
|
||||
/obj/item/clothing/suit/armor/shield/New()
|
||||
..()
|
||||
/obj/item/clothing/suit/armor/shield/Initialize(mapload)
|
||||
. = ..()
|
||||
spark_system = new /datum/effect/effect/system/spark_spread()
|
||||
spark_system.set_up(5, 0, src)
|
||||
|
||||
|
||||
@@ -110,16 +110,15 @@
|
||||
// Proc: New()
|
||||
// Parameters: 0
|
||||
// Description: Sets owner to equal its loc, links to the owner's core, then applies overlays if needed.
|
||||
/obj/item/spell/New()
|
||||
..()
|
||||
/obj/item/spell/Initialize(mapload, var/coreless)
|
||||
. = ..()
|
||||
if(isliving(loc))
|
||||
owner = loc
|
||||
if(owner)
|
||||
if(owner && !coreless)
|
||||
core = owner.get_technomancer_core()
|
||||
if(!core)
|
||||
to_chat(owner, span_warning("You need a Core to do that."))
|
||||
qdel(src)
|
||||
return
|
||||
return INITIALIZE_HINT_QDEL
|
||||
// if(istype(/obj/item/technomancer_core, owner.back))
|
||||
// core = owner.back
|
||||
update_icon()
|
||||
|
||||
@@ -41,14 +41,14 @@
|
||||
aspect = ASPECT_CHROMATIC
|
||||
var/glow_color = "#FFFFFF"
|
||||
|
||||
/obj/item/spell/aura/New()
|
||||
..()
|
||||
/obj/item/spell/aura/Initialize(mapload)
|
||||
. = ..()
|
||||
set_light(7, 4, l_color = glow_color)
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
/obj/item/spell/aura/Destroy()
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/item/spell/aura/process()
|
||||
return
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
aspect = ASPECT_LIGHT
|
||||
var/color_to_use = "#FFFFFF"
|
||||
|
||||
/obj/item/spell/chroma/New()
|
||||
..()
|
||||
/obj/item/spell/chroma/Initialize(mapload, coreless)
|
||||
. = ..()
|
||||
set_light(6, 5, l_color = color_to_use)
|
||||
|
||||
/obj/effect/temporary_effect/chroma
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
aspect = ASPECT_FIRE
|
||||
var/obj/item/weldingtool/spell/welder = null
|
||||
|
||||
/obj/item/spell/flame_tongue/New()
|
||||
..()
|
||||
/obj/item/spell/flame_tongue/Initialize(mapload, coreless)
|
||||
. = ..()
|
||||
set_light(3, 2, l_color = "#FF6A00")
|
||||
visible_message(span_warning("\The [loc]'s hand begins to emit a flame."))
|
||||
welder = new /obj/item/weldingtool/spell(src)
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
cast_methods = CAST_USE
|
||||
aspect = ASPECT_UNSTABLE
|
||||
|
||||
/obj/item/spell/instability_tap/New()
|
||||
..()
|
||||
/obj/item/spell/instability_tap/Initialize(mapload, coreless)
|
||||
. = ..()
|
||||
set_light(3, 2, l_color = "#FA58F4")
|
||||
|
||||
/obj/item/spell/instability_tap/on_use_cast(mob/user)
|
||||
@@ -27,4 +27,4 @@
|
||||
core.give_energy(amount)
|
||||
adjust_instability(50)
|
||||
playsound(src, 'sound/effects/supermatter.ogg', 75, 1)
|
||||
qdel(src)
|
||||
qdel(src)
|
||||
|
||||
@@ -16,8 +16,8 @@
|
||||
var/power = 250
|
||||
toggled = 1
|
||||
|
||||
/obj/item/spell/radiance/New()
|
||||
..()
|
||||
/obj/item/spell/radiance/Initialize(mapload, coreless)
|
||||
. = ..()
|
||||
set_light(7, 4, l_color = "#D9D900")
|
||||
START_PROCESSING(SSobj, src)
|
||||
log_and_message_admins("has casted [src].")
|
||||
|
||||
@@ -16,8 +16,8 @@
|
||||
var/damage_to_energy_multiplier = 60.0 //Determines how much energy to charge for blocking, e.g. 20 damage attack = 1200 energy cost
|
||||
var/datum/effect/effect/system/spark_spread/spark_system = null
|
||||
|
||||
/obj/item/spell/reflect/New()
|
||||
..()
|
||||
/obj/item/spell/reflect/Initialize(mapload, coreless)
|
||||
. = ..()
|
||||
set_light(3, 2, l_color = "#006AFF")
|
||||
spark_system = new /datum/effect/effect/system/spark_spread()
|
||||
spark_system.set_up(5, 0, src)
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
var/damage_to_energy_multiplier = 30.0 //Determines how much energy to charge for blocking, e.g. 20 damage attack = 600 energy cost
|
||||
var/datum/effect/effect/system/spark_spread/spark_system = null
|
||||
|
||||
/obj/item/spell/shield/New()
|
||||
..()
|
||||
/obj/item/spell/shield/Initialize(mapload, coreless)
|
||||
. = ..()
|
||||
set_light(3, 2, l_color = "#006AFF")
|
||||
spark_system = new /datum/effect/effect/system/spark_spread()
|
||||
spark_system.set_up(5, 0, src)
|
||||
|
||||
Reference in New Issue
Block a user