diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm index 4b02e1a24b..a050fc16c0 100644 --- a/code/modules/mob/living/bot/bot.dm +++ b/code/modules/mob/living/bot/bot.dm @@ -45,9 +45,8 @@ can_pain_emote = FALSE // CHOMPEdit: Sanity/safety, if bots ever get emotes later, undo this allow_mind_transfer = TRUE -/mob/living/bot/New() - ..() - //update_icons() //VOREstation edit: moved to Init +/mob/living/bot/Initialize() + . = ..() //default_language = GLOB.all_languages[LANGUAGE_GALCOM] //VOREstation edit: moved to Init @@ -61,9 +60,6 @@ if(!using_map.bot_patrolling) will_patrol = FALSE -// Make sure mapped in units start turned on. -/mob/living/bot/Initialize() - . = ..() if(on) turn_on() // Update lights and other stuff update_icons() //VOREstation edit - overlay runtime fix diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm index 47c11f928a..a69f9e8c4e 100644 --- a/code/modules/mob/living/bot/cleanbot.dm +++ b/code/modules/mob/living/bot/cleanbot.dm @@ -19,8 +19,8 @@ var/blood = 1 var/list/target_types = list() -/mob/living/bot/cleanbot/New() - ..() +/mob/living/bot/cleanbot/Initialize() + . = ..() get_targets() /mob/living/bot/cleanbot/Destroy() diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index e706ca5a4b..5c77d173ae 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -23,8 +23,8 @@ var/obj/structure/reagent_dispensers/watertank/tank -/mob/living/bot/farmbot/New(var/newloc, var/newTank) - ..(newloc) +/mob/living/bot/farmbot/Initialize(var/newloc, var/newTank) + . = ..(newloc) if(!newTank) newTank = new /obj/structure/reagent_dispensers/watertank(src) tank = newTank diff --git a/code/modules/mob/living/bot/mulebot.dm b/code/modules/mob/living/bot/mulebot.dm index c835e11a96..6825b66479 100644 --- a/code/modules/mob/living/bot/mulebot.dm +++ b/code/modules/mob/living/bot/mulebot.dm @@ -36,8 +36,8 @@ var/global/amount = 0 -/mob/living/bot/mulebot/New() - ..() +/mob/living/bot/mulebot/Initialize() + . = ..() var/turf/T = get_turf(loc) var/obj/machinery/navbeacon/N = locate() in T diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm index cc6551a26e..01a8425cde 100644 --- a/code/modules/vehicles/Securitrain_vr.dm +++ b/code/modules/vehicles/Securitrain_vr.dm @@ -59,10 +59,10 @@ //------------------------------------------- // Standard procs //------------------------------------------- -/obj/vehicle/train/security/engine/New() - ..() +/obj/vehicle/train/security/engine/Initialize() cell = new /obj/item/cell/high(src) key = new key_type(src) + . = ..() var/image/I = new(icon = 'icons/obj/vehicles.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs add_overlay(I) turn_off() //so engine verbs are correctly set diff --git a/code/modules/vehicles/quad.dm b/code/modules/vehicles/quad.dm index bd8d04c7e1..2534b984cf 100644 --- a/code/modules/vehicles/quad.dm +++ b/code/modules/vehicles/quad.dm @@ -216,8 +216,8 @@ return 1 return 0 -/obj/vehicle/train/trolley/trailer/New() - ..() +/obj/vehicle/train/trolley/trailer/Initialize() + . = ..() update_icon() /obj/vehicle/train/trolley/trailer/Moved(atom/old_loc, direction, forced = FALSE) diff --git a/code/modules/vehicles/rover_vr.dm b/code/modules/vehicles/rover_vr.dm index 04169bf5e9..ca733f8269 100644 --- a/code/modules/vehicles/rover_vr.dm +++ b/code/modules/vehicles/rover_vr.dm @@ -61,10 +61,10 @@ //------------------------------------------- // Standard procs //------------------------------------------- -/obj/vehicle/train/rover/engine/New() - ..() +/obj/vehicle/train/rover/engine/Initialize() cell = new /obj/item/cell/high(src) key = new(src) + . = ..() turn_off() //so engine verbs are correctly set /obj/vehicle/train/rover/engine/Move(var/turf/destination) diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 3aecd5d767..3957460769 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1569,8 +1569,8 @@ End CHOMP Removal*/ icon_state = "ceph_d6[result]" /obj/item/dice/loaded/ceph/Initialize() - icon_state = "ceph_d6[rand(1,sides)]" . = ..() + icon_state = "ceph_d6[rand(1,sides)]" //abc123: Mira Nesyne diff --git a/code/modules/xenoarcheaology/artifacts/autocloner.dm b/code/modules/xenoarcheaology/artifacts/autocloner.dm index 5cbf8e77f1..f3fb54e32f 100644 --- a/code/modules/xenoarcheaology/artifacts/autocloner.dm +++ b/code/modules/xenoarcheaology/artifacts/autocloner.dm @@ -15,6 +15,7 @@ idle_power_usage = 1000 /obj/machinery/auto_cloner/Initialize(mapload) + . = ..() time_per_spawn = rand(1200,3600) @@ -37,7 +38,6 @@ /mob/living/simple_mob/animal/passive/crab, /mob/living/simple_mob/animal/passive/mouse, /mob/living/simple_mob/animal/goat) - . = ..() //todo: how the hell is the asteroid permanently powered? /obj/machinery/auto_cloner/process() diff --git a/code/modules/xenoarcheaology/artifacts/crystal.dm b/code/modules/xenoarcheaology/artifacts/crystal.dm index f74e1faf23..3239aaa668 100644 --- a/code/modules/xenoarcheaology/artifacts/crystal.dm +++ b/code/modules/xenoarcheaology/artifacts/crystal.dm @@ -5,6 +5,7 @@ density = TRUE /obj/structure/crystal/Initialize() + . = ..() icon_state = pick("ano70","ano80") @@ -14,7 +15,6 @@ "It seems to draw you inward as you look it at.", "Something twinkles faintly as you look at it.", "It's mesmerizing to behold.") - . = ..() /obj/structure/crystal/Destroy() src.visible_message(span_bolddanger("[src] shatters!")) diff --git a/code/modules/xenoarcheaology/boulder.dm b/code/modules/xenoarcheaology/boulder.dm index 6a88f69c11..bfc9d6e0fc 100644 --- a/code/modules/xenoarcheaology/boulder.dm +++ b/code/modules/xenoarcheaology/boulder.dm @@ -12,9 +12,9 @@ var/last_act = 0 /obj/structure/boulder/Initialize() + . = ..() icon_state = "boulder[rand(1,4)]" excavation_level = rand(5, 50) - . = ..() /obj/structure/boulder/attackby(var/obj/item/I, var/mob/user) if(istype(I, /obj/item/core_sampler)) diff --git a/code/modules/xenoarcheaology/sampling.dm b/code/modules/xenoarcheaology/sampling.dm index 7862672427..ff3e1df5c0 100644 --- a/code/modules/xenoarcheaology/sampling.dm +++ b/code/modules/xenoarcheaology/sampling.dm @@ -9,9 +9,9 @@ var/datum/geosample/geological_data /obj/item/rocksliver/Initialize() + . = ..() icon_state = "sliver[rand(1, 3)]" randpixel_xy() - . = ..() /datum/geosample var/age = 0 diff --git a/maps/tether/tether_turfs.dm b/maps/tether/tether_turfs.dm index cda1ebdb95..743bd52c7d 100644 --- a/maps/tether/tether_turfs.dm +++ b/maps/tether/tether_turfs.dm @@ -167,6 +167,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) name = "bluespace" icon = 'icons/turf/space_vr.dmi' icon_state = "bluespace" + /turf/space/bluespace/Initialize() icon = 'icons/turf/space_vr.dmi' icon_state = "bluespace" @@ -177,9 +178,10 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) name = "sand transit" icon = 'icons/turf/transit_vr.dmi' icon_state = "desert_ns" + /turf/space/sandyscroll/Initialize() - icon_state = "desert_ns" . = ..() + icon_state = "desert_ns" //Sky stuff! // A simple turf to fake the appearance of flying.