mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 19:47:47 +01:00
some more new to init (#17231)
* some more new to init * rigs * rigs * intellisense moment * telcoms and landmarks * fix that as well * some more minor things * re add missing message * fix trash eating...
This commit is contained in:
@@ -113,7 +113,8 @@
|
||||
agony_amount = 80
|
||||
electrocute_amount = 20
|
||||
|
||||
/obj/item/electric_hand/New()
|
||||
/obj/item/electric_hand/Initialize(mapload)
|
||||
. = ..()
|
||||
if(ismob(loc))
|
||||
visible_message(span_warning("Electrical arcs form around [loc.name]\'s hand!"),
|
||||
span_warning("We store a charge of electricity in our hand."),
|
||||
|
||||
@@ -32,7 +32,8 @@
|
||||
icon_state = "electric_hand"
|
||||
show_examine = FALSE
|
||||
|
||||
/obj/item/finger_lockpick/New()
|
||||
/obj/item/finger_lockpick/Initialize(mapload)
|
||||
. = ..()
|
||||
if(ismob(loc))
|
||||
to_chat(loc, span_notice("We shape our finger to fit inside electronics, and are ready to force them open."))
|
||||
|
||||
|
||||
@@ -438,13 +438,10 @@
|
||||
cast_sound = null // Sound file played when this is used.
|
||||
var/last_castcheck = null // The last time this spell was cast.
|
||||
|
||||
/obj/item/spell/construct/New()
|
||||
//..() //This kills the spell, because super on this calls the default spell's New, which checks for a core. Can't have that.
|
||||
if(isliving(loc))
|
||||
owner = loc
|
||||
/obj/item/spell/construct/Initialize(mapload)
|
||||
. = ..(mapload, TRUE)
|
||||
if(!owner)
|
||||
qdel(src)
|
||||
update_icon()
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
/obj/item/spell/construct/adjust_instability(var/amount) //The only drawback to the boons of the geometer is the use of a mortal's blood as fuel. Constructs have already paid that price long ago.
|
||||
return
|
||||
|
||||
@@ -16,13 +16,13 @@ var/global/list/narsie_list = list()
|
||||
consume_range = 3 //How many tiles out do we eat
|
||||
|
||||
|
||||
/obj/singularity/narsie/New()
|
||||
..()
|
||||
/obj/singularity/narsie/Initialize(mapload)
|
||||
. = ..()
|
||||
narsie_list.Add(src)
|
||||
|
||||
/obj/singularity/narsie/Destroy()
|
||||
narsie_list.Remove(src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/singularity/narsie/large
|
||||
name = "Nar-Sie"
|
||||
@@ -40,8 +40,8 @@ var/global/list/narsie_list = list()
|
||||
var/announce=1
|
||||
var/cause_hell = 1
|
||||
|
||||
/obj/singularity/narsie/large/New()
|
||||
..()
|
||||
/obj/singularity/narsie/large/Initialize(mapload)
|
||||
. = ..()
|
||||
if(announce)
|
||||
to_world(span_world(span_narsie(span_red("[uppertext(name)] HAS RISEN"))))
|
||||
world << sound('sound/effects/weather/wind/wind_5_1.ogg')
|
||||
@@ -362,6 +362,8 @@ var/global/list/narsie_list = list()
|
||||
dir = SOUTH
|
||||
move_self = 0
|
||||
flick("narsie_spawn_anim",src)
|
||||
sleep(11)
|
||||
addtimer(CALLBACK(src, PROC_REF(after_animation)), 1.1 SECONDS, TIMER_DELETE_ME)
|
||||
|
||||
/obj/singularity/narsie/proc/after_animation()
|
||||
move_self = 1
|
||||
icon = initial(icon)
|
||||
|
||||
@@ -23,9 +23,6 @@
|
||||
desc = "Directions for use: Requires two people, one to pull each end."
|
||||
var/cracked = 0
|
||||
|
||||
/obj/item/toy/xmas_cracker/New()
|
||||
..()
|
||||
|
||||
/obj/item/toy/xmas_cracker/attack(mob/target, mob/user)
|
||||
if( !cracked && (issilicon(target) || (ishuman(target) && !target.get_active_hand())) && target.stat == CONSCIOUS)
|
||||
target.visible_message(span_notice("[user] and [target] pop \an [src]! *pop*"), span_notice("You pull \an [src] with [target]! *pop*"), span_notice("You hear a *pop*."))
|
||||
|
||||
@@ -151,8 +151,8 @@
|
||||
GLOB.meteor_list -= src
|
||||
return ..()
|
||||
|
||||
/obj/effect/meteor/New()
|
||||
..()
|
||||
/obj/effect/meteor/Initialize()
|
||||
. = ..()
|
||||
SpinAnimation()
|
||||
|
||||
/obj/effect/meteor/Bump(atom/A)
|
||||
|
||||
@@ -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