diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 68c384a4b86..10a9a76831a 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -168,9 +168,13 @@ righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' block_chance = 50 -/obj/item/staff/bostaff/ComponentInitialize() +/obj/item/staff/bostaff/Initialize(mapload) . = ..() - AddComponent(/datum/component/two_handed, force_unwielded=10, force_wielded=24, icon_wielded="[base_icon_state]1") + AddComponent(/datum/component/two_handed, \ + force_unwielded = 10, \ + force_wielded = 24, \ + icon_wielded = "[base_icon_state]1", \ + ) /obj/item/staff/bostaff/update_icon_state() icon_state = "[base_icon_state]0" diff --git a/code/game/atoms.dm b/code/game/atoms.dm index f3155c3a675..2ea5fd79166 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -272,7 +272,6 @@ // The integrity to max_integrity ratio is still preserved. set_custom_materials(custom_materials) - ComponentInitialize() InitializeAIController() return INITIALIZE_HINT_NORMAL @@ -291,10 +290,6 @@ /atom/proc/LateInitialize() set waitfor = FALSE -/// Put your [AddComponent] calls here -/atom/proc/ComponentInitialize() - return - /** * Top level of the destroy chain for most atoms * diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 111dbc88e8b..26ebb3e7307 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -61,9 +61,6 @@ AddElement(/datum/element/connect_loc, loc_connections) AddElement(/datum/element/atmos_sensitive, mapload) - -/obj/machinery/door/window/ComponentInitialize() - . = ..() AddComponent(/datum/component/ntnet_interface) /obj/machinery/door/window/Destroy() diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 0692c51c788..c2cd3bfc9bd 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -317,13 +317,10 @@ inject_only = TRUE /obj/machinery/iv_drip/saline/Initialize(mapload) + AddElement(/datum/element/update_icon_blocker) . = ..() reagent_container = new /obj/item/reagent_containers/glass/saline(src) -/obj/machinery/iv_drip/saline/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_blocker) - /obj/machinery/iv_drip/saline/eject_beaker() return diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 382458e7a79..c4a5ddae24a 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -724,7 +724,7 @@ DEFINE_BITFIELD(turret_flags, list( faction = list(ROLE_SYNDICATE) desc = "A ballistic machine gun auto-turret." -/obj/machinery/porta_turret/syndicate/ComponentInitialize() +/obj/machinery/porta_turret/syndicate/Initialize(mapload) . = ..() AddElement(/datum/element/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES) @@ -827,7 +827,7 @@ DEFINE_BITFIELD(turret_flags, list( faction = list("neutral","silicon","turret") mode = TURRET_LETHAL -/obj/machinery/porta_turret/centcom_shuttle/ComponentInitialize() +/obj/machinery/porta_turret/centcom_shuttle/Initialize(mapload) . = ..() AddElement(/datum/element/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES) diff --git a/code/game/objects/effects/decals/cleanable/robots.dm b/code/game/objects/effects/decals/cleanable/robots.dm index b7fe891900b..fd048e16f99 100644 --- a/code/game/objects/effects/decals/cleanable/robots.dm +++ b/code/game/objects/effects/decals/cleanable/robots.dm @@ -104,6 +104,6 @@ random_icon_states = list("streak1", "streak2", "streak3", "streak4", "streak5") beauty = -50 -/obj/effect/decal/cleanable/oil/slippery/ComponentInitialize() +/obj/effect/decal/cleanable/oil/slippery/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery, 80, (NO_SLIP_WHEN_WALKING | SLIDE)) diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm index 309fc091388..68e446c9d42 100644 --- a/code/game/objects/effects/decals/decal.dm +++ b/code/game/objects/effects/decals/decal.dm @@ -37,12 +37,9 @@ layer = TURF_DECAL_LAYER /obj/effect/turf_decal/Initialize(mapload) - ..() - return INITIALIZE_HINT_QDEL - -/obj/effect/turf_decal/ComponentInitialize() . = ..() var/turf/T = loc if(!istype(T)) //you know this will happen somehow CRASH("Turf decal initialized in an object/nullspace") T.AddElement(/datum/element/decal, icon, icon_state, dir, null, null, alpha, color, null, FALSE, null) + return INITIALIZE_HINT_QDEL diff --git a/code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm b/code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm index fb08bfa4ab0..6d0f7b7c95a 100644 --- a/code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm +++ b/code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm @@ -38,16 +38,13 @@ /obj/effect/particle_effect/fluid/foam/Initialize(mapload) . = ..() + if(slippery_foam) + AddComponent(/datum/component/slippery, 100) create_reagents(1000, REAGENT_HOLDER_INSTANT_REACT) playsound(src, 'sound/effects/bubbles2.ogg', 80, TRUE, -3) AddElement(/datum/element/atmos_sensitive, mapload) SSfoam.start_processing(src) -/obj/effect/particle_effect/fluid/foam/ComponentInitialize() - . = ..() - if(slippery_foam) - AddComponent(/datum/component/slippery, 100) - /obj/effect/particle_effect/fluid/foam/Destroy() SSfoam.stop_processing(src) if (spread_bucket) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 9d79af31a84..c6e6bb57eaa 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -225,6 +225,9 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons if(species_exception) species_exception = string_list(species_exception) + if(sharpness && force > 5) //give sharp objects butchering functionality, for consistency + AddComponent(/datum/component/butchering, speed = 8 SECONDS * toolspeed) + . = ..() // Handle adding item associated actions @@ -324,14 +327,6 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons if(B && B.loc == loc) atom_destruction(MELEE) -/obj/item/ComponentInitialize() - . = ..() - - if(sharpness && force > 5) //give sharp objects butchering functionality, for consistency - AddComponent(/datum/component/butchering, \ - speed = 8 SECONDS * toolspeed, \ - ) - /**Makes cool stuff happen when you suicide with an item * *Outputs a creative message and then return the damagetype done diff --git a/code/game/objects/items/RCL.dm b/code/game/objects/items/RCL.dm index b6115099303..de5e72f8eb9 100644 --- a/code/game/objects/items/RCL.dm +++ b/code/game/objects/items/RCL.dm @@ -23,8 +23,7 @@ var/datum/radial_menu/persistent/wiring_gui_menu var/mob/listeningTo - -/obj/item/rcl/ComponentInitialize() +/obj/item/rcl/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) AddComponent(/datum/component/two_handed, wield_callback = CALLBACK(src, .proc/on_wield), unwield_callback = CALLBACK(src, .proc/on_unwield)) diff --git a/code/game/objects/items/binoculars.dm b/code/game/objects/items/binoculars.dm index f42abf7a836..c2d37828d5e 100644 --- a/code/game/objects/items/binoculars.dm +++ b/code/game/objects/items/binoculars.dm @@ -12,7 +12,7 @@ var/zoom_out_amt = 5.5 var/zoom_amt = 10 -/obj/item/binoculars/ComponentInitialize() +/obj/item/binoculars/Initialize(mapload) . = ..() AddComponent(/datum/component/two_handed, force_unwielded=8, force_wielded=12, wield_callback = CALLBACK(src, .proc/on_wield), unwield_callback = CALLBACK(src, .proc/on_unwield)) diff --git a/code/game/objects/items/broom.dm b/code/game/objects/items/broom.dm index 9a16bf70863..3ca34b281d8 100644 --- a/code/game/objects/items/broom.dm +++ b/code/game/objects/items/broom.dm @@ -18,7 +18,7 @@ attack_verb_simple = list("sweep", "brush off", "bludgeon", "whack") resistance_flags = FLAMMABLE -/obj/item/pushbroom/ComponentInitialize() +/obj/item/pushbroom/Initialize(mapload) . = ..() AddComponent(/datum/component/two_handed, force_unwielded=8, force_wielded=12, icon_wielded="[base_icon_state]1", wield_callback = CALLBACK(src, .proc/on_wield), unwield_callback = CALLBACK(src, .proc/on_unwield)) diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm index b99c67fcb49..bba0fa956cb 100644 --- a/code/game/objects/items/chainsaw.dm +++ b/code/game/objects/items/chainsaw.dm @@ -24,14 +24,14 @@ toolspeed = 1.5 //Turn it on first you dork var/on = FALSE -/obj/item/chainsaw/ComponentInitialize() +/obj/item/chainsaw/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, \ - speed = 3 SECONDS, \ - effectiveness = 100, \ - bonus_modifier = 0, \ - butcher_sound = 'sound/weapons/chainsawhit.ogg', \ - disabled = TRUE, \ + speed = 3 SECONDS, \ + effectiveness = 100, \ + bonus_modifier = 0, \ + butcher_sound = 'sound/weapons/chainsawhit.ogg', \ + disabled = TRUE, \ ) AddComponent(/datum/component/two_handed, require_twohands=TRUE) diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 91c1e5106b8..a8960daa6b3 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -340,7 +340,7 @@ var/recharge_time = 6 SECONDS // Only applies to defibs that do not require a defibrilator. See: .proc/do_success var/combat = FALSE //If it penetrates armor and gives additional functionality -/obj/item/shockpaddles/ComponentInitialize() +/obj/item/shockpaddles/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) AddComponent(/datum/component/two_handed, force_unwielded=8, force_wielded=12) diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 48b1e19b99a..200469c7651 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -12,7 +12,7 @@ var/list/voicespan = list(SPAN_COMMAND) //SKYRAT EDIT ADDITION BEGIN -/obj/item/megaphone/ComponentInitialize() +/obj/item/megaphone/Initialize(mapload) . = ..() AddComponent(/datum/component/cell) //SKYRAT EDIT ADDITION END diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 149b8f87705..0c5a052db7a 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -109,13 +109,17 @@ GLOBAL_LIST_INIT(channel_tokens, list( /obj/item/radio/headset/syndicate //disguised to look like a normal headset for stealth ops +/obj/item/radio/headset/syndicate/Initialize(mapload) + . = ..() + make_syndie() + /obj/item/radio/headset/syndicate/alt //undisguised bowman with flash protection name = "syndicate headset" desc = "A syndicate headset that can be used to hear all radio frequencies. Protects ears from flashbangs." icon_state = "syndie_headset" inhand_icon_state = "syndie_headset" -/obj/item/radio/headset/syndicate/alt/ComponentInitialize() +/obj/item/radio/headset/syndicate/alt/Initialize(mapload) . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) @@ -123,11 +127,8 @@ GLOBAL_LIST_INIT(channel_tokens, list( name = "team leader headset" command = TRUE -/obj/item/radio/headset/syndicate/Initialize(mapload) - . = ..() - make_syndie() - /obj/item/radio/headset/binary + /obj/item/radio/headset/binary/Initialize(mapload) . = ..() qdel(keyslot) @@ -146,7 +147,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( icon_state = "sec_headset_alt" inhand_icon_state = "sec_headset_alt" -/obj/item/radio/headset/headset_sec/alt/ComponentInitialize() +/obj/item/radio/headset/headset_sec/alt/Initialize(mapload) . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) @@ -213,7 +214,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( icon_state = "com_headset_alt" inhand_icon_state = "com_headset_alt" -/obj/item/radio/headset/heads/captain/alt/ComponentInitialize() +/obj/item/radio/headset/heads/captain/alt/Initialize(mapload) . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) @@ -235,7 +236,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( icon_state = "com_headset_alt" inhand_icon_state = "com_headset_alt" -/obj/item/radio/headset/heads/hos/alt/ComponentInitialize() +/obj/item/radio/headset/heads/hos/alt/Initialize(mapload) . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) @@ -302,7 +303,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( inhand_icon_state = "cent_headset_alt" keyslot = null -/obj/item/radio/headset/headset_cent/alt/ComponentInitialize() +/obj/item/radio/headset/headset_cent/alt/Initialize(mapload) . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) diff --git a/code/game/objects/items/devices/scanners/health_analyzer.dm b/code/game/objects/items/devices/scanners/health_analyzer.dm index c8b4af0ca8c..dd1694d07a7 100644 --- a/code/game/objects/items/devices/scanners/health_analyzer.dm +++ b/code/game/objects/items/devices/scanners/health_analyzer.dm @@ -36,7 +36,7 @@ . += span_notice("Alt-click [src] to toggle the limb damage readout.") //SKYRAT EDIT ADDITION BEGIN -/obj/item/healthanalyzer/ComponentInitialize() +/obj/item/healthanalyzer/Initialize(mapload) . = ..() AddComponent(/datum/component/cell) //SKYRAT EDIT END diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index aabd459deca..9c7fd4d4b12 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -288,7 +288,7 @@ effective or pretty fucking useless. var/cell_override = /obj/item/stock_parts/cell/bluespace //SKYRAT ADDITION //SKYRAT EDIT ADDITION BEGIN -/obj/item/jammer/ComponentInitialize() +/obj/item/jammer/Initialize(mapload) . = ..() AddComponent(/datum/component/cell, cell_override, CALLBACK(src, .proc/turn_off)) diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm index 6e61c32c8ad..e663c1e5004 100644 --- a/code/game/objects/items/dice.dm +++ b/code/game/objects/items/dice.dm @@ -157,9 +157,9 @@ w_class = WEIGHT_CLASS_SMALL sides = 100 -/obj/item/dice/d100/ComponentInitialize() - . = ..() +/obj/item/dice/d100/Initialize(mapload) AddElement(/datum/element/update_icon_blocker) + return ..() /obj/item/dice/eightbd20 name = "strange d20" @@ -168,9 +168,9 @@ sides = 20 special_faces = list("It is certain","It is decidedly so","Without a doubt","Yes, definitely","You may rely on it","As I see it, yes","Most likely","Outlook good","Yes","Signs point to yes","Reply hazy try again","Ask again later","Better not tell you now","Cannot predict now","Concentrate and ask again","Don't count on it","My reply is no","My sources say no","Outlook not so good","Very doubtful") -/obj/item/dice/eightbd20/ComponentInitialize() - . = ..() +/obj/item/dice/eightbd20/Initialize(mapload) AddElement(/datum/element/update_icon_blocker) + return ..() /obj/item/dice/fourdd6 name = "4d d6" @@ -179,9 +179,9 @@ sides = 48 special_faces = list("Cube-Side: 1-1","Cube-Side: 1-2","Cube-Side: 1-3","Cube-Side: 1-4","Cube-Side: 1-5","Cube-Side: 1-6","Cube-Side: 2-1","Cube-Side: 2-2","Cube-Side: 2-3","Cube-Side: 2-4","Cube-Side: 2-5","Cube-Side: 2-6","Cube-Side: 3-1","Cube-Side: 3-2","Cube-Side: 3-3","Cube-Side: 3-4","Cube-Side: 3-5","Cube-Side: 3-6","Cube-Side: 4-1","Cube-Side: 4-2","Cube-Side: 4-3","Cube-Side: 4-4","Cube-Side: 4-5","Cube-Side: 4-6","Cube-Side: 5-1","Cube-Side: 5-2","Cube-Side: 5-3","Cube-Side: 5-4","Cube-Side: 5-5","Cube-Side: 5-6","Cube-Side: 6-1","Cube-Side: 6-2","Cube-Side: 6-3","Cube-Side: 6-4","Cube-Side: 6-5","Cube-Side: 6-6","Cube-Side: 7-1","Cube-Side: 7-2","Cube-Side: 7-3","Cube-Side: 7-4","Cube-Side: 7-5","Cube-Side: 7-6","Cube-Side: 8-1","Cube-Side: 8-2","Cube-Side: 8-3","Cube-Side: 8-4","Cube-Side: 8-5","Cube-Side: 8-6") -/obj/item/dice/fourdd6/ComponentInitialize() - . = ..() +/obj/item/dice/fourdd6/Initialize(mapload) AddElement(/datum/element/update_icon_blocker) + return ..() /obj/item/dice/attack_self(mob/user) diceroll(user) diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm index 93d334610ef..0b7e85baec8 100644 --- a/code/game/objects/items/dualsaber.dm +++ b/code/game/objects/items/dualsaber.dm @@ -36,10 +36,16 @@ var/hacked = FALSE var/list/possible_colors = list("red", "blue", "green", "purple") -/obj/item/dualsaber/ComponentInitialize() +/obj/item/dualsaber/Initialize(mapload) . = ..() - AddComponent(/datum/component/two_handed, force_unwielded=force, force_wielded=two_hand_force, wieldsound='sound/weapons/saberon.ogg', unwieldsound='sound/weapons/saberoff.ogg', \ - wield_callback = CALLBACK(src, .proc/on_wield), unwield_callback = CALLBACK(src, .proc/on_unwield)) + AddComponent(/datum/component/two_handed, \ + force_unwielded = force, \ + force_wielded = two_hand_force, \ + wieldsound = 'sound/weapons/saberon.ogg', \ + unwieldsound = 'sound/weapons/saberoff.ogg', \ + wield_callback = CALLBACK(src, .proc/on_wield), \ + unwield_callback = CALLBACK(src, .proc/on_unwield), \ + ) /// Triggered on wield of two handed item /// Specific hulk checks due to reflection chance for balance issues and switches hitsounds. diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index 61b97ff65bf..2781240eb07 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -77,13 +77,10 @@ reagents.add_reagent(chem, max_water) /obj/item/extinguisher/Initialize(mapload) - . = ..() - refill() - -/obj/item/extinguisher/ComponentInitialize() . = ..() if(tank_holder_icon_state) AddComponent(/datum/component/container_item/tank_holder, tank_holder_icon_state) + refill() /obj/item/extinguisher/advanced name = "advanced fire extinguisher" diff --git a/code/game/objects/items/fireaxe.dm b/code/game/objects/items/fireaxe.dm index 7b8b6410820..362efc741c3 100644 --- a/code/game/objects/items/fireaxe.dm +++ b/code/game/objects/items/fireaxe.dm @@ -29,14 +29,11 @@ /obj/item/fireaxe/Initialize(mapload) . = ..() - -/obj/item/fireaxe/ComponentInitialize() - . = ..() AddComponent(/datum/component/butchering, \ - speed = 10 SECONDS, \ - effectiveness = 80, \ - bonus_modifier = 0 , \ - butcher_sound = hitsound, \ + speed = 10 SECONDS, \ + effectiveness = 80, \ + bonus_modifier = 0 , \ + butcher_sound = hitsound, \ ) //axes are not known for being precision butchering tools AddComponent(/datum/component/two_handed, force_unwielded=force_unwielded, force_wielded=force_wielded, icon_wielded="[base_icon_state]1") diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm index 400b9898951..1ba161adb87 100644 --- a/code/game/objects/items/flamethrower.dm +++ b/code/game/objects/items/flamethrower.dm @@ -31,7 +31,7 @@ var/acti_sound = 'sound/items/welderactivate.ogg' var/deac_sound = 'sound/items/welderdeactivate.ogg' -/obj/item/flamethrower/ComponentInitialize() +/obj/item/flamethrower/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) diff --git a/code/game/objects/items/food/bread.dm b/code/game/objects/items/food/bread.dm index d0faabefd48..e3c8d148a98 100644 --- a/code/game/objects/items/food/bread.dm +++ b/code/game/objects/items/food/bread.dm @@ -291,7 +291,7 @@ foodtypes = GRAIN | DAIRY w_class = WEIGHT_CLASS_SMALL -/obj/item/food/butterdog/ComponentInitialize() +/obj/item/food/butterdog/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery, 8 SECONDS) diff --git a/code/game/objects/items/food/meat.dm b/code/game/objects/items/food/meat.dm index e0a6db240da..4624592e98f 100644 --- a/code/game/objects/items/food/meat.dm +++ b/code/game/objects/items/food/meat.dm @@ -616,9 +616,9 @@ tastes = list("meat" = 5, "clowns" = 3, "sixteen teslas" = 1) w_class = WEIGHT_CLASS_SMALL -/obj/item/food/meatclown/ComponentInitialize() +/obj/item/food/meatclown/Initialize(mapload) . = ..() - AddComponent(/datum/component/slippery, 30) + AddComponent(/datum/component/slippery, 3 SECONDS) /obj/item/food/lasagna name = "Lasagna" diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index 51870c43210..d4e91d0ef59 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -29,14 +29,11 @@ /obj/item/grenade/chem_grenade/Initialize(mapload) . = ..() + AddElement(/datum/element/empprotection, EMP_PROTECT_WIRES) create_reagents(casing_holder_volume) stage_change() // If no argument is set, it will change the stage to the current stage, useful for stock grenades that start READY. wires = new /datum/wires/explosive/chem_grenade(src) -/obj/item/grenade/chem_grenade/ComponentInitialize() - . = ..() - AddElement(/datum/element/empprotection, EMP_PROTECT_WIRES) - /obj/item/grenade/chem_grenade/examine(mob/user) display_timer = (stage == GRENADE_READY) //show/hide the timer based on assembly state . = ..() diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm index bfd5c1494cd..1e24bb948f0 100644 --- a/code/game/objects/items/grenades/plastic.dm +++ b/code/game/objects/items/grenades/plastic.dm @@ -25,13 +25,10 @@ /obj/item/grenade/c4/Initialize(mapload) . = ..() + AddElement(/datum/element/empprotection, EMP_PROTECT_WIRES) plastic_overlay = mutable_appearance(icon, "[inhand_icon_state]2", HIGH_OBJ_LAYER) wires = new /datum/wires/explosive/c4(src) -/obj/item/grenade/c4/ComponentInitialize() - . = ..() - AddElement(/datum/element/empprotection, EMP_PROTECT_WIRES) - /obj/item/grenade/c4/Destroy() qdel(wires) wires = null diff --git a/code/game/objects/items/pitchfork.dm b/code/game/objects/items/pitchfork.dm index a2c6d70331f..2ae15fb8eb4 100644 --- a/code/game/objects/items/pitchfork.dm +++ b/code/game/objects/items/pitchfork.dm @@ -22,7 +22,7 @@ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 100, ACID = 30) resistance_flags = FIRE_PROOF -/obj/item/pitchfork/ComponentInitialize() +/obj/item/pitchfork/Initialize(mapload) . = ..() AddComponent(/datum/component/two_handed, force_unwielded=7, force_wielded=15, icon_wielded="[base_icon_state]1") diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 5166d66690c..938f7c81f64 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -576,7 +576,7 @@ icon_state = "plushie_awake" inhand_icon_state = "plushie_awake" -/obj/item/toy/plush/awakenedplushie/ComponentInitialize() +/obj/item/toy/plush/awakenedplushie/Initialize(mapload) . = ..() AddComponent(/datum/component/edit_complainer) diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index de0718fe643..150fdfdf33f 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -129,9 +129,6 @@ /obj/item/shield/riot/flash/Initialize(mapload) . = ..() embedded_flash = new(src) - -/obj/item/shield/riot/flash/ComponentInitialize() - . = .. () AddElement(/datum/element/update_icon_updates_onmob) /obj/item/shield/riot/flash/attack(mob/living/M, mob/user) diff --git a/code/game/objects/items/singularityhammer.dm b/code/game/objects/items/singularityhammer.dm index c70aa3dc2aa..bff80cc9020 100644 --- a/code/game/objects/items/singularityhammer.dm +++ b/code/game/objects/items/singularityhammer.dm @@ -21,10 +21,10 @@ /obj/item/singularityhammer/Initialize(mapload) . = ..() AddElement(/datum/element/kneejerk) - -/obj/item/singularityhammer/ComponentInitialize() - . = ..() - AddComponent(/datum/component/two_handed, force_multiplier=4, icon_wielded="[base_icon_state]1") + AddComponent(/datum/component/two_handed, \ + force_multiplier = 4, \ + icon_wielded = "[base_icon_state]1", \ + ) /obj/item/singularityhammer/update_icon_state() icon_state = "[base_icon_state]0" @@ -80,9 +80,13 @@ throw_range = 7 w_class = WEIGHT_CLASS_HUGE -/obj/item/mjollnir/ComponentInitialize() +/obj/item/mjollnir/Initialize(mapload) . = ..() - AddComponent(/datum/component/two_handed, force_multiplier=5, icon_wielded="[base_icon_state]1", attacksound=SFX_SPARKS) + AddComponent(/datum/component/two_handed, \ + force_multiplier = 5, \ + icon_wielded = "[base_icon_state]1", \ + attacksound = SFX_SPARKS, \ + ) /obj/item/mjollnir/update_icon_state() icon_state = "[base_icon_state]0" diff --git a/code/game/objects/items/skub.dm b/code/game/objects/items/skub.dm index a35f817f54f..ba1231f1520 100644 --- a/code/game/objects/items/skub.dm +++ b/code/game/objects/items/skub.dm @@ -7,7 +7,7 @@ attack_verb_continuous = list("skubs") attack_verb_simple = list("skub") -/obj/item/skub/ComponentInitialize() +/obj/item/skub/Initialize(mapload) . = ..() AddComponent(/datum/component/container_item/tank_holder, "holder_skub", FALSE) diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm index 1438484971f..8bd59fc803e 100644 --- a/code/game/objects/items/spear.dm +++ b/code/game/objects/items/spear.dm @@ -34,16 +34,18 @@ /obj/item/spear/Initialize(mapload) . = ..() force = force_unwielded - -/obj/item/spear/ComponentInitialize() - . = ..() - AddComponent(/datum/component/butchering, \ - speed = 10 SECONDS, \ - effectiveness = 70, \ - ) //decent in a pinch, but pretty bad. AddComponent(/datum/component/jousting) - AddComponent(/datum/component/two_handed, force_unwielded=force_unwielded, force_wielded=force_wielded, icon_wielded="[icon_prefix]1") + + AddComponent(/datum/component/butchering, \ + speed = 10 SECONDS, \ + effectiveness = 70, \ + ) + AddComponent(/datum/component/two_handed, \ + force_unwielded = force_unwielded, \ + force_wielded = force_wielded, \ + icon_wielded = "[icon_prefix]1", \ + ) update_appearance() /obj/item/spear/update_icon_state() @@ -207,7 +209,7 @@ armour_penetration = 15 //Enhanced armor piercing -/obj/item/spear/bonespear/ComponentInitialize() +/obj/item/spear/bonespear/Initialize(mapload) . = ..() AddComponent(/datum/component/two_handed, force_unwielded=8, force_wielded=16, icon_wielded="[icon_prefix]1") //SKYRAT EDIT diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index b5a48944209..1b58b917262 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -92,9 +92,9 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ else return ..() -/obj/item/stack/rods/cyborg/ComponentInitialize() - . = ..() +/obj/item/stack/rods/cyborg/Initialize(mapload) AddElement(/datum/element/update_icon_blocker) + return ..() /obj/item/stack/rods/ten amount = 10 diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm index dfd68b339d5..c05300dd2e4 100644 --- a/code/game/objects/items/tanks/tanks.dm +++ b/code/game/objects/items/tanks/tanks.dm @@ -78,6 +78,9 @@ /obj/item/tank/Initialize(mapload) . = ..() + if(tank_holder_icon_state) + AddComponent(/datum/component/container_item/tank_holder, tank_holder_icon_state) + air_contents = new(volume) //liters air_contents.temperature = T20C @@ -97,11 +100,6 @@ /obj/item/tank/proc/populate_gas() return -/obj/item/tank/ComponentInitialize() - . = ..() - if(tank_holder_icon_state) - AddComponent(/datum/component/container_item/tank_holder, tank_holder_icon_state) - /obj/item/tank/Destroy() UnregisterSignal(air_contents, COMSIG_GASMIX_MERGED) air_contents = null diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index c5970dc28d2..361730ef5fd 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -51,15 +51,12 @@ /obj/item/weldingtool/Initialize(mapload) . = ..() + AddElement(/datum/element/update_icon_updates_onmob) + AddElement(/datum/element/tool_flash, light_range) create_reagents(max_fuel) reagents.add_reagent(/datum/reagent/fuel, max_fuel) update_appearance() -/obj/item/weldingtool/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - AddElement(/datum/element/tool_flash, light_range) - /obj/item/weldingtool/update_icon_state() if(welding) inhand_icon_state = "[initial(inhand_icon_state)]1" diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 5c256f740e6..2c6b11b112b 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -43,12 +43,9 @@ inhand_icon_state = "balloon-empty" /obj/item/toy/waterballoon/Initialize(mapload) - . = ..() - create_reagents(10) - -/obj/item/toy/waterballoon/ComponentInitialize() . = ..() AddElement(/datum/element/update_icon_updates_onmob) + create_reagents(10) /obj/item/toy/waterballoon/attack(mob/living/carbon/human/M, mob/user) return diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index c0cb4a77941..553dbb2e00f 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -960,12 +960,12 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/highfrequencyblade/Initialize(mapload) . = ..() + AddComponent(/datum/component/two_handed, \ + wield_callback = CALLBACK(src, .proc/on_wield), \ + unwield_callback = CALLBACK(src, .proc/on_unwield), \ + ) AddElement(/datum/element/update_icon_updates_onmob) -/obj/item/highfrequencyblade/ComponentInitialize() - . = ..() - AddComponent(/datum/component/two_handed, wield_callback = CALLBACK(src, .proc/on_wield), unwield_callback = CALLBACK(src, .proc/on_unwield)) - /obj/item/highfrequencyblade/update_icon_state() icon_state = "hfrequency[HAS_TRAIT(src, TRAIT_WIELDED)]" return ..() diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index be5b72dc8b7..3d3e2202d0a 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -76,7 +76,6 @@ log_telecomms("Created [src]([REF(src)] in nullspace, assuming network to be in station") network_id = NETWORK_NAME_COMBINE(STATION_NETWORK_ROOT, network_id) // I regret nothing!! AddComponent(/datum/component/ntnet_interface, network_id, id_tag) - /// Needs to run before as ComponentInitialize runs after this statement...why do we have ComponentInitialize again? /obj/Destroy(force) diff --git a/code/game/objects/structures/life_candle.dm b/code/game/objects/structures/life_candle.dm index 988203a7eeb..2ce45d8f018 100644 --- a/code/game/objects/structures/life_candle.dm +++ b/code/game/objects/structures/life_candle.dm @@ -24,7 +24,7 @@ var/respawn_time = 50 var/respawn_sound = 'sound/magic/staff_animation.ogg' -/obj/structure/life_candle/ComponentInitialize() +/obj/structure/life_candle/Initialize(mapload) . = ..() AddElement(/datum/element/movetype_handler) diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 35fad6d07e0..c1d82f868f5 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -233,9 +233,6 @@ max_integrity = 300 light_range = 2 -/obj/structure/mineral_door/uranium/ComponentInitialize() - return - /obj/structure/mineral_door/sandstone name = "sandstone door" icon_state = "sandstone" @@ -332,9 +329,6 @@ return ..() -/obj/structure/mineral_door/paperframe/ComponentInitialize() - return - /obj/structure/mineral_door/paperframe/Destroy() if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) QUEUE_SMOOTH_NEIGHBORS(src) diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm index 0429891bc42..e8d99e2558d 100644 --- a/code/game/turfs/open/_open.dm +++ b/code/game/turfs/open/_open.dm @@ -70,7 +70,7 @@ /turf/open/indestructible/permalube icon_state = "darkfull" -/turf/open/indestructible/permalube/ComponentInitialize() +/turf/open/indestructible/permalube/Initialize(mapload) . = ..() AddComponent(/datum/component/wet_floor, TURF_WET_LUBE, INFINITY, 0, INFINITY, TRUE) @@ -83,7 +83,7 @@ heavyfootstep = null var/sound = 'sound/effects/clownstep1.ogg' -/turf/open/indestructible/honk/ComponentInitialize() +/turf/open/indestructible/honk/Initialize(mapload) . = ..() AddComponent(/datum/component/wet_floor, TURF_WET_SUPERLUBE, INFINITY, 0, INFINITY, TRUE) diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm index bb65ee31383..a08af3da60a 100644 --- a/code/game/turfs/open/floor/misc_floor.dm +++ b/code/game/turfs/open/floor/misc_floor.dm @@ -205,12 +205,9 @@ color = COLOR_BROWN /turf/open/floor/plating/rust/Initialize(mapload) - . = ..() - color = null - -/turf/open/floor/plating/rust/ComponentInitialize() . = ..() AddElement(/datum/element/rust) + color = null /turf/open/floor/plating/plasma initial_gas_mix = ATMOS_TANK_PLASMA diff --git a/code/game/turfs/open/space/space.dm b/code/game/turfs/open/space/space.dm index e5f74afcf44..72740cd7a8c 100644 --- a/code/game/turfs/open/space/space.dm +++ b/code/game/turfs/open/space/space.dm @@ -80,8 +80,6 @@ if(T) T.multiz_turf_new(src, UP) - ComponentInitialize() - return INITIALIZE_HINT_NORMAL //ATTACK GHOST IGNORING PARENT RETURN VALUE diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 900c57bad5f..6b9e5e6f0f4 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -148,8 +148,6 @@ GLOBAL_LIST_EMPTY(station_turfs) // apply materials properly from the default custom_materials value set_custom_materials(custom_materials) - ComponentInitialize() - if(uses_integrity) atom_integrity = max_integrity diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm index 3834bff8782..066dcb031e2 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm @@ -456,7 +456,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} var/sleep_time = 2 MINUTES var/time_to_cuff = 3 SECONDS -/obj/item/melee/baton/abductor/ComponentInitialize() +/obj/item/melee/baton/abductor/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) @@ -645,12 +645,9 @@ Congratulations! You are now trained for invasive xenobiology research!"} keyslot2 = new /obj/item/encryptionkey/heads/captain /obj/item/radio/headset/abductor/Initialize(mapload) - . = ..() - make_syndie() - -/obj/item/radio/headset/abductor/ComponentInitialize() . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) + make_syndie() // Stops humans from disassembling abductor headsets. /obj/item/radio/headset/abductor/screwdriver_act(mob/living/user, obj/item/tool) diff --git a/code/modules/antagonists/blob/structures/core.dm b/code/modules/antagonists/blob/structures/core.dm index 776e8f1cd26..ed4da5c339a 100644 --- a/code/modules/antagonists/blob/structures/core.dm +++ b/code/modules/antagonists/blob/structures/core.dm @@ -27,7 +27,8 @@ if(overmind) overmind.blobstrain.on_gain() update_appearance() - . = ..() + AddComponent(/datum/component/stationloving, FALSE, TRUE) + return ..() /obj/structure/blob/special/core/Destroy() GLOB.blob_cores -= src @@ -75,10 +76,6 @@ produce_spores() ..() -/obj/structure/blob/special/core/ComponentInitialize() - . = ..() - AddComponent(/datum/component/stationloving, FALSE, TRUE) - /obj/structure/blob/special/core/on_changed_z_level(turf/old_turf, turf/new_turf) if(overmind && is_station_level(new_turf?.z)) overmind.forceMove(get_turf(src)) diff --git a/code/modules/antagonists/clown_ops/clown_weapons.dm b/code/modules/antagonists/clown_ops/clown_weapons.dm index 4cb548d9071..27ebf75aeb8 100644 --- a/code/modules/antagonists/clown_ops/clown_weapons.dm +++ b/code/modules/antagonists/clown_ops/clown_weapons.dm @@ -23,7 +23,7 @@ /obj/item/clothing/shoes/clown_shoes/combat/Initialize(mapload) . = ..() - + create_storage(type = /datum/storage/pockets/shoes) /// Recharging rate in PPS (peels per second) @@ -190,16 +190,13 @@ /obj/item/grown/bananapeel/bombanana/Initialize(mapload) . = ..() + AddComponent(/datum/component/slippery, det_time) bomb = new /obj/item/grenade/syndieminibomb(src) bomb.det_time = det_time if(iscarbon(loc)) to_chat(loc, span_danger("[src] begins to beep.")) bomb.arm_grenade(loc, null, FALSE) -/obj/item/grown/bananapeel/bombanana/ComponentInitialize() - . = ..() - AddComponent(/datum/component/slippery, det_time) - /obj/item/grown/bananapeel/bombanana/Destroy() . = ..() QDEL_NULL(bomb) diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 7bfa1cc07aa..84a50d0ea1f 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -731,13 +731,16 @@ Striking a noncultist, however, will tear their flesh."} hitsound = 'sound/weapons/bladeslice.ogg' var/datum/action/innate/cult/halberd/halberd_act -/obj/item/melee/cultblade/halberd/ComponentInitialize() +/obj/item/melee/cultblade/halberd/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, \ - speed = 10 SECONDS, \ - effectiveness = 90, \ + speed = 10 SECONDS, \ + effectiveness = 90, \ + ) + AddComponent(/datum/component/two_handed, \ + force_unwielded = 17, \ + force_wielded = 24, \ ) - AddComponent(/datum/component/two_handed, force_unwielded=17, force_wielded=24) /obj/item/melee/cultblade/halberd/update_icon_state() icon_state = HAS_TRAIT(src, TRAIT_WIELDED) ? "[base_icon_state]1" : "[base_icon_state]0" diff --git a/code/modules/antagonists/nightmare/nightmare_organs.dm b/code/modules/antagonists/nightmare/nightmare_organs.dm index 19fc189b3fc..c843bcc0c92 100644 --- a/code/modules/antagonists/nightmare/nightmare_organs.dm +++ b/code/modules/antagonists/nightmare/nightmare_organs.dm @@ -36,9 +36,9 @@ /// The armblade granted to the host of this heart. var/obj/item/light_eater/blade -/obj/item/organ/internal/heart/nightmare/ComponentInitialize() - . = ..() +/obj/item/organ/internal/heart/nightmare/Initialize(mapload) AddElement(/datum/element/update_icon_blocker) + return ..() /obj/item/organ/internal/heart/nightmare/attack(mob/M, mob/living/carbon/user, obj/target) if(M != user) diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index 67a0a03107e..0a6f4482a94 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -153,9 +153,9 @@ icon_state = "demon_heart-on" decay_factor = 0 -/obj/item/organ/internal/heart/demon/ComponentInitialize() - . = ..() +/obj/item/organ/internal/heart/demon/Initialize(mapload) AddElement(/datum/element/update_icon_blocker) + return ..() /obj/item/organ/internal/heart/demon/attack(mob/M, mob/living/carbon/user, obj/target) if(M != user) diff --git a/code/modules/awaymissions/mission_code/Cabin.dm b/code/modules/awaymissions/mission_code/Cabin.dm index ed6fceaad2f..a8fd2cdbbdf 100644 --- a/code/modules/awaymissions/mission_code/Cabin.dm +++ b/code/modules/awaymissions/mission_code/Cabin.dm @@ -111,8 +111,8 @@ color = rgb(0,0,255) /obj/structure/ladder/unbreakable/rune/Initialize(mapload) - . = ..() AddElement(/datum/element/update_icon_blocker) + return ..() /obj/structure/ladder/unbreakable/rune/add_context(atom/source, list/context, obj/item/held_item, mob/user) if(up) diff --git a/code/modules/clothing/ears/_ears.dm b/code/modules/clothing/ears/_ears.dm index 070a665da1f..4c2aa14b305 100644 --- a/code/modules/clothing/ears/_ears.dm +++ b/code/modules/clothing/ears/_ears.dm @@ -18,7 +18,7 @@ resistance_flags = FLAMMABLE custom_price = PAYCHECK_COMMAND * 1.5 -/obj/item/clothing/ears/earmuffs/ComponentInitialize() +/obj/item/clothing/ears/earmuffs/Initialize(mapload) . = ..() AddElement(/datum/element/earhealing) AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm index 43324a63629..f62465c4b14 100644 --- a/code/modules/clothing/glasses/engine_goggles.dm +++ b/code/modules/clothing/glasses/engine_goggles.dm @@ -26,13 +26,10 @@ /obj/item/clothing/glasses/meson/engine/Initialize(mapload) . = ..() + AddElement(/datum/element/update_icon_updates_onmob) START_PROCESSING(SSobj, src) update_appearance() -/obj/item/clothing/glasses/meson/engine/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - /obj/item/clothing/glasses/meson/engine/Destroy() STOP_PROCESSING(SSobj, src) return ..() diff --git a/code/modules/clothing/gloves/special.dm b/code/modules/clothing/gloves/special.dm index d66f2d9008a..bd09fc4451a 100644 --- a/code/modules/clothing/gloves/special.dm +++ b/code/modules/clothing/gloves/special.dm @@ -56,7 +56,7 @@ inhand_icon_state = "rapid" clothing_traits = list(TRAIT_FINGERPRINT_PASSTHROUGH) -/obj/item/clothing/gloves/rapid/ComponentInitialize() +/obj/item/clothing/gloves/rapid/Initialize(mapload) . = ..() AddComponent(/datum/component/wearertargeting/punchcooldown) diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 391726b9a58..cd49e94816b 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -21,7 +21,7 @@ var/on = FALSE -/obj/item/clothing/head/hardhat/ComponentInitialize() +/obj/item/clothing/head/hardhat/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm index f7b380f88cc..e36e50158d5 100644 --- a/code/modules/clothing/shoes/bananashoes.dm +++ b/code/modules/clothing/shoes/bananashoes.dm @@ -9,16 +9,13 @@ var/always_noslip = FALSE /obj/item/clothing/shoes/clown_shoes/banana_shoes/Initialize(mapload) - . = ..() - if(always_noslip) - clothing_flags |= NOSLIP - -/obj/item/clothing/shoes/clown_shoes/banana_shoes/ComponentInitialize() . = ..() AddElement(/datum/element/update_icon_updates_onmob) AddComponent(/datum/component/material_container, list(/datum/material/bananium), 100 * MINERAL_MATERIAL_AMOUNT, MATCONTAINER_EXAMINE|MATCONTAINER_ANY_INTENT|MATCONTAINER_SILENT, allowed_items=/obj/item/stack) AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 75, falloff_exponent = 20) RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, .proc/on_step) + if(always_noslip) + clothing_flags |= NOSLIP /obj/item/clothing/shoes/clown_shoes/banana_shoes/proc/on_step() SIGNAL_HANDLER diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index a40d6b9dbfc..a49cb76e4b9 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -137,11 +137,11 @@ icon_state = "bluenana_peel" // Other -/obj/item/grown/bananapeel/specialpeel //used by /obj/item/clothing/shoes/clown_shoes/banana_shoes +/obj/item/grown/bananapeel/specialpeel //used by /obj/item/clothing/shoes/clown_shoes/banana_shoes name = "synthesized banana peel" desc = "A synthetic banana peel." -/obj/item/grown/bananapeel/specialpeel/ComponentInitialize() +/obj/item/grown/bananapeel/specialpeel/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery, 40) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 95eeebc43ff..1a3010e70c9 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -153,7 +153,7 @@ icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "hydrotray3" -/obj/machinery/hydroponics/constructable/ComponentInitialize() +/obj/machinery/hydroponics/constructable/Initialize(mapload) . = ..() AddComponent(/datum/component/simple_rotation) AddComponent(/datum/component/plumbing/hydroponics) diff --git a/code/modules/instruments/piano_synth.dm b/code/modules/instruments/piano_synth.dm index 05436a68543..c666a30510f 100644 --- a/code/modules/instruments/piano_synth.dm +++ b/code/modules/instruments/piano_synth.dm @@ -29,7 +29,7 @@ circuit_type = /obj/item/circuit_component/synth/headphones shell_capacity = SHELL_CAPACITY_TINY -/obj/item/instrument/piano_synth/headphones/ComponentInitialize() +/obj/item/instrument/piano_synth/headphones/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) RegisterSignal(src, COMSIG_INSTRUMENT_START, .proc/start_playing) diff --git a/code/modules/mapfluff/ruins/spaceruin_code/forgottenship.dm b/code/modules/mapfluff/ruins/spaceruin_code/forgottenship.dm index 6603e531866..7d1d6b9dec4 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/forgottenship.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/forgottenship.dm @@ -80,7 +80,7 @@ GLOBAL_VAR_INIT(fscpassword, generate_password()) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF deconstructible = FALSE -/obj/structure/fluff/empty_sleeper/syndicate/captain/ComponentInitialize() +/obj/structure/fluff/empty_sleeper/syndicate/captain/Initialize(mapload) . = ..() AddComponent(/datum/component/gps, "Old Encrypted Signal") diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 7142c38e271..f794eb7e5b6 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -30,11 +30,11 @@ var/detonation_damage = 50 var/backstab_bonus = 30 -/obj/item/kinetic_crusher/ComponentInitialize() +/obj/item/kinetic_crusher/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, \ - speed = 6 SECONDS, \ - effectiveness = 110, \ + speed = 6 SECONDS, \ + effectiveness = 110, \ ) //technically it's huge and bulky, but this provides an incentive to use it AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=20) diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index d6c8a5b826e..5b3f319b506 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -205,9 +205,9 @@ pixel_y = -4 flags_1 = NODECONSTRUCT_1 -/obj/machinery/smartfridge/survival_pod/ComponentInitialize() - . = ..() +/obj/machinery/smartfridge/survival_pod/Initialize(mapload) AddElement(/datum/element/update_icon_blocker) + return ..() /obj/machinery/smartfridge/survival_pod/preloaded/Initialize(mapload) . = ..() diff --git a/code/modules/mining/lavaland/megafauna_loot.dm b/code/modules/mining/lavaland/megafauna_loot.dm index 68f43341676..bf09b971734 100644 --- a/code/modules/mining/lavaland/megafauna_loot.dm +++ b/code/modules/mining/lavaland/megafauna_loot.dm @@ -70,16 +70,13 @@ /obj/item/hierophant_club/Initialize(mapload) . = ..() + AddElement(/datum/element/update_icon_updates_onmob) blink = new(src) /obj/item/hierophant_club/Destroy() QDEL_NULL(blink) return ..() -/obj/item/hierophant_club/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - /obj/item/hierophant_club/examine(mob/user) . = ..() . += span_hierophant_warning("The[beacon ? " beacon is not currently":"re is a beacon"] attached.") diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index c0fecc3df21..cb3ed415315 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -245,7 +245,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ var/attacher = "UNKNOWN" var/det_timer -/obj/item/gibtonite/ComponentInitialize() +/obj/item/gibtonite/Initialize(mapload) . = ..() AddComponent(/datum/component/two_handed, require_twohands=TRUE) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index d3ea9a0a3aa..eb510f07b7b 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -26,8 +26,6 @@ else forceMove(locate(1,1,1)) - ComponentInitialize() - . = ..() GLOB.new_player_list += src diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 771c641e976..da1123cc1bb 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1,5 +1,6 @@ /mob/living/Initialize(mapload) . = ..() + AddElement(/datum/element/movetype_handler) register_init_signals() if(unique_name) set_name() @@ -12,10 +13,6 @@ SSpoints_of_interest.make_point_of_interest(src) update_fov() -/mob/living/ComponentInitialize() - . = ..() - AddElement(/datum/element/movetype_handler) - /mob/living/prepare_huds() ..() prepare_data_huds() diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm index e67eaa3ae19..96db95258a5 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm @@ -87,6 +87,8 @@ /obj/structure/leaper_bubble/Initialize(mapload) . = ..() + AddElement(/datum/element/movetype_handler) + ADD_TRAIT(src, TRAIT_MOVE_FLOATING, LEAPER_BUBBLE_TRAIT) QDEL_IN(src, 100) var/static/list/loc_connections = list( COMSIG_ATOM_ENTERED = .proc/on_entered, @@ -94,11 +96,6 @@ AddElement(/datum/element/connect_loc, loc_connections) AddElement(/datum/element/swabable, CELL_LINE_TABLE_LEAPER, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) -/obj/structure/leaper_bubble/ComponentInitialize() - . = ..() - AddElement(/datum/element/movetype_handler) - ADD_TRAIT(src, TRAIT_MOVE_FLOATING, LEAPER_BUBBLE_TRAIT) - /obj/structure/leaper_bubble/Destroy() new /obj/effect/temp_visual/leaper_projectile_impact(get_turf(src)) playsound(src,'sound/effects/snap.ogg',50, TRUE, -1) diff --git a/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/code/modules/modular_computers/computers/item/role_tablet_presets.dm index e6a56d7a489..b1ecf52f62e 100644 --- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm +++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm @@ -321,7 +321,7 @@ greyscale_colors = null insert_type = /obj/item/toy/crayon/rainbow -/obj/item/modular_computer/tablet/pda/clown/ComponentInitialize() +/obj/item/modular_computer/tablet/pda/clown/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery/clowning, 120, NO_SLIP_WHEN_WALKING, CALLBACK(src, .proc/AfterSlip), slot_whitelist = list(ITEM_SLOT_ID, ITEM_SLOT_BELT)) AddComponent(/datum/component/wearertargeting/sitcomlaughter, CALLBACK(src, .proc/after_sitcom_laugh)) diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm index 5735ca1f248..3770b0628b1 100644 --- a/code/modules/paperwork/contract.dm +++ b/code/modules/paperwork/contract.dm @@ -7,14 +7,11 @@ item_flags = NOBLUDGEON var/employee_name = "" -/obj/item/paper/employment_contract/Initialize() - . = ..() - AddElement(/datum/element/update_icon_blocker) - /obj/item/paper/employment_contract/Initialize(mapload, new_employee_name) - . = ..() if(!new_employee_name) return INITIALIZE_HINT_QDEL + AddElement(/datum/element/update_icon_blocker) + . = ..() employee_name = new_employee_name name = "paper- [employee_name] employment contract" add_raw_text("
Conditions of Employment
\ diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 271d4ebb1a0..ff677f7298c 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -389,9 +389,9 @@ maxcharge = 50000 ratingdesc = FALSE -/obj/item/stock_parts/cell/infinite/abductor/ComponentInitialize() - . = ..() +/obj/item/stock_parts/cell/infinite/abductor/Initialize(mapload) AddElement(/datum/element/update_icon_blocker) + return ..() /obj/item/stock_parts/cell/potato name = "potato battery" @@ -411,9 +411,9 @@ desc = "An EMP-proof cell." maxcharge = 500 -/obj/item/stock_parts/cell/emproof/ComponentInitialize() - . = ..() +/obj/item/stock_parts/cell/emproof/Initialize(mapload) AddElement(/datum/element/empprotection, EMP_PROTECT_SELF) + return ..() /obj/item/stock_parts/cell/emproof/empty empty = TRUE diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 3f3e5e1096c..c7ca90dd54c 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -46,9 +46,9 @@ no power level overlay is currently in the overlays list. ///Timer between 0 and 3 before the field gets made var/warming_up = 0 ///List of every containment fields connected to this generator - var/list/obj/machinery/field/containment/fields + var/list/obj/machinery/field/containment/fields = list() ///List of every field generators connected to this one - var/list/obj/machinery/field/generator/connected_gens + var/list/obj/machinery/field/generator/connected_gens = list() ///Check for asynk cleanups for this and the connected gens var/clean_up = FALSE @@ -64,18 +64,13 @@ no power level overlay is currently in the overlays list. /obj/machinery/field/generator/Initialize(mapload) . = ..() - fields = list() - connected_gens = list() + AddElement(/datum/element/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES) RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, .proc/block_singularity_if_active) /obj/machinery/field/generator/anchored/Initialize(mapload) . = ..() set_anchored(TRUE) -/obj/machinery/field/generator/ComponentInitialize() - . = ..() - AddElement(/datum/element/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES) - /obj/machinery/field/generator/process() if(active == FG_ONLINE) calc_power() diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index ef255a1b734..1b16cf4c87b 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -113,15 +113,15 @@ toolspeed = 0.7 //plasmacutters can be used as welders, and are faster than standard welders var/charge_weld = 25 //amount of charge used up to start action (multiplied by amount) and per progress_flash_divisor ticks of welding -/obj/item/gun/energy/plasmacutter/ComponentInitialize() +/obj/item/gun/energy/plasmacutter/Initialize(mapload) + AddElement(/datum/element/update_icon_blocker) . = ..() AddComponent(/datum/component/butchering, \ - speed = 2.5 SECONDS, \ - effectiveness = 105, \ - bonus_modifier = 0, \ - butcher_sound = 'sound/weapons/plasma_cutter.ogg', \ + speed = 2.5 SECONDS, \ + effectiveness = 105, \ + bonus_modifier = 0, \ + butcher_sound = 'sound/weapons/plasma_cutter.ogg', \ ) - AddElement(/datum/element/update_icon_blocker) AddElement(/datum/element/tool_flash, 1) /obj/item/gun/energy/plasmacutter/examine(mob/user) @@ -312,9 +312,9 @@ can_charge = FALSE use_cyborg_cell = TRUE -/obj/item/gun/energy/printer/ComponentInitialize() - . = ..() +/obj/item/gun/energy/printer/Initialize(mapload) AddElement(/datum/element/update_icon_blocker) + . = ..() AddComponent(/datum/component/automatic_fire, 0.3 SECONDS) /obj/item/gun/energy/printer/emp_act() diff --git a/code/modules/religion/religion_structures.dm b/code/modules/religion/religion_structures.dm index d7f97bb81c5..0d36a1f0f92 100644 --- a/code/modules/religion/religion_structures.dm +++ b/code/modules/religion/religion_structures.dm @@ -14,14 +14,11 @@ /obj/structure/altar_of_gods/Initialize(mapload) . = ..() + AddComponent(/datum/component/religious_tool, ALL, FALSE, CALLBACK(src, .proc/reflect_sect_in_icons)) reflect_sect_in_icons() GLOB.chaplain_altars += src AddElement(/datum/element/climbable) -/obj/structure/altar_of_gods/ComponentInitialize() - . = ..() - AddComponent(/datum/component/religious_tool, ALL, FALSE, CALLBACK(src, .proc/reflect_sect_in_icons)) - /obj/structure/altar_of_gods/Destroy() GLOB.chaplain_altars -= src return ..() diff --git a/code/modules/research/ordnance/tank_compressor.dm b/code/modules/research/ordnance/tank_compressor.dm index dadf5616909..ca41611d984 100644 --- a/code/modules/research/ordnance/tank_compressor.dm +++ b/code/modules/research/ordnance/tank_compressor.dm @@ -28,8 +28,6 @@ leaked_gas_buffer = new(200) compressor_record = list() -/obj/machinery/atmospherics/components/binary/tank_compressor/ComponentInitialize() - . = ..() RegisterSignal(src, COMSIG_ATOM_INTERNAL_EXPLOSION, .proc/explosion_handle) /obj/machinery/atmospherics/components/binary/tank_compressor/examine() diff --git a/code/modules/research/xenobiology/crossbreeding/_weapons.dm b/code/modules/research/xenobiology/crossbreeding/_weapons.dm index 27645495623..88914b34248 100644 --- a/code/modules/research/xenobiology/crossbreeding/_weapons.dm +++ b/code/modules/research/xenobiology/crossbreeding/_weapons.dm @@ -71,7 +71,7 @@ Slimecrossing Weapons attack_verb_simple = list("bash", "pound", "slam") item_flags = SLOWS_WHILE_IN_HAND -/obj/item/shield/adamantineshield/ComponentInitialize() +/obj/item/shield/adamantineshield/Initialize(mapload) . = ..() AddComponent(/datum/component/two_handed, require_twohands=TRUE, force_wielded=15) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index b1b52349e56..1cd9f0c97e9 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -598,13 +598,10 @@ density = FALSE /obj/machinery/computer/shuttle/pod/Initialize(mapload) + AddElement(/datum/element/update_icon_blocker) . = ..() RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, .proc/check_lock) -/obj/machinery/computer/shuttle/pod/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_blocker) - /obj/machinery/computer/shuttle/pod/emag_act(mob/user) if(obj_flags & EMAGGED) return diff --git a/modular_skyrat/master_files/code/game/objects/items/cards_ids.dm b/modular_skyrat/master_files/code/game/objects/items/cards_ids.dm index f973f51f32d..8273f17c0e8 100644 --- a/modular_skyrat/master_files/code/game/objects/items/cards_ids.dm +++ b/modular_skyrat/master_files/code/game/objects/items/cards_ids.dm @@ -20,7 +20,7 @@ greyscale_config = /datum/greyscale_config/id_card greyscale_colors = "#FF0000#00FF00#0000FF" -/obj/item/card/id/advanced/colourable/ComponentInitialize() +/obj/item/card/id/advanced/colourable/Initialize(mapload) . = ..() AddComponent(/datum/component/gags_recolorable) diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bananaspider.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bananaspider.dm index 37df7d08e6e..b0ce4c530de 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bananaspider.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bananaspider.dm @@ -27,7 +27,7 @@ var/projectile_density = TRUE // griffons get shot del_on_death = TRUE -/mob/living/simple_animal/banana_spider/ComponentInitialize() +/mob/living/simple_animal/banana_spider/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery, 40) diff --git a/modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/automatic.dm b/modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/automatic.dm index fb41025aff2..8e3ac547cfd 100644 --- a/modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/automatic.dm @@ -214,7 +214,7 @@ /obj/item/gun/ballistic/automatic/l6_saw/unrestricted pin = /obj/item/firing_pin -/obj/item/gun/ballistic/automatic/l6_saw/ComponentInitialize() +/obj/item/gun/ballistic/automatic/l6_saw/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) diff --git a/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm b/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm index 9d5927edcf8..e273cce2869 100644 --- a/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm +++ b/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm @@ -125,9 +125,6 @@ firemode_action.UpdateButtons() add_item_action(firemode_action) - -/obj/item/gun/ComponentInitialize() - . = ..() if(SELECT_FULLY_AUTOMATIC in fire_select_modes) AddComponent(/datum/component/automatic_fire, fire_delay) diff --git a/modular_skyrat/modules/armaments/code/armament_station.dm b/modular_skyrat/modules/armaments/code/armament_station.dm index c47632479c9..09df8729e8c 100644 --- a/modular_skyrat/modules/armaments/code/armament_station.dm +++ b/modular_skyrat/modules/armaments/code/armament_station.dm @@ -21,7 +21,7 @@ /// The access needed to use the vendor var/list/required_access = list() -/obj/machinery/armament_station/ComponentInitialize() +/obj/machinery/armament_station/Initialize(mapload) . = ..() if(!armament_type) return diff --git a/modular_skyrat/modules/blueshield/code/blueshield_clothing.dm b/modular_skyrat/modules/blueshield/code/blueshield_clothing.dm index 2b811f929d9..5f8d51970ca 100644 --- a/modular_skyrat/modules/blueshield/code/blueshield_clothing.dm +++ b/modular_skyrat/modules/blueshield/code/blueshield_clothing.dm @@ -22,7 +22,7 @@ /obj/item/radio/headset/headset_bs/alt icon_state = "bshield_headset_alt" -/obj/item/radio/headset/headset_bs/alt/ComponentInitialize() +/obj/item/radio/headset/headset_bs/alt/Initialize(mapload) . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) diff --git a/modular_skyrat/modules/cell_component/code/flashlight.dm b/modular_skyrat/modules/cell_component/code/flashlight.dm index f6aaac61656..7bf4ca7f543 100644 --- a/modular_skyrat/modules/cell_component/code/flashlight.dm +++ b/modular_skyrat/modules/cell_component/code/flashlight.dm @@ -22,8 +22,6 @@ turn_on(FALSE) update_brightness() -/obj/item/flashlight/ComponentInitialize() - . = ..() if(uses_battery) AddComponent(/datum/component/cell, cell_override, CALLBACK(src, .proc/turn_off)) diff --git a/modular_skyrat/modules/customization/modules/clothing/ears/ears.dm b/modular_skyrat/modules/customization/modules/clothing/ears/ears.dm index fd4c5f0ac91..e613c8136f1 100644 --- a/modular_skyrat/modules/customization/modules/clothing/ears/ears.dm +++ b/modular_skyrat/modules/customization/modules/clothing/ears/ears.dm @@ -13,9 +13,6 @@ /obj/item/clothing/ears/headphones/Initialize(mapload) . = ..() update_icon() - -/obj/item/clothing/ears/headphones/ComponentInitialize() - . = ..() AddElement(/datum/element/update_icon_updates_onmob) /obj/item/clothing/ears/headphones/update_icon_state() diff --git a/modular_skyrat/modules/customization/modules/clothing/neck/cloaks.dm b/modular_skyrat/modules/customization/modules/clothing/neck/cloaks.dm index 9e4fe816faa..5a9793c5496 100644 --- a/modular_skyrat/modules/customization/modules/clothing/neck/cloaks.dm +++ b/modular_skyrat/modules/customization/modules/clothing/neck/cloaks.dm @@ -23,7 +23,7 @@ icon_state = "cowboy_poncho" heat_protection = CHEST -/obj/item/clothing/neck/cowboylea/ComponentInitialize() +/obj/item/clothing/neck/cowboylea/Initialize(mapload) . = ..() AddComponent(/datum/component/toggle_clothes, "cowboy_poncho_t") @@ -38,6 +38,6 @@ flags_1 = IS_PLAYER_COLORABLE_1 heat_protection = CHEST -/obj/item/clothing/neck/ranger_poncho/ComponentInitialize() +/obj/item/clothing/neck/ranger_poncho/Initialize(mapload) . = ..() AddComponent(/datum/component/toggle_clothes, "ranger_poncho_t") diff --git a/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm b/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm index bf959a348f4..4408dfec706 100644 --- a/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm +++ b/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm @@ -11,7 +11,39 @@ /obj/item/storage/belt/crusader/Initialize(mapload) . = ..() - create_storage(type = /datum/storage/belt/crusader) + create_storage( + max_slots = 2, + max_specific_storage = WEIGHT_CLASS_BULKY, //This makes sure swords and the pouches can fit in here - the whitelist keeps the bad stuff out + type = /datum/storage/belt/crusader, + canhold = list( + /obj/item/storage/belt/storage_pouch, + /obj/item/forging/reagent_weapon/sword, + /obj/item/melee/sabre, + /obj/item/claymore, + /obj/item/melee/cleric_mace, + /obj/item/knife, + /obj/item/melee/baton, + /obj/item/melee/baton, + /obj/item/nullrod, //holds any subset of nullrod in the sheath-storage - - - + ), + canthold = list( // - - - except the second list's items (no fedora in the sheath) + /obj/item/nullrod/armblade, + /obj/item/nullrod/carp, + /obj/item/nullrod/chainsaw, + /obj/item/nullrod/claymore/bostaff, + /obj/item/nullrod/hammer, + /obj/item/nullrod/pitchfork, + /obj/item/nullrod/pride_hammer, + /obj/item/nullrod/spear, + /obj/item/nullrod/staff, + /obj/item/nullrod/fedora, + /obj/item/nullrod/godhand, + /obj/item/nullrod/staff, + /obj/item/nullrod/whip, + ), + ) + atom_storage.allow_big_nesting = TRUE // Lets the pouch work + AddElement(/datum/element/update_icon_updates_onmob) //Credit to Funce for this chunk of code directly below, which overrides normal dumping code and instead dumps from the pouch item inside /datum/storage/belt/crusader/dump_content_at(atom/dest_object, mob/M) @@ -71,41 +103,6 @@ . += span_notice("Alt-click it to quickly draw the blade.") return -/obj/item/storage/belt/crusader/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - -/obj/item/storage/belt/crusader/Initialize(mapload) - . = ..() - - atom_storage.max_slots = 2 - atom_storage.max_specific_storage = WEIGHT_CLASS_BULKY //This makes sure swords and the pouches can fit in here - the whitelist keeps the bad stuff out - atom_storage.allow_big_nesting = TRUE //Same as above, lets the pouch work - atom_storage.set_holdable(list( - /obj/item/storage/belt/storage_pouch, - /obj/item/forging/reagent_weapon/sword, - /obj/item/melee/sabre, - /obj/item/claymore, - /obj/item/melee/cleric_mace, - /obj/item/knife, - /obj/item/melee/baton, - /obj/item/melee/baton, - /obj/item/nullrod //holds any subset of nullrod in the sheath-storage - - - - ), list( // - - - except the second list's items (no fedora in the sheath) - /obj/item/nullrod/armblade, - /obj/item/nullrod/carp, - /obj/item/nullrod/chainsaw, - /obj/item/nullrod/claymore/bostaff, - /obj/item/nullrod/hammer, - /obj/item/nullrod/pitchfork, - /obj/item/nullrod/pride_hammer, - /obj/item/nullrod/spear, - /obj/item/nullrod/staff, - /obj/item/nullrod/fedora, - /obj/item/nullrod/godhand, - /obj/item/nullrod/staff, - /obj/item/nullrod/whip - )) /obj/item/storage/belt/crusader/PopulateContents() . = ..() diff --git a/modular_skyrat/modules/customization/modules/clothing/suits/misc.dm b/modular_skyrat/modules/customization/modules/clothing/suits/misc.dm index 554fdfb6ffa..288c35145aa 100644 --- a/modular_skyrat/modules/customization/modules/clothing/suits/misc.dm +++ b/modular_skyrat/modules/customization/modules/clothing/suits/misc.dm @@ -128,7 +128,7 @@ flags_1 = IS_PLAYER_COLORABLE_1 supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/toggle/jacket/cardigan/ComponentInitialize() +/obj/item/clothing/suit/toggle/jacket/cardigan/Initialize(mapload) . = ..() AddComponent(/datum/component/toggle_clothes, "cardigan_t") diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm index 04d0a34109e..0166881a8bb 100644 --- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm +++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm @@ -67,7 +67,7 @@ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON var/list/poly_colors = list("#FFFFFF", "#FF8888", "#888888") -/obj/item/clothing/under/dress/skirt/polychromic/ComponentInitialize() +/obj/item/clothing/under/dress/skirt/polychromic/Initialize(mapload) . = ..() AddElement(/datum/element/polychromic, poly_colors) @@ -86,7 +86,7 @@ icon_state = "polysuit" supports_variations_flags = NONE -/obj/item/clothing/under/misc/poly_shirt/ComponentInitialize() +/obj/item/clothing/under/misc/poly_shirt/Initialize(mapload) . = ..() AddElement(/datum/element/polychromic, list("#FFFFFF", "#333333", "#333333")) @@ -100,7 +100,7 @@ body_parts_covered = CHEST|GROIN|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/under/misc/polyshorts/ComponentInitialize() +/obj/item/clothing/under/misc/polyshorts/Initialize(mapload) . = ..() AddElement(/datum/element/polychromic, list("#333333", "#888888", "#888888")) @@ -113,7 +113,7 @@ can_adjust = FALSE supports_variations_flags = NONE -/obj/item/clothing/under/misc/polyjumpsuit/ComponentInitialize() +/obj/item/clothing/under/misc/polyjumpsuit/Initialize(mapload) . = ..() AddElement(/datum/element/polychromic, list("#FFFFFF", "#888888", "#333333")) @@ -127,7 +127,7 @@ can_adjust = FALSE supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/under/misc/poly_bottomless/ComponentInitialize() +/obj/item/clothing/under/misc/poly_bottomless/Initialize(mapload) . = ..() AddElement(/datum/element/polychromic, list("#888888", "#FF3333", "#FFFFFF")) @@ -142,7 +142,7 @@ can_adjust = FALSE supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/under/misc/polysweater/ComponentInitialize() +/obj/item/clothing/under/misc/polysweater/Initialize(mapload) . = ..() AddElement(/datum/element/polychromic, list("#FFFFFF")) @@ -157,7 +157,7 @@ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON var/list/poly_colors = list("#888888", "#FFFFFF", "#88CCFF") -/obj/item/clothing/under/misc/poly_tanktop/ComponentInitialize() +/obj/item/clothing/under/misc/poly_tanktop/Initialize(mapload) . = ..() AddElement(/datum/element/polychromic, poly_colors) @@ -179,7 +179,7 @@ greyscale_config_worn_digi = null var/list/poly_colors = list("#FFFFFF", "#FF8888", "#FFFFFF") -/obj/item/clothing/under/shorts/polychromic/ComponentInitialize() +/obj/item/clothing/under/shorts/polychromic/Initialize(mapload) . = ..() AddElement(/datum/element/polychromic, poly_colors) diff --git a/modular_skyrat/modules/electric_welder/code/electric_welder.dm b/modular_skyrat/modules/electric_welder/code/electric_welder.dm index 2e1847961d1..b05f0ff1d7a 100644 --- a/modular_skyrat/modules/electric_welder/code/electric_welder.dm +++ b/modular_skyrat/modules/electric_welder/code/electric_welder.dm @@ -15,7 +15,7 @@ var/powered = FALSE max_fuel = 20 -/obj/item/weldingtool/electric/ComponentInitialize() +/obj/item/weldingtool/electric/Initialize(mapload) . = ..() AddComponent(/datum/component/cell, cell_override, CALLBACK(src, .proc/switched_off)) diff --git a/modular_skyrat/modules/energy_axe/code/energy_fireaxe.dm b/modular_skyrat/modules/energy_axe/code/energy_fireaxe.dm index 35e272b253f..ebb2fc4e6d6 100644 --- a/modular_skyrat/modules/energy_axe/code/energy_fireaxe.dm +++ b/modular_skyrat/modules/energy_axe/code/energy_fireaxe.dm @@ -19,8 +19,10 @@ special_desc_requirement = EXAMINE_CHECK_SYNDICATE special_desc = "An energized fire axe used in Syndicate bases for breaking glass, and people." -/obj/item/fireaxe/energy/ComponentInitialize() +/obj/item/fireaxe/energy/Initialize(mapload) . = ..() + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/energy_wield, override = TRUE) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/energy_unwield, override = TRUE) AddComponent(/datum/component/two_handed, force_unwielded = 10, force_wielded = 33, icon_wielded = "[base_icon_state]1", wieldsound = 'sound/weapons/saberon.ogg', unwieldsound = 'sound/weapons/saberoff.ogg') /obj/item/fireaxe/energy/proc/energy_wield(obj/item/source, mob/living/carbon/user) @@ -38,8 +40,3 @@ hitsound = SFX_SWING_HIT STOP_PROCESSING(SSobj, src) set_light_on(FALSE) - -/obj/item/fireaxe/energy/Initialize(mapload) - . = ..() - RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/energy_wield, override = TRUE) - RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/energy_unwield, override = TRUE) diff --git a/modular_skyrat/modules/faction/code/radio.dm b/modular_skyrat/modules/faction/code/radio.dm index 04faac14b16..244138aa85b 100644 --- a/modular_skyrat/modules/faction/code/radio.dm +++ b/modular_skyrat/modules/faction/code/radio.dm @@ -16,7 +16,7 @@ icon_state = "com_headset_alt" inhand_icon_state = "com_headset_alt" -/obj/item/radio/headset/headset_faction/bowman/ComponentInitialize() +/obj/item/radio/headset/headset_faction/bowman/Initialize(mapload) . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) diff --git a/modular_skyrat/modules/gun_cargo/code/objects/cargo_console.dm b/modular_skyrat/modules/gun_cargo/code/objects/cargo_console.dm index 586f3a32779..e55bf279905 100644 --- a/modular_skyrat/modules/gun_cargo/code/objects/cargo_console.dm +++ b/modular_skyrat/modules/gun_cargo/code/objects/cargo_console.dm @@ -1,4 +1,4 @@ -/obj/machinery/computer/cargo/ComponentInitialize() +/obj/machinery/computer/cargo/Initialize(mapload) . = ..() AddComponent(/datum/component/armament/cargo_gun, subtypesof(/datum/armament_entry/cargo_gun), 0) diff --git a/modular_skyrat/modules/gunhud/code/gun_hud_component.dm b/modular_skyrat/modules/gunhud/code/gun_hud_component.dm index 4c6a0e87b7e..9257f930750 100644 --- a/modular_skyrat/modules/gunhud/code/gun_hud_component.dm +++ b/modular_skyrat/modules/gunhud/code/gun_hud_component.dm @@ -190,14 +190,14 @@ hud.maptext = span_maptext("
[battery_percent]%
[shot_cost_percent]%
") -/obj/item/gun/ballistic/ComponentInitialize() +/obj/item/gun/ballistic/Initialize(mapload) . = ..() AddComponent(/datum/component/ammo_hud) -/obj/item/gun/energy/ComponentInitialize() +/obj/item/gun/energy/Initialize(mapload) . = ..() AddComponent(/datum/component/ammo_hud) -/obj/item/weldingtool/ComponentInitialize() +/obj/item/weldingtool/Initialize(mapload) . = ..() AddComponent(/datum/component/ammo_hud) diff --git a/modular_skyrat/modules/gunsgalore/code/guns/ballistic_master.dm b/modular_skyrat/modules/gunsgalore/code/guns/ballistic_master.dm index 54c928e75d7..19449304b8f 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/ballistic_master.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/ballistic_master.dm @@ -30,8 +30,6 @@ if(realistic) base_spread = spread -/obj/item/gun/ballistic/ComponentInitialize() - . = ..() if(alt_icons) AddElement(/datum/element/update_icon_updates_onmob) diff --git a/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm b/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm index 88eb37aff79..b367c691c6c 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm @@ -29,7 +29,7 @@ company_flag = COMPANY_OLDARMS var/cover_open = FALSE -/obj/item/gun/ballistic/automatic/mg34/ComponentInitialize() +/obj/item/gun/ballistic/automatic/mg34/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) diff --git a/modular_skyrat/modules/hev_suit/code/hev_suit.dm b/modular_skyrat/modules/hev_suit/code/hev_suit.dm index f8616bee4b9..f3c121ad62c 100644 --- a/modular_skyrat/modules/hev_suit/code/hev_suit.dm +++ b/modular_skyrat/modules/hev_suit/code/hev_suit.dm @@ -172,10 +172,7 @@ internal_radio.subspace_transmission = TRUE internal_radio.canhear_range = 0 // anything greater will have the bot broadcast the channel as if it were saying it out loud. internal_radio.recalculateChannels() - -/obj/item/clothing/suit/space/hev_suit/ComponentInitialize() - . = ..() - AddComponent(/datum/component/cell, cell_override = cell, _has_cell_overlays = FALSE) + AddComponent(/datum/component/cell, cell_override = initial(cell), _has_cell_overlays = FALSE) /obj/item/clothing/suit/space/hev_suit/equipped(mob/user, slot) . = ..() diff --git a/modular_skyrat/modules/hop_drip/code/head_of_personnel.dm b/modular_skyrat/modules/hop_drip/code/head_of_personnel.dm index e7f8c3879ae..c8b90c0351d 100644 --- a/modular_skyrat/modules/hop_drip/code/head_of_personnel.dm +++ b/modular_skyrat/modules/hop_drip/code/head_of_personnel.dm @@ -34,6 +34,6 @@ icon_state = "com_headset_alt" inhand_icon_state = "com_headset_alt" -/obj/item/radio/headset/heads/hop/alt/ComponentInitialize() +/obj/item/radio/headset/heads/hop/alt/Initialize(mapload) . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) diff --git a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm index 71086bc9544..ed3fda3ac8c 100644 --- a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm +++ b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm @@ -71,6 +71,8 @@ vial = new start_vial update_appearance() + AddElement(/datum/element/update_icon_updates_onmob) + /obj/item/hypospray/mkii/update_overlays() . = ..() if(!vial) @@ -86,10 +88,6 @@ chem_loaded.color = vial.chem_color . += chem_loaded -/obj/item/hypospray/mkii/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - /obj/item/hypospray/mkii/update_icon_state() . = ..() var/icon_suffix = "-s" diff --git a/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm b/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm index ded709ee089..0ea0df638a2 100644 --- a/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm +++ b/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm @@ -193,7 +193,7 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction) WRITE_FILE(file, json_encode(json)) return TRUE -/mob/living/carbon/human/ComponentInitialize() +/mob/living/carbon/human/Initialize(mapload) . = ..() AddComponent(/datum/component/interactable) diff --git a/modular_skyrat/modules/mapping/code/lavaland_ruin_code.dm b/modular_skyrat/modules/mapping/code/lavaland_ruin_code.dm index 07c72b7de5d..0d7e36bf93f 100644 --- a/modular_skyrat/modules/mapping/code/lavaland_ruin_code.dm +++ b/modular_skyrat/modules/mapping/code/lavaland_ruin_code.dm @@ -91,23 +91,15 @@ radiosound = 'modular_skyrat/modules/radiosound/sound/radio/syndie.ogg' keyslot = new /obj/item/encryptionkey/headset_interdyne -/obj/item/radio/headset/interdyne/ComponentInitialize() +/obj/item/radio/headset/interdyne/Initialize(mapload) . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) /obj/item/radio/headset/interdyne/command name = "interdyne command headset" desc = "A commanding headset to gather your underlings. Protects the ears from flashbangs." - icon_state = "syndie_headset" - inhand_icon_state = "syndie_headset" - radiosound = 'modular_skyrat/modules/radiosound/sound/radio/syndie.ogg' - keyslot = new /obj/item/encryptionkey/headset_interdyne command = TRUE -/obj/item/radio/headset/interdyne/command/ComponentInitialize() - . = ..() - AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) - /obj/item/radio/headset/interdyne/comms keyslot = new /obj/item/encryptionkey/headset_interdyne keyslot2 = new /obj/item/encryptionkey/syndicate diff --git a/modular_skyrat/modules/marines/code/smartgun.dm b/modular_skyrat/modules/marines/code/smartgun.dm index 071333858c3..605936d50f2 100644 --- a/modular_skyrat/modules/marines/code/smartgun.dm +++ b/modular_skyrat/modules/marines/code/smartgun.dm @@ -35,7 +35,7 @@ /// Factions that the gun cannot shoot under any circumstances var/list/iff_factions = list("ert") -/obj/item/gun/ballistic/automatic/smart_machine_gun/ComponentInitialize() +/obj/item/gun/ballistic/automatic/smart_machine_gun/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) diff --git a/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm b/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm index b05ebf6ae93..69d4fca688e 100644 --- a/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm +++ b/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm @@ -104,15 +104,12 @@ phase_emitter.parent_gun = src update_microfusion_lens() recharge_newshot(TRUE) + AddElement(/datum/element/update_icon_updates_onmob) update_appearance() AddComponent(/datum/component/ammo_hud) RegisterSignal(src, COMSIG_ITEM_RECHARGED, .proc/instant_recharge) base_fire_delay = fire_delay -/obj/item/gun/microfusion/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - /obj/item/gun/microfusion/add_weapon_description() AddElement(/datum/element/weapon_description, attached_proc = .proc/add_notes_energy) diff --git a/modular_skyrat/modules/modular_items/code/modular_glasses.dm b/modular_skyrat/modules/modular_items/code/modular_glasses.dm index e41b6502a05..f96a2c73931 100644 --- a/modular_skyrat/modules/modular_items/code/modular_glasses.dm +++ b/modular_skyrat/modules/modular_items/code/modular_glasses.dm @@ -22,7 +22,7 @@ var/list/modes_msg = list(MODE_ON = "You activate the optical matrix on the ", MODE_OFF = "You deactivate the optical matrix on the ") /// Reuse logic from engine_goggles.dm -/obj/item/clothing/glasses/hud/ar/ComponentInitialize() +/obj/item/clothing/glasses/hud/ar/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/ballgag.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/ballgag.dm index 159763a1d5a..65ed60161e1 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/ballgag.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/ballgag.dm @@ -53,7 +53,7 @@ var/gag_size = "small" // To update the sprite -/obj/item/clothing/mask/ballgag/ComponentInitialize() +/obj/item/clothing/mask/ballgag/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm index 6bbaf10f1fe..91ac8ea3866 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm @@ -95,17 +95,13 @@ // Initializing stuff /obj/item/clothing/mask/gas/bdsm_mask/Initialize(mapload) . = ..() + AddElement(/datum/element/update_icon_updates_onmob) update_icon_state() update_icon() update_action_buttons_icons() if(!length(mask_designs)) populate_mask_designs() -// To update icon by magic -/obj/item/clothing/mask/gas/bdsm_mask/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - // To update icon state properly /obj/item/clothing/mask/gas/bdsm_mask/update_icon_state() . = ..() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm index 4aa5b801701..86006db7fac 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm @@ -56,11 +56,6 @@ "pink" = image (icon = src.icon, icon_state = "hypnogoggles_pink"), "teal" = image(icon = src.icon, icon_state = "hypnogoggles_teal")) -//to update model lol -/obj/item/clothing/glasses/hypno/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - //to change model /obj/item/clothing/glasses/hypno/AltClick(mob/user) if(color_changed) @@ -85,6 +80,7 @@ /obj/item/clothing/glasses/hypno/Initialize(mapload) . = ..() + AddElement(/datum/element/update_icon_updates_onmob) update_icon_state() update_icon() if(!length(hypnogoggles_designs)) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_blindfold.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_blindfold.dm index 0ff2dc1677b..be0e4e91ed0 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_blindfold.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_blindfold.dm @@ -20,11 +20,6 @@ "pink" = image (icon = src.icon, icon_state = "kblindfold_pink"), "teal" = image(icon = src.icon, icon_state = "kblindfold_teal")) -//to update model lol -/obj/item/clothing/glasses/blindfold/kinky/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - //to change model /obj/item/clothing/glasses/blindfold/kinky/AltClick(mob/user) if(color_changed) @@ -50,6 +45,7 @@ /obj/item/clothing/glasses/blindfold/kinky/Initialize(mapload) . = ..() + AddElement(/datum/element/update_icon_updates_onmob) update_icon_state() update_icon() if(!length(kinkfold_designs)) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_headphones.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_headphones.dm index 1f10c4bfb9b..015c8c1dfc2 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_headphones.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_headphones.dm @@ -26,13 +26,6 @@ "pink" = image (icon = src.icon, icon_state = "kinkphones_pink_on"), "teal" = image(icon = src.icon, icon_state = "kinkphones_teal_on")) -//to prevent hearing and e.t.c -/obj/item/clothing/ears/kinky_headphones/ComponentInitialize() - . = ..() - AddElement(/datum/element/earhealing) - AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) - AddElement(/datum/element/update_icon_updates_onmob) - //to change model /obj/item/clothing/ears/kinky_headphones/AltClick(mob/user) if(color_changed) @@ -76,6 +69,9 @@ /obj/item/clothing/ears/kinky_headphones/Initialize(mapload) . = ..() + AddElement(/datum/element/update_icon_updates_onmob) + AddElement(/datum/element/earhealing) + AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) update_icon_state() update_icon() if(!length(kinkphones_designs)) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm index f7c2c3aa39f..0f96c3051d7 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm @@ -51,11 +51,6 @@ "inflated" = image (icon = src.icon, icon_state = "sleepbag_pink_deflated_folded"), "deflated" = image(icon = src.icon, icon_state = "sleepbag_teal_deflated_folded")) -//to update model lol -/obj/item/clothing/suit/straight_jacket/kinky_sleepbag/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - //to change model /obj/item/clothing/suit/straight_jacket/kinky_sleepbag/AltClick(mob/user) var/mob/living/carbon/human/clicking_human = user @@ -93,6 +88,7 @@ /obj/item/clothing/suit/straight_jacket/kinky_sleepbag/Initialize(mapload) . = ..() + AddElement(/datum/element/update_icon_updates_onmob) update_icon_state() update_icon() if(!length(bag_colors)) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm index 354117f1869..14e92789066 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm @@ -46,11 +46,6 @@ "teal" = image(icon = src.icon, icon_state = "lewdapron_teal"), "yellow" = image (icon = src.icon, icon_state = "lewdapron_yellow")) -//to update model lol -/obj/item/clothing/accessory/lewdapron/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - //to change model /obj/item/clothing/accessory/lewdapron/AltClick(mob/user) if(color_changed) @@ -74,6 +69,7 @@ return TRUE /obj/item/clothing/accessory/lewdapron/Initialize(mapload) + AddElement(/datum/element/update_icon_updates_onmob) if(!length(apron_designs)) populate_apron_designs() update_icon_state() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm index 326ae9e0f44..08321154d02 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm @@ -32,11 +32,6 @@ "teal" = image (icon = src.icon, icon_state = "shackles_teal"), "metal" = image (icon = src.icon, icon_state = "shackles_metal")) -//to update model lol -/obj/item/clothing/suit/straight_jacket/shackles/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - //to change model /obj/item/clothing/suit/straight_jacket/shackles/AltClick(mob/user) if(color_changed == FALSE) @@ -62,6 +57,7 @@ /obj/item/clothing/suit/straight_jacket/shackles/Initialize(mapload) . = ..() + AddElement(/datum/element/update_icon_updates_onmob) update_icon_state() update_icon() if(!length(shackles_designs)) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_hands.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_hands.dm index 1c638d213c7..a47debf0b1b 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_hands.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_hands.dm @@ -36,7 +36,7 @@ hooman.remove_status_effect(/datum/status_effect/ropebunny) return ..() -/obj/item/clothing/gloves/shibari_hands/ComponentInitialize() +/obj/item/clothing/gloves/shibari_hands/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_legs.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_legs.dm index 63e533ce214..c27e59eff3a 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_legs.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_legs.dm @@ -40,7 +40,7 @@ hooman.remove_status_effect(/datum/status_effect/ropebunny) return..() -/obj/item/clothing/shoes/shibari_legs/ComponentInitialize() +/obj/item/clothing/shoes/shibari_legs/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm index 651d211460c..e996abb2c5f 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm @@ -58,7 +58,7 @@ if(do_after(hooman, HAS_TRAIT(hooman, TRAIT_RIGGER) ? 2 SECONDS : 10 SECONDS, target = src)) dropped(user) -/obj/item/clothing/under/shibari/ComponentInitialize() +/obj/item/clothing/under/shibari/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm index 7ce40344af1..60f4dfa91ac 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm @@ -21,11 +21,6 @@ "equine" = image (icon = src.icon, icon_state = "strapon_equine"), "human" = image (icon = src.icon, icon_state = "strapon_human")) -//to update model -/obj/item/clothing/strapon/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - //to change model /obj/item/clothing/strapon/AltClick(mob/user) if(type_changed == FALSE) @@ -51,6 +46,7 @@ /obj/item/clothing/strapon/Initialize(mapload) . = ..() + AddElement(/datum/element/update_icon_updates_onmob) update_icon_state() update_icon() update_action_buttons_icons() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/buttplug.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/buttplug.dm index 053ae7272a5..766347e739b 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/buttplug.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/buttplug.dm @@ -39,10 +39,6 @@ "medium" = image(icon = src.icon, icon_state = "buttplug_pink_medium"), "big" = image(icon = src.icon, icon_state = "buttplug_pink_big")) -/obj/item/clothing/sextoy/buttplug/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - /obj/item/clothing/sextoy/buttplug/AltClick(mob/user) if(!color_changed) . = ..() @@ -71,6 +67,7 @@ /obj/item/clothing/sextoy/buttplug/Initialize(mapload) . = ..() + AddElement(/datum/element/update_icon_updates_onmob) set_light(0) update_light() update_icon_state() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/clamps.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/clamps.dm index 30611563747..412cf8b6ce3 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/clamps.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/clamps.dm @@ -20,12 +20,9 @@ if(!isinhands) . += clamps_overlay -/obj/item/clothing/sextoy/nipple_clamps/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - /obj/item/clothing/sextoy/nipple_clamps/Initialize(mapload) . = ..() + AddElement(/datum/element/update_icon_updates_onmob) update_icon_state() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm index c2f16a97d43..cdfbea992fb 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm @@ -265,12 +265,9 @@ GLOBAL_LIST_INIT(dildo_colors, list(//mostly neon colors change_sprite = FALSE /obj/item/clothing/sextoy/dildo/double_dildo/Initialize(mapload) - . = ..() - update_action_buttons_icons() - -/obj/item/clothing/sextoy/dildo/double_dildo/ComponentInitialize() . = ..() AddElement(/datum/element/update_icon_updates_onmob) + update_action_buttons_icons() /obj/item/clothing/sextoy/dildo/double_dildo/populate_dildo_designs() return diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm index 0493b509668..55253696d4f 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm @@ -77,11 +77,6 @@ "weak" = image (icon = src.icon, icon_state = "leather_whip_pink_weak"), "hard" = image(icon = src.icon, icon_state = "leather_crotch_pink_hard")) -//to update model lol -/obj/item/clothing/mask/leatherwhip/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - /obj/item/clothing/mask/leatherwhip/equipped(mob/target, slot) . = ..() @@ -131,6 +126,7 @@ /obj/item/clothing/mask/leatherwhip/Initialize(mapload) . = ..() + AddElement(/datum/element/update_icon_updates_onmob) update_icon_state() update_icon() if(!length(whip_designs)) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/shibari.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/shibari.dm index 90d4bc96f50..212cfcdaecb 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/shibari.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/shibari.dm @@ -88,6 +88,7 @@ /obj/item/stack/shibari_rope/Initialize(mapload, new_amount, merge, list/mat_override, mat_amt) . = ..() + AddElement(/datum/element/update_icon_updates_onmob) RegisterSignal(src, COMSIG_ITEM_ATTACK, .proc/handle_roping) if(!greyscale_colors) var/new_color = "#" @@ -95,10 +96,6 @@ new_color += num2hex(rand(0, 255), 2) set_greyscale(colors = list(new_color)) -/obj/item/stack/shibari_rope/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - /obj/item/stack/shibari_rope/proc/handle_roping(datum/source, mob/living/carbon/attacked, mob/living/user) SIGNAL_HANDLER diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/spanking_pad.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/spanking_pad.dm index 569d23e1391..7c58533aa3a 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/spanking_pad.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/spanking_pad.dm @@ -20,10 +20,6 @@ "pink" = image (icon = src.icon, icon_state = "spankpad_pink"), "teal" = image(icon = src.icon, icon_state = "spankpad_teal")) -/obj/item/spanking_pad/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - /// A check to ensure the user can use the radial menu /obj/item/spanking_pad/proc/check_menu(mob/living/user) if(!istype(user)) @@ -34,6 +30,7 @@ /obj/item/spanking_pad/Initialize(mapload) . = ..() + AddElement(/datum/element/update_icon_updates_onmob) update_icon() update_icon_state() if(!length(spankpad_designs)) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm index 60298141f1e..78fafe6ef3b 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm @@ -21,11 +21,6 @@ var/static/list/pillow_forms w_class = WEIGHT_CLASS_SMALL -// To update model -/obj/item/pillow/ComponentInitialize() - . = ..() - AddElement(/datum/element/update_icon_updates_onmob) - // Create radial menu /obj/item/pillow/proc/populate_pillow_colors() pillow_colors = list( @@ -75,6 +70,7 @@ /obj/item/pillow/Initialize(mapload) . = ..() + AddElement(/datum/element/update_icon_updates_onmob) update_icon_state() update_icon() if(!length(pillow_colors)) diff --git a/modular_skyrat/modules/moretraitoritems/code/headset.dm b/modular_skyrat/modules/moretraitoritems/code/headset.dm index 233c9a61761..c93b5fa30a6 100644 --- a/modular_skyrat/modules/moretraitoritems/code/headset.dm +++ b/modular_skyrat/modules/moretraitoritems/code/headset.dm @@ -7,6 +7,6 @@ command = TRUE freerange = TRUE -/obj/item/radio/headset/chameleon/advanced/ComponentInitialize() +/obj/item/radio/headset/chameleon/advanced/Initialize(mapload) . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) diff --git a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm index 6d2a6fbac45..13b0ae92852 100644 --- a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm +++ b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm @@ -84,7 +84,7 @@ icon_state = "cent_headset_alt" inhand_icon_state = "cent_headset_alt" -/obj/item/radio/headset/heads/nanotrasen_consultant/alt/ComponentInitialize() +/obj/item/radio/headset/heads/nanotrasen_consultant/alt/Initialize(mapload) . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) diff --git a/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm b/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm index cea12b81d85..38bb6e6511b 100644 --- a/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm +++ b/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm @@ -99,8 +99,9 @@ w_class = WEIGHT_CLASS_BULKY has_latches = FALSE -/obj/item/storage/toolbox/emergency/turret/nri/ComponentInitialize() - AddComponent(/datum/component/two_handed, require_twohands=TRUE) +/obj/item/storage/toolbox/emergency/turret/nri/Initialize(mapload) + . = ..() + AddComponent(/datum/component/two_handed, require_twohands = TRUE) /obj/item/storage/toolbox/emergency/turret/nri/PopulateContents() return null diff --git a/modular_skyrat/modules/pollution/code/pollution_initializations.dm b/modular_skyrat/modules/pollution/code/pollution_initializations.dm index 78fa537df28..07f7541e4e2 100644 --- a/modular_skyrat/modules/pollution/code/pollution_initializations.dm +++ b/modular_skyrat/modules/pollution/code/pollution_initializations.dm @@ -22,14 +22,14 @@ . = ..() AddElement(/datum/element/pollution_emitter, /datum/pollutant/decaying_waste, 30) -/obj/item/reagent_containers/food/drinks/coffee/ComponentInitialize() +/obj/item/reagent_containers/food/drinks/coffee/Initialize(mapload) . = ..() AddComponent(/datum/component/temporary_pollution_emission, /datum/pollutant/food/coffee, 5, 3 MINUTES) -/obj/item/reagent_containers/food/drinks/mug/tea/ComponentInitialize() +/obj/item/reagent_containers/food/drinks/mug/tea/Initialize(mapload) . = ..() AddComponent(/datum/component/temporary_pollution_emission, /datum/pollutant/food/tea, 5, 3 MINUTES) -/obj/item/reagent_containers/food/drinks/mug/coco/ComponentInitialize() +/obj/item/reagent_containers/food/drinks/mug/coco/Initialize(mapload) . = ..() AddComponent(/datum/component/temporary_pollution_emission, /datum/pollutant/food/chocolate, 5, 3 MINUTES) diff --git a/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm b/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm index fcd2503f6ce..6371a044aba 100644 --- a/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm +++ b/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm @@ -115,9 +115,9 @@ reach = 2 sharpness = SHARP_POINTY -/obj/item/forging/reagent_weapon/spear/ComponentInitialize() +/obj/item/forging/reagent_weapon/spear/Initialize(mapload) . = ..() - AddComponent(/datum/component/two_handed, force_unwielded=10, force_wielded=17) //better than the bone spear + AddComponent(/datum/component/two_handed, force_unwielded = 10, force_wielded = 17) //better than the bone spear /obj/item/forging/reagent_weapon/axe name = "reagent axe" @@ -221,9 +221,9 @@ slot_flags = ITEM_SLOT_BACK max_integrity = 300 //tanky -/obj/item/shield/riot/buckler/reagent_weapon/pavise/ComponentInitialize() +/obj/item/shield/riot/buckler/reagent_weapon/pavise/Initialize(mapload) . = ..() - AddComponent(/datum/component/two_handed, require_twohands=TRUE, force_wielded=15) + AddComponent(/datum/component/two_handed, require_twohands = TRUE, force_wielded = 15) /obj/item/pickaxe/reagent_weapon name = "reagent pickaxe" diff --git a/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle_accelerator.dm b/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle_accelerator.dm index 4275ce0f255..3321a861bdf 100644 --- a/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle_accelerator.dm +++ b/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle_accelerator.dm @@ -50,7 +50,7 @@ master = null return ..() -/obj/structure/particle_accelerator/ComponentInitialize() +/obj/structure/particle_accelerator/Initialize(mapload) . = ..() AddComponent(/datum/component/simple_rotation)