From 976aec2f71d16e92147c53de7fd0024aaea58705 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 26 Mar 2019 21:43:56 -0400 Subject: [PATCH] Sorts out this PR --- code/ATMOSPHERICS/mainspipe.dm | 6 +++--- code/controllers/subsystems/creation.dm | 2 +- code/datums/beam.dm | 2 +- code/game/machinery/doorbell_vr.dm | 4 ++-- code/game/machinery/jukebox.dm | 2 +- code/game/mecha/equipment/tools/medical_tools.dm | 2 +- code/game/objects/effects/effect_system.dm | 2 +- code/game/objects/effects/map_effects/beam_point.dm | 2 +- .../game/objects/effects/map_effects/effect_emitter.dm | 2 +- code/game/objects/effects/map_effects/map_effects.dm | 2 +- .../objects/effects/map_effects/radiation_emitter.dm | 2 +- .../effects/temporary_visuials/temproary_visual.dm | 2 +- code/game/objects/random/random.dm | 2 +- .../crates_lockers/closets/secure/security_vr.dm | 6 +++--- .../crates_lockers/closets/utility_closets_vr.dm | 2 +- .../objects/structures/crates_lockers/largecrate_vr.dm | 8 ++++---- code/game/objects/structures/map_blocker_vr.dm | 2 +- code/game/objects/structures/trash_pile.dm | 2 +- code/game/turfs/unsimulated/beach.dm | 2 +- code/game/turfs/unsimulated/sky_vr.dm | 2 +- code/modules/awaymissions/zlevel.dm | 2 +- code/modules/clothing/spacesuits/void/void_vr.dm | 4 ++-- code/modules/media/media_machinery.dm | 2 +- code/modules/mining/resonator_vr.dm | 4 ++-- code/modules/mining/shelter_atoms.dm | 2 +- .../mob/living/simple_animal/vore/shadekin/shadekin.dm | 2 +- .../simple_mob/subtypes/animal/space/mimic_vr.dm | 4 ++-- .../simple_mob/subtypes/vore/shadekin/shadekin.dm | 2 +- code/modules/multiz/ladder_assembly_vr.dm | 6 +++--- code/modules/nifsoft/nif_softshop.dm | 2 +- code/modules/organs/subtypes/nano.dm | 2 +- code/modules/power/lightswitch_vr.dm | 2 +- .../modules/reagents/reagent_containers/syringes_vr.dm | 2 +- code/modules/resleeving/computers.dm | 2 +- code/modules/resleeving/machines.dm | 2 +- code/modules/rogueminer_vr/zone_console.dm | 2 +- code/modules/telesci/quantum_pad.dm | 2 +- code/modules/telesci/telesci_computer.dm | 2 +- code/modules/vore/fluffstuff/guns/nsfw.dm | 2 +- maps/southern_cross/structures/closets/misc_vr.dm | 2 +- maps/tether/submaps/_tether_submaps.dm | 4 ++-- maps/tether/submaps/aerostat/_aerostat.dm | 4 ++-- maps/tether/submaps/alienship/_alienship.dm | 4 ++-- maps/tether/submaps/beach/_beach.dm | 2 +- maps/tether/tether_phoronlock.dm | 4 ++-- maps/tether/tether_telecomms.dm | 2 +- maps/tether/tether_things.dm | 10 +++++----- maps/tether/tether_turfs.dm | 6 +++--- 48 files changed, 71 insertions(+), 71 deletions(-) diff --git a/code/ATMOSPHERICS/mainspipe.dm b/code/ATMOSPHERICS/mainspipe.dm index baba515fae..ac2b3193c9 100644 --- a/code/ATMOSPHERICS/mainspipe.dm +++ b/code/ATMOSPHERICS/mainspipe.dm @@ -571,7 +571,7 @@ obj/machinery/atmospherics/mains_pipe/valve else icon_state = "[hide?"h":""]mvalve[open]" - initialize() + Initialize() normalize_dir() var/node1_dir var/node2_dir @@ -609,7 +609,7 @@ obj/machinery/atmospherics/mains_pipe/valve open = 1 update_icon() - initialize() + Initialize() return 1 @@ -668,7 +668,7 @@ obj/machinery/atmospherics/mains_pipe/valve var/id = null var/datum/radio_frequency/radio_connection - initialize() + Initialize() ..() if(frequency) set_frequency(frequency) diff --git a/code/controllers/subsystems/creation.dm b/code/controllers/subsystems/creation.dm index d6f4b3c9c5..6f7b33dc47 100644 --- a/code/controllers/subsystems/creation.dm +++ b/code/controllers/subsystems/creation.dm @@ -24,6 +24,6 @@ SUBSYSTEM_DEF(creation) var/total_atoms = atoms_needing_initialize.len for(var/atom/movable/A in atoms_needing_initialize) if(!QDELETED(A)) - A.initialize() + A.Initialize() atoms_needing_initialize -= A admin_notice("Initalized [total_atoms] atoms in submap.", R_DEBUG) \ No newline at end of file diff --git a/code/datums/beam.dm b/code/datums/beam.dm index 07407a3ddd..32cc5129c9 100644 --- a/code/datums/beam.dm +++ b/code/datums/beam.dm @@ -144,7 +144,7 @@ // 'Reactive' beam parts do something when touched or stood in. /obj/effect/ebeam/reactive -/obj/effect/ebeam/reactive/initialize() +/obj/effect/ebeam/reactive/Initialize() processing_objects += src return ..() diff --git a/code/game/machinery/doorbell_vr.dm b/code/game/machinery/doorbell_vr.dm index 46dec472a6..25fb75df44 100644 --- a/code/game/machinery/doorbell_vr.dm +++ b/code/game/machinery/doorbell_vr.dm @@ -11,7 +11,7 @@ var/id_tag = null var/chime_sound = 'sound/machines/doorbell.ogg' -/obj/machinery/doorbell_chime/initialize() +/obj/machinery/doorbell_chime/Initialize() . = ..() update_icon() @@ -99,7 +99,7 @@ assign_uid() id = num2text(uid) -/obj/machinery/button/doorbell/initialize() +/obj/machinery/button/doorbell/Initialize() . = ..() update_icon() diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index 5c94d8a114..b952f678bb 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -64,7 +64,7 @@ ..() // On initialization, copy our tracks from the global list -/obj/machinery/media/jukebox/initialize() +/obj/machinery/media/jukebox/Initialize() . = ..() if(LAZYLEN(all_jukebox_tracks)) //Global list has tracks tracks.Cut() diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index d05a49f8c4..f763304fc0 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -451,7 +451,7 @@ create_reagents(max_volume) synth = new (list(src),0) -/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/initialize() +/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/Initialize() . = ..() //Wow nice, firsties if(LAZYLEN(allowed_reagents) && !istext(allowed_reagents[1])) diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 67e0a87e8d..a52f67c6ea 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -262,7 +262,7 @@ steam.start() -- spawns the effect opacity = FALSE var/strength = 5 // How much damage to do inside each affect() -/obj/effect/effect/smoke/elemental/initialize() +/obj/effect/effect/smoke/elemental/Initialize() processing_objects += src return ..() diff --git a/code/game/objects/effects/map_effects/beam_point.dm b/code/game/objects/effects/map_effects/beam_point.dm index de6e2d58a5..524686874c 100644 --- a/code/game/objects/effects/map_effects/beam_point.dm +++ b/code/game/objects/effects/map_effects/beam_point.dm @@ -31,7 +31,7 @@ GLOBAL_LIST_EMPTY(all_beam_points) var/beam_type = /obj/effect/ebeam // The type of beam. Default has no special properties. Some others may do things like hurt things touching it. var/beam_sleep_time = 3 // How often the beam updates visually. Suggested to leave this alone, 3 is already fast. -/obj/effect/map_effect/beam_point/initialize() +/obj/effect/map_effect/beam_point/Initialize() GLOB.all_beam_points += src if(make_beams_on_init) create_beams() diff --git a/code/game/objects/effects/map_effects/effect_emitter.dm b/code/game/objects/effects/map_effects/effect_emitter.dm index 6a7b599ccc..441ba957dd 100644 --- a/code/game/objects/effects/map_effects/effect_emitter.dm +++ b/code/game/objects/effects/map_effects/effect_emitter.dm @@ -7,7 +7,7 @@ var/effect_cardinals_only = FALSE // If true, effects only move in cardinal directions. var/effect_forced_dir = null // If set, effects emitted will always move in this direction. -/obj/effect/map_effect/interval/effect_emitter/initialize() +/obj/effect/map_effect/interval/effect_emitter/Initialize() effect_system = new effect_system_type() effect_system.attach(src) configure_effects() diff --git a/code/game/objects/effects/map_effects/map_effects.dm b/code/game/objects/effects/map_effects/map_effects.dm index 994e418f59..5cd79f1b0c 100644 --- a/code/game/objects/effects/map_effects/map_effects.dm +++ b/code/game/objects/effects/map_effects/map_effects.dm @@ -27,7 +27,7 @@ var/interval_upper_bound = 5 SECONDS // Higher number for above. var/halt = FALSE // Set to true to stop the loop when it reaches the next iteration. -/obj/effect/map_effect/interval/initialize() +/obj/effect/map_effect/interval/Initialize() handle_interval_delay() return ..() diff --git a/code/game/objects/effects/map_effects/radiation_emitter.dm b/code/game/objects/effects/map_effects/radiation_emitter.dm index 7af2a1af32..0d9af4d2da 100644 --- a/code/game/objects/effects/map_effects/radiation_emitter.dm +++ b/code/game/objects/effects/map_effects/radiation_emitter.dm @@ -4,7 +4,7 @@ icon_state = "radiation_emitter" var/radiation_power = 30 // Bigger numbers means more radiation. -/obj/effect/map_effect/radiation_emitter/initialize() +/obj/effect/map_effect/radiation_emitter/Initialize() processing_objects += src return ..() diff --git a/code/game/objects/effects/temporary_visuials/temproary_visual.dm b/code/game/objects/effects/temporary_visuials/temproary_visual.dm index 9beda4cac3..0ecaf5e312 100644 --- a/code/game/objects/effects/temporary_visuials/temproary_visual.dm +++ b/code/game/objects/effects/temporary_visuials/temproary_visual.dm @@ -8,7 +8,7 @@ var/duration = 10 //in deciseconds var/randomdir = TRUE -/obj/effect/temp_visual/initialize() +/obj/effect/temp_visual/Initialize() . = ..() if(randomdir) set_dir(pick(global.cardinal)) diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index a47fe3059c..301323ba3d 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -1058,7 +1058,7 @@ var/list/multi_point_spawns var/id // Group id var/weight // Probability weight for this spawn point -/obj/random_multi/initialize() +/obj/random_multi/Initialize() . = ..() weight = max(1, round(weight)) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm index 9dadb6dc89..aa682c1731 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm @@ -95,7 +95,7 @@ /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/shoes/boots/jackboots/toeless) -/obj/structure/closet/secure_closet/nanotrasen_security/initialize() +/obj/structure/closet/secure_closet/nanotrasen_security/Initialize() if(prob(25)) starts_with += /obj/item/weapon/storage/backpack/security else @@ -149,7 +149,7 @@ /obj/item/clothing/shoes/boots/jackboots/toeless, /obj/item/clothing/under/nanotrasen/security/commander) -/obj/structure/closet/secure_closet/nanotrasen_commander/initialize() +/obj/structure/closet/secure_closet/nanotrasen_commander/Initialize() if(prob(25)) starts_with += /obj/item/weapon/storage/backpack/security else @@ -195,7 +195,7 @@ /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/shoes/boots/jackboots/toeless) -/obj/structure/closet/secure_closet/nanotrasen_warden/initialize() +/obj/structure/closet/secure_closet/nanotrasen_warden/Initialize() if(prob(25)) new /obj/item/weapon/storage/backpack/security(src) else diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm index 54abff6eb3..c126b965f3 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm @@ -1,4 +1,4 @@ -/obj/structure/closet/firecloset/initialize() +/obj/structure/closet/firecloset/Initialize() starts_with += /obj/item/weapon/storage/toolbox/emergency return ..() diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index 864d4c8d4d..b7db1ea0a6 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -40,7 +40,7 @@ name = "Predator carrier" starts_with = list(/mob/living/simple_mob/vore/catgirl) -/obj/structure/largecrate/animal/pred/initialize() //This is nessesary to get a random one each time. +/obj/structure/largecrate/animal/pred/Initialize() //This is nessesary to get a random one each time. starts_with = list(pick(/mob/living/simple_mob/vore/bee, /mob/living/simple_mob/vore/catgirl;3, /mob/living/simple_mob/vore/frog, @@ -61,7 +61,7 @@ name = "Dangerous Predator carrier" starts_with = list(/mob/living/simple_mob/animal/space/alien) -/obj/structure/largecrate/animal/dangerous/initialize() +/obj/structure/largecrate/animal/dangerous/Initialize() starts_with = list(pick(/mob/living/simple_mob/animal/space/carp/large, /mob/living/simple_mob/hostile/deathclaw, /mob/living/simple_mob/vore/dino, @@ -101,7 +101,7 @@ desc = "VARMAcorp experimental hostile environment adaptive breeding development kit. WARNING, DO NOT RELEASE IN WILD!" starts_with = list(/mob/living/simple_mob/otie/cotie/phoron) -/obj/structure/largecrate/animal/otie/phoron/initialize() +/obj/structure/largecrate/animal/otie/phoron/Initialize() starts_with = list(pick(/mob/living/simple_mob/otie/cotie/phoron;2, /mob/living/simple_mob/otie/red/friendly;0.5)) return ..() @@ -129,7 +129,7 @@ desc = "Bounces around a lot. Looks messily packaged, were they in a hurry?" starts_with = list(/mob/living/simple_mob/fennec) -/obj/structure/largecrate/animal/fennec/initialize() +/obj/structure/largecrate/animal/fennec/Initialize() starts_with = list(pick(/mob/living/simple_mob/fennec, /mob/living/simple_mob/vore/fennix;0.5)) return ..() diff --git a/code/game/objects/structures/map_blocker_vr.dm b/code/game/objects/structures/map_blocker_vr.dm index 03a5a874b8..52be6c4035 100644 --- a/code/game/objects/structures/map_blocker_vr.dm +++ b/code/game/objects/structures/map_blocker_vr.dm @@ -9,7 +9,7 @@ density = 1 unacidable = 1 -/obj/effect/blocker/initialize() // For non-gateway maps. +/obj/effect/blocker/Initialize() // For non-gateway maps. . = ..() icon = null icon_state = null diff --git a/code/game/objects/structures/trash_pile.dm b/code/game/objects/structures/trash_pile.dm index 8fa3867b36..716de5a39e 100644 --- a/code/game/objects/structures/trash_pile.dm +++ b/code/game/objects/structures/trash_pile.dm @@ -28,7 +28,7 @@ var/global/list/allocated_gamma = list() -/obj/structure/trash_pile/initialize() +/obj/structure/trash_pile/Initialize() . = ..() icon_state = pick( "pile1", diff --git a/code/game/turfs/unsimulated/beach.dm b/code/game/turfs/unsimulated/beach.dm index 28cebacb8a..4638b15cab 100644 --- a/code/game/turfs/unsimulated/beach.dm +++ b/code/game/turfs/unsimulated/beach.dm @@ -37,7 +37,7 @@ icon = 'icons/turf/desert.dmi' icon_state = "desert" -/turf/simulated/floor/beach/sand/desert/initialize() +/turf/simulated/floor/beach/sand/desert/Initialize() . = ..() if(prob(5)) icon_state = "desert[rand(0,4)]" diff --git a/code/game/turfs/unsimulated/sky_vr.dm b/code/game/turfs/unsimulated/sky_vr.dm index 1db001a187..8ba1cf0cb5 100644 --- a/code/game/turfs/unsimulated/sky_vr.dm +++ b/code/game/turfs/unsimulated/sky_vr.dm @@ -12,7 +12,7 @@ var/does_skyfall = TRUE var/list/skyfall_levels -/turf/unsimulated/floor/sky/initialize() +/turf/unsimulated/floor/sky/Initialize() . = ..() if(does_skyfall && !LAZYLEN(skyfall_levels)) error("[x],[y],[z], [get_area(src)] doesn't have skyfall_levels defined! Can't skyfall!") diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index 5dd235fdff..1182129cd6 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -59,7 +59,7 @@ proc/createRandomZlevel() //VOREStation Add - This landmark type so it's not so ghetto. /obj/effect/landmark/gateway_scatter name = "uncalibrated gateway destination" -/obj/effect/landmark/gateway_scatter/initialize() +/obj/effect/landmark/gateway_scatter/Initialize() . = ..() awaydestinations += src //VOREStation Add End diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm index b0842df24f..4b15e28795 100644 --- a/code/modules/clothing/spacesuits/void/void_vr.dm +++ b/code/modules/clothing/spacesuits/void/void_vr.dm @@ -94,7 +94,7 @@ SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH ) -/obj/item/clothing/suit/space/void/explorer/initialize() +/obj/item/clothing/suit/space/void/explorer/Initialize() . = ..() sprite_sheets += sprite_sheets_refit @@ -118,6 +118,6 @@ SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH ) -/obj/item/clothing/head/helmet/space/void/explorer/initialize() +/obj/item/clothing/head/helmet/space/void/explorer/Initialize() . = ..() sprite_sheets += sprite_sheets_refit diff --git a/code/modules/media/media_machinery.dm b/code/modules/media/media_machinery.dm index d12b91eb38..02d4d9698d 100644 --- a/code/modules/media/media_machinery.dm +++ b/code/modules/media/media_machinery.dm @@ -64,7 +64,7 @@ if(anchored) update_music() -/obj/machinery/media/initialize() +/obj/machinery/media/Initialize() . = ..() update_media_source() diff --git a/code/modules/mining/resonator_vr.dm b/code/modules/mining/resonator_vr.dm index a4b20990cb..d3c3246a24 100644 --- a/code/modules/mining/resonator_vr.dm +++ b/code/modules/mining/resonator_vr.dm @@ -61,7 +61,7 @@ mouse_opacity = 0 var/resonance_damage = 20 -/obj/effect/resonance/initialize(mapload, var/creator = null, var/timetoburst) +/obj/effect/resonance/Initialize(mapload, var/creator = null, var/timetoburst) . = ..() // Start small and grow to big size as we are about to burst transform = matrix()*0.75 @@ -105,7 +105,7 @@ layer = ABOVE_MOB_LAYER duration = 4 -/obj/effect/temp_visual/resonance_crush/initialize() +/obj/effect/temp_visual/resonance_crush/Initialize() . = ..() transform = matrix()*1.5 animate(src, transform = matrix()*0.1, alpha = 50, time = 4) diff --git a/code/modules/mining/shelter_atoms.dm b/code/modules/mining/shelter_atoms.dm index afd9ad6d5f..8fbebeee54 100644 --- a/code/modules/mining/shelter_atoms.dm +++ b/code/modules/mining/shelter_atoms.dm @@ -219,7 +219,7 @@ pixel_y = -4 max_n_of_items = 100 -/obj/machinery/smartfridge/survival_pod/initialize() +/obj/machinery/smartfridge/survival_pod/Initialize() . = ..() for(var/obj/item/O in loc) if(accept_check(O)) diff --git a/code/modules/mob/living/simple_animal/vore/shadekin/shadekin.dm b/code/modules/mob/living/simple_animal/vore/shadekin/shadekin.dm index 7b151161be..a89688088d 100644 --- a/code/modules/mob/living/simple_animal/vore/shadekin/shadekin.dm +++ b/code/modules/mob/living/simple_animal/vore/shadekin/shadekin.dm @@ -85,7 +85,7 @@ var/list/shadekin_abilities -/mob/living/simple_mob/shadekin/initialize() +/mob/living/simple_mob/shadekin/Initialize() //You spawned the prototype, and want a totally random one. if(type == /mob/living/simple_mob/shadekin) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/mimic_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/mimic_vr.dm index 3cd2f744a0..c2e82341bc 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/mimic_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/mimic_vr.dm @@ -85,7 +85,7 @@ O.forceMove(C) ..() -/mob/living/simple_mob/animal/space/mimic/initialize() +/mob/living/simple_mob/animal/space/mimic/Initialize() . = ..() for(var/obj/item/I in loc) I.forceMove(src) @@ -104,7 +104,7 @@ var/attempt_open = 0 // Pickup loot -/mob/living/simple_mob/animal/space/mimic/crate/initialize() +/mob/living/simple_mob/animal/space/mimic/crate/Initialize() . = ..() for(var/obj/item/I in loc) I.forceMove(src) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm index ce7148062a..4978ad6851 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm @@ -75,7 +75,7 @@ var/list/shadekin_abilities -/mob/living/simple_mob/shadekin/initialize() +/mob/living/simple_mob/shadekin/Initialize() //You spawned the prototype, and want a totally random one. if(type == /mob/living/simple_mob/shadekin) diff --git a/code/modules/multiz/ladder_assembly_vr.dm b/code/modules/multiz/ladder_assembly_vr.dm index 064d23cec3..3bb7b681fd 100644 --- a/code/modules/multiz/ladder_assembly_vr.dm +++ b/code/modules/multiz/ladder_assembly_vr.dm @@ -107,21 +107,21 @@ var/obj/structure/ladder/L = new(get_turf(below)) L.allowed_directions = UP if(below.created_name) L.name = below.created_name - L.initialize() + L.Initialize() qdel(below) if(me) var/obj/structure/ladder/L = new(get_turf(me)) L.allowed_directions = (below ? DOWN : 0) | (above ? UP : 0) if(me.created_name) L.name = me.created_name - L.initialize() + L.Initialize() qdel(me) if(above) var/obj/structure/ladder/L = new(get_turf(above)) L.allowed_directions = DOWN if(above.created_name) L.name = above.created_name - L.initialize() + L.Initialize() qdel(above) // Make them constructable in hand diff --git a/code/modules/nifsoft/nif_softshop.dm b/code/modules/nifsoft/nif_softshop.dm index a17e09b855..7c2990395d 100644 --- a/code/modules/nifsoft/nif_softshop.dm +++ b/code/modules/nifsoft/nif_softshop.dm @@ -19,7 +19,7 @@ opacity = 0 var/datum/entopic/entopic -/obj/machinery/vending/nifsoft_shop/initialize() +/obj/machinery/vending/nifsoft_shop/Initialize() . = ..() entopic = new(aholder = src, aicon = icon, aicon_state = "beacon") diff --git a/code/modules/organs/subtypes/nano.dm b/code/modules/organs/subtypes/nano.dm index fe23f37f85..b8fb26cd64 100644 --- a/code/modules/organs/subtypes/nano.dm +++ b/code/modules/organs/subtypes/nano.dm @@ -157,7 +157,7 @@ icon = 'icons/mob/species/protean/protean.dmi' icon_state = "posi" -/obj/item/device/mmi/digital/posibrain/nano/initialize() +/obj/item/device/mmi/digital/posibrain/nano/Initialize() . = ..() icon_state = "posi" diff --git a/code/modules/power/lightswitch_vr.dm b/code/modules/power/lightswitch_vr.dm index 937660dcbc..9e2ef28e89 100644 --- a/code/modules/power/lightswitch_vr.dm +++ b/code/modules/power/lightswitch_vr.dm @@ -58,7 +58,7 @@ var/x_offset = 26 var/y_offset = 26 -/obj/structure/construction/initialize(var/mapload, var/ndir, var/building = FALSE) +/obj/structure/construction/Initialize(var/mapload, var/ndir, var/building = FALSE) . = ..() if(ndir) set_dir(ndir) diff --git a/code/modules/reagents/reagent_containers/syringes_vr.dm b/code/modules/reagents/reagent_containers/syringes_vr.dm index c1d4a4e686..b60c1d0536 100644 --- a/code/modules/reagents/reagent_containers/syringes_vr.dm +++ b/code/modules/reagents/reagent_containers/syringes_vr.dm @@ -8,7 +8,7 @@ var/list/targets var/list/datum/disease2/disease/viruses -/obj/item/weapon/reagent_containers/syringe/initialize() +/obj/item/weapon/reagent_containers/syringe/Initialize() . = ..() update_icon() diff --git a/code/modules/resleeving/computers.dm b/code/modules/resleeving/computers.dm index b688bf6dca..f4445682dc 100644 --- a/code/modules/resleeving/computers.dm +++ b/code/modules/resleeving/computers.dm @@ -16,7 +16,7 @@ var/synthetic_capable = 1 var/obj/item/weapon/disk/transcore/disk -/obj/machinery/computer/transhuman/resleeving/initialize() +/obj/machinery/computer/transhuman/resleeving/Initialize() . = ..() updatemodules() diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index 7a021c4a5a..8db26fe03f 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -9,7 +9,7 @@ circuit = /obj/item/weapon/circuitboard/transhuman_clonepod //A full version of the pod -/obj/machinery/clonepod/transhuman/full/initialize() +/obj/machinery/clonepod/transhuman/full/Initialize() . = ..() for(var/i = 1 to container_limit) containers += new /obj/item/weapon/reagent_containers/glass/bottle/biomass(src) diff --git a/code/modules/rogueminer_vr/zone_console.dm b/code/modules/rogueminer_vr/zone_console.dm index b9813715e8..75c5d6625c 100644 --- a/code/modules/rogueminer_vr/zone_console.dm +++ b/code/modules/rogueminer_vr/zone_console.dm @@ -23,7 +23,7 @@ var/legacy_zone = 0 //Disable scanning and whatnot. var/obj/machinery/computer/shuttle_control/belter/shuttle_control -/obj/machinery/computer/roguezones/initialize() +/obj/machinery/computer/roguezones/Initialize() . = ..() shuttle_control = locate(/obj/machinery/computer/shuttle_control/belter) diff --git a/code/modules/telesci/quantum_pad.dm b/code/modules/telesci/quantum_pad.dm index 1d3eed0785..f36c05ade4 100644 --- a/code/modules/telesci/quantum_pad.dm +++ b/code/modules/telesci/quantum_pad.dm @@ -20,7 +20,7 @@ var/map_pad_id = "" as text //what's my name var/map_pad_link_id = "" as text //who's my friend -/obj/machinery/power/quantumpad/initialize() +/obj/machinery/power/quantumpad/Initialize() . = ..() default_apply_parts() connect_to_network() diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index e6fbee3845..43784ef42a 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -40,7 +40,7 @@ ..() user << "There are [crystals.len ? crystals.len : "no"] bluespace crystal\s in the crystal slots." -/obj/machinery/computer/telescience/initialize() +/obj/machinery/computer/telescience/Initialize() . = ..() recalibrate() for(var/i = 1; i <= starting_crystals; i++) diff --git a/code/modules/vore/fluffstuff/guns/nsfw.dm b/code/modules/vore/fluffstuff/guns/nsfw.dm index e6e4c1a897..529f0fff22 100644 --- a/code/modules/vore/fluffstuff/guns/nsfw.dm +++ b/code/modules/vore/fluffstuff/guns/nsfw.dm @@ -200,7 +200,7 @@ var/type_name = null projectile_type = /obj/item/projectile/beam -/obj/item/ammo_casing/nsfw_batt/initialize() +/obj/item/ammo_casing/nsfw_batt/Initialize() . = ..() pixel_x = rand(-10, 10) pixel_y = rand(-10, 10) diff --git a/maps/southern_cross/structures/closets/misc_vr.dm b/maps/southern_cross/structures/closets/misc_vr.dm index 07d98e8434..ab2d2410ff 100644 --- a/maps/southern_cross/structures/closets/misc_vr.dm +++ b/maps/southern_cross/structures/closets/misc_vr.dm @@ -113,7 +113,7 @@ /obj/item/clothing/accessory/holster/machete, /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2) -/obj/structure/closet/secure_closet/pathfinder/initialize() +/obj/structure/closet/secure_closet/pathfinder/Initialize() if(prob(50)) starts_with += /obj/item/weapon/storage/backpack else diff --git a/maps/tether/submaps/_tether_submaps.dm b/maps/tether/submaps/_tether_submaps.dm index e731ba1fb2..d5e3d85210 100644 --- a/maps/tether/submaps/_tether_submaps.dm +++ b/maps/tether/submaps/_tether_submaps.dm @@ -177,7 +177,7 @@ /obj/effect/step_trigger/zlevel_fall //Don't ever use this, only use subtypes.Define a new var/static/target_z on each affect_ghosts = 1 -/obj/effect/step_trigger/zlevel_fall/initialize() +/obj/effect/step_trigger/zlevel_fall/Initialize() . = ..() if(istype(get_turf(src), /turf/simulated/floor)) @@ -240,7 +240,7 @@ var/mob/living/simple_mob/my_mob var/depleted = FALSE -/obj/tether_away_spawner/initialize() +/obj/tether_away_spawner/Initialize() . = ..() if(!LAZYLEN(mobs_to_pick_from)) diff --git a/maps/tether/submaps/aerostat/_aerostat.dm b/maps/tether/submaps/aerostat/_aerostat.dm index 9a1a34f5e0..efc7528ffb 100644 --- a/maps/tether/submaps/aerostat/_aerostat.dm +++ b/maps/tether/submaps/aerostat/_aerostat.dm @@ -48,7 +48,7 @@ shuttle_name = "Excursion Shuttle" destinations = list(/datum/shuttle_destination/excursion/virgo2orbit, /datum/shuttle_destination/excursion/aerostat) -/obj/away_mission_init/aerostat/initialize() +/obj/away_mission_init/aerostat/Initialize() /*seed_submaps(list(Z_LEVEL_AEROSTAT_SURFACE), 50, /area/tether_away/aerostat/surface/unexplored, /datum/map_template/virgo2) new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_AEROSTAT_SURFACE, world.maxx, world.maxy) new /datum/random_map/noise/ore/virgo2(null, 1, 1, Z_LEVEL_AEROSTAT_SURFACE, 64, 64)*/ @@ -129,7 +129,7 @@ color = "#eacd7c" VIRGO2_SET_ATMOS -/turf/unsimulated/floor/sky/virgo2_sky/initialize() +/turf/unsimulated/floor/sky/virgo2_sky/Initialize() skyfall_levels = list(z+1) . = ..() diff --git a/maps/tether/submaps/alienship/_alienship.dm b/maps/tether/submaps/alienship/_alienship.dm index be9f764155..7336a0db19 100644 --- a/maps/tether/submaps/alienship/_alienship.dm +++ b/maps/tether/submaps/alienship/_alienship.dm @@ -34,7 +34,7 @@ var/door_on_mode var/teleport_on_mode -/obj/away_mission_init/alienship/initialize() +/obj/away_mission_init/alienship/Initialize() . = ..() if(!mission_mode) //WE ARE NUMBER ONE @@ -120,7 +120,7 @@ var/area/dump_area var/obj/shuttle_connector/shuttle_friend -/area/shuttle/excursion/away_alienship/initialize() +/area/shuttle/excursion/away_alienship/Initialize() . = ..() dump_area = locate(/area/tether_away/alienship/equip_dump) diff --git a/maps/tether/submaps/beach/_beach.dm b/maps/tether/submaps/beach/_beach.dm index 0f9def9eff..8336c6b23a 100644 --- a/maps/tether/submaps/beach/_beach.dm +++ b/maps/tether/submaps/beach/_beach.dm @@ -72,7 +72,7 @@ name = "away mission initializer - beachcave" //In our case, it initializes the ores and random submaps in the beach's cave, then deletes itself -/obj/away_mission_init/beachcave/initialize() +/obj/away_mission_init/beachcave/Initialize() // Cave submaps are first. /*seed_submaps(list(z), 50, /area/tether_away/cave/unexplored/normal, /datum/map_template/surface/mountains/normal) seed_submaps(list(z), 50, /area/tether_away/cave/unexplored/deep, /datum/map_template/surface/mountains/deep) diff --git a/maps/tether/tether_phoronlock.dm b/maps/tether/tether_phoronlock.dm index 8f86c9eedc..ead834fb70 100644 --- a/maps/tether/tether_phoronlock.dm +++ b/maps/tether/tether_phoronlock.dm @@ -50,7 +50,7 @@ obj/machinery/airlock_sensor/phoron/airlock_exterior var/frequency = 0 var/datum/radio_frequency/radio_connection -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/initialize() +/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/Initialize() . = ..() if(frequency) set_frequency(frequency) @@ -97,7 +97,7 @@ obj/machinery/airlock_sensor/phoron/airlock_exterior /obj/machinery/embedded_controller/radio/airlock/phoron var/tag_scrubber -/obj/machinery/embedded_controller/radio/airlock/phoron/initialize() +/obj/machinery/embedded_controller/radio/airlock/phoron/Initialize() . = ..() program = new/datum/computer/file/embedded_program/airlock/phoron(src) diff --git a/maps/tether/tether_telecomms.dm b/maps/tether/tether_telecomms.dm index 619b21a5d2..0387a495e6 100644 --- a/maps/tether/tether_telecomms.dm +++ b/maps/tether/tether_telecomms.dm @@ -119,6 +119,6 @@ name = "pre-linked multitool (tether hub)" desc = "This multitool has already been linked to the Tether telecomms hub and can be used to configure one (1) relay." -/obj/item/device/multitool/tether_buffered/initialize() +/obj/item/device/multitool/tether_buffered/Initialize() . = ..() buffer = locate(/obj/machinery/telecomms/hub/preset/tether) diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index 70d18fb472..70c1e2c9e3 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -75,7 +75,7 @@ icon = 'icons/obj/stairs.dmi' icon_state = "stairs" invisibility = 0 -/obj/effect/step_trigger/teleporter/to_underdark/initialize() +/obj/effect/step_trigger/teleporter/to_underdark/Initialize() . = ..() teleport_x = x teleport_y = y @@ -88,7 +88,7 @@ icon = 'icons/obj/stairs.dmi' icon_state = "stairs" invisibility = 0 -/obj/effect/step_trigger/teleporter/from_underdark/initialize() +/obj/effect/step_trigger/teleporter/from_underdark/Initialize() . = ..() teleport_x = x teleport_y = y @@ -97,7 +97,7 @@ if(Z.name == "Mining Outpost") teleport_z = Z.z -/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b/initialize() +/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b/Initialize() planet = planet_virgo3b . = ..() @@ -152,7 +152,7 @@ var/area/shock_area = /area/tether/surfacebase/tram -/turf/simulated/floor/maglev/initialize() +/turf/simulated/floor/maglev/Initialize() . = ..() shock_area = locate(shock_area) @@ -192,7 +192,7 @@ /obj/machinery/smartfridge/chemistry/chemvator/down name = "\improper Smart Chemavator - Lower" -/obj/machinery/smartfridge/chemistry/chemvator/down/initialize() +/obj/machinery/smartfridge/chemistry/chemvator/down/Initialize() . = ..() var/obj/machinery/smartfridge/chemistry/chemvator/above = locate(/obj/machinery/smartfridge/chemistry/chemvator,get_zstep(src,UP)) if(istype(above)) diff --git a/maps/tether/tether_turfs.dm b/maps/tether/tether_turfs.dm index 4ae161d40f..a809765de3 100644 --- a/maps/tether/tether_turfs.dm +++ b/maps/tether/tether_turfs.dm @@ -164,7 +164,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) /turf/space/bluespace name = "bluespace" icon_state = "bluespace" -/turf/space/bluespace/initialize() +/turf/space/bluespace/Initialize() ..() icon_state = "bluespace" @@ -173,7 +173,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) name = "sand transit" icon = 'icons/turf/transit_vr.dmi' icon_state = "desert_ns" -/turf/space/sandyscroll/initialize() +/turf/space/sandyscroll/Initialize() ..() icon_state = "desert_ns" @@ -182,7 +182,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) /turf/simulated/sky/virgo3b color = "#FFBBBB" -/turf/simulated/sky/virgo3b/initialize() +/turf/simulated/sky/virgo3b/Initialize() SSplanets.addTurf(src) set_light(2, 2, "#FFBBBB")