diff --git a/code/game/objects/effects/prop/snake.dm b/code/game/objects/effects/prop/snake.dm index 2b3812ccc9..91503042bf 100644 --- a/code/game/objects/effects/prop/snake.dm +++ b/code/game/objects/effects/prop/snake.dm @@ -22,15 +22,14 @@ // Is the snake hunting a specific atom? (Will always try to meander toward this target.) var/atom/hunting -/obj/effect/temporary_effect/pulse/snake/New(var/turf/T, var/atom/hunt_target, var/atom/Creator) +/obj/effect/temporary_effect/pulse/snake/Initialize(mapload, var/atom/hunt_target, var/atom/Creator) + . = ..() if(hunt_target) hunting = hunt_target if(Creator) creator = Creator - ..() - /obj/effect/temporary_effect/pulse/snake/pulse_loop() // Override needed unfortunately to handle the possibility of not finding a target turf. set waitfor = FALSE diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index fd4ed0af80..ebd610e3fb 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -104,9 +104,9 @@ START_PROCESSING(SSobj, src) return ..() -/obj/effect/spider/eggcluster/New(var/location, var/atom/parent) +/obj/effect/spider/eggcluster/Initialize(mapload, var/atom/parent) + . = ..() get_light_and_color(parent) - ..() /obj/effect/spider/eggcluster/Destroy() STOP_PROCESSING(SSobj, src) @@ -169,8 +169,8 @@ /mob/living/simple_mob/animal/giant_spider/webslinger, /mob/living/simple_mob/animal/giant_spider/phorogenic, /mob/living/simple_mob/animal/giant_spider/carrier, /mob/living/simple_mob/animal/giant_spider/ion) -/obj/effect/spider/spiderling/New(var/location, var/atom/parent) - ..() +/obj/effect/spider/spiderling/Initialize(mapload, var/atom/parent) + . = ..() pixel_x = rand(6,-6) pixel_y = rand(6,-6) START_PROCESSING(SSobj, src) @@ -300,8 +300,8 @@ desc = "There's a special aura about this one." grow_as = list(/mob/living/simple_mob/animal/giant_spider/nurse/queen) -/obj/effect/spider/spiderling/princess/New(var/location, var/atom/parent) - ..() +/obj/effect/spider/spiderling/princess/Initialize(mapload, var/atom/parent) + . = ..() amount_grown = 50 /obj/effect/decal/cleanable/spiderling_remains @@ -316,8 +316,9 @@ icon_state = "cocoon1" health = 15 -/obj/effect/spider/cocoon/New() - icon_state = pick("cocoon1","cocoon2","cocoon3") +/obj/effect/spider/cocoon/Initialize(mapload) + . = ..() + icon_state = pick("cocoon1","cocoon2","cocoon3") /obj/effect/spider/cocoon/Destroy() src.visible_message(span_warning("\The [src] splits open.")) diff --git a/code/game/objects/items/devices/ai_detector.dm b/code/game/objects/items/devices/ai_detector.dm index 33f2514b50..52efa85539 100644 --- a/code/game/objects/items/devices/ai_detector.dm +++ b/code/game/objects/items/devices/ai_detector.dm @@ -13,12 +13,12 @@ var/detect_state = PROXIMITY_NONE origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_ILLEGAL = 2) -/obj/item/multitool/ai_detector/New() +/obj/item/multitool/ai_detector/Initialize(mapload) + . = ..() // It's really really unlikely for the view range to change. But why not be futureproof anyways? range_alert = world.view range_warning = world.view * 2 START_PROCESSING(SSobj, src) - ..() /obj/item/multitool/ai_detector/Destroy() STOP_PROCESSING(SSobj, src) diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm index 3a827a8d99..30e72353a5 100644 --- a/code/game/objects/items/devices/defib.dm +++ b/code/game/objects/items/devices/defib.dm @@ -593,9 +593,9 @@ /obj/item/shockpaddles/linked var/obj/item/defib_kit/base_unit -/obj/item/shockpaddles/linked/New(newloc, obj/item/defib_kit/defib) +/obj/item/shockpaddles/linked/Initialize(mapload, obj/item/defib_kit/defib) + . = ..() base_unit = defib - ..(newloc) /obj/item/shockpaddles/linked/Destroy() if(base_unit) diff --git a/code/game/objects/items/devices/hacktool.dm b/code/game/objects/items/devices/hacktool.dm index 3545ff3486..0012e3f587 100644 --- a/code/game/objects/items/devices/hacktool.dm +++ b/code/game/objects/items/devices/hacktool.dm @@ -17,8 +17,8 @@ max_level = 5 full_override = TRUE -/obj/item/multitool/hacktool/New() - ..() +/obj/item/multitool/hacktool/Initialize(mapload) + . = ..() known_targets = list() max_known_targets = 5 + rand(1,3) supported_types = list(/obj/machinery/door/airlock,/obj/structure/closet/crate/secure,/obj/structure/closet/secure_closet) diff --git a/code/game/objects/items/devices/holowarrant.dm b/code/game/objects/items/devices/holowarrant.dm index 2d13b7ea2c..bb437153c4 100644 --- a/code/game/objects/items/devices/holowarrant.dm +++ b/code/game/objects/items/devices/holowarrant.dm @@ -118,7 +118,7 @@ name = "holowarrant devices" desc = "A box of holowarrant displays for security use." -/obj/item/storage/box/holowarrants/New() - ..() +/obj/item/storage/box/holowarrants/Initialize(mapload) + . = ..() for(var/i = 0 to 3) new /obj/item/holowarrant(src) // VOREStation addition ends diff --git a/code/game/objects/items/devices/personal_shield_generator_vr.dm b/code/game/objects/items/devices/personal_shield_generator_vr.dm index ae4dec50e7..5a22b82f1f 100644 --- a/code/game/objects/items/devices/personal_shield_generator_vr.dm +++ b/code/game/objects/items/devices/personal_shield_generator_vr.dm @@ -44,8 +44,8 @@ /obj/item/personal_shield_generator/get_cell() return bcell -/obj/item/personal_shield_generator/New() - ..() +/obj/item/personal_shield_generator/Initialize(mapload) + . = ..() if(ispath(bcell)) bcell = new bcell(src) @@ -402,8 +402,8 @@ var/cooldown = 0 var/busy = 0 -/obj/item/gun/energy/gun/generator/New(newloc, obj/item/personal_shield_generator/shield_gen) - ..(newloc) +/obj/item/gun/energy/gun/generator/Initialize(mapload, obj/item/personal_shield_generator/shield_gen) + . = ..() shield_generator = shield_gen power_supply = shield_generator.bcell diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index f2591d3cff..33e07f1bac 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -8,8 +8,8 @@ pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' -/obj/item/pipe_painter/New() - ..() +/obj/item/pipe_painter/Initialize(mapload) + . = ..() modes = new() for(var/C in pipe_colors) modes += "[C]" diff --git a/code/game/objects/items/devices/scanners/health.dm b/code/game/objects/items/devices/scanners/health.dm index d7bcabdd50..a72e9d8499 100644 --- a/code/game/objects/items/devices/scanners/health.dm +++ b/code/game/objects/items/devices/scanners/health.dm @@ -21,10 +21,10 @@ pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' -/obj/item/healthanalyzer/New() +/obj/item/healthanalyzer/Initialize(mapload) + . = ..() if(advscan >= 1) verbs += /obj/item/healthanalyzer/proc/toggle_adv - ..() /obj/item/healthanalyzer/examine(mob/user) . = ..() diff --git a/code/game/objects/items/devices/translocator_vr.dm b/code/game/objects/items/devices/translocator_vr.dm index 53aa520424..89d86fc8da 100644 --- a/code/game/objects/items/devices/translocator_vr.dm +++ b/code/game/objects/items/devices/translocator_vr.dm @@ -376,10 +376,7 @@ This device records all warnings given and teleport events for admin review in c var/creator var/warned_users = list() var/tele_network = null - -/obj/item/perfect_tele_beacon/New() - ..() - flags |= NOBLUDGEON + flags = NOBLUDGEON /obj/item/perfect_tele_beacon/Destroy() tele_name = null diff --git a/code/game/objects/items/devices/tvcamera.dm b/code/game/objects/items/devices/tvcamera.dm index aeb06fd95a..30aa888cfa 100644 --- a/code/game/objects/items/devices/tvcamera.dm +++ b/code/game/objects/items/devices/tvcamera.dm @@ -14,8 +14,8 @@ pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' -/obj/item/tvcamera/New() - ..() +/obj/item/tvcamera/Initialize(mapload) + . = ..() listening_objects += src /obj/item/tvcamera/Destroy() @@ -24,7 +24,7 @@ qdel(radio) camera = null radio = null - ..() + . = ..() /obj/item/tvcamera/examine() . = ..() diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm index 84fa9f8f70..d352e26daf 100644 --- a/code/game/objects/items/devices/uplink.dm +++ b/code/game/objects/items/devices/uplink.dm @@ -226,8 +226,8 @@ if(hidden_uplink) hidden_uplink.trigger(user) -/obj/item/multitool/uplink/New() - ..() +/obj/item/multitool/uplink/Initialize(mapload) + . = ..() hidden_uplink = new(src) /obj/item/multitool/uplink/attack_self(mob/user as mob) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 2d93e9c7bc..77a550ee3d 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -12,9 +12,6 @@ /obj/item/robot_parts/set_dir() return -/obj/item/robot_parts/New(var/newloc, var/model) - ..(newloc) - /obj/item/robot_parts/l_arm name = "cyborg left arm" desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case." @@ -71,9 +68,9 @@ var/obj/item/robot_parts/head/head = null var/created_name = "" -/obj/item/robot_parts/robot_suit/New() - ..() - src.update_icon() +/obj/item/robot_parts/robot_suit/Initialize(mapload) + . = ..() + update_icon() /obj/item/robot_parts/robot_suit/update_icon() cut_overlays() diff --git a/code/game/objects/items/toys/target_toy.dm b/code/game/objects/items/toys/target_toy.dm index 7b4d79aca3..e02445a293 100644 --- a/code/game/objects/items/toys/target_toy.dm +++ b/code/game/objects/items/toys/target_toy.dm @@ -8,5 +8,6 @@ /obj/item/paper/target name = "target notice" -/obj/item/paper/target/New() +/obj/item/paper/target/Initialize(mapload, text, title) + . = ..() info = "Your target is " + span_bold("[random_name(pick(MALE,FEMALE))]") + ". Make sure they don't get out of there alive." diff --git a/code/game/objects/items/toys/toys_vr.dm b/code/game/objects/items/toys/toys_vr.dm index fad6192fc6..68db2880df 100644 --- a/code/game/objects/items/toys/toys_vr.dm +++ b/code/game/objects/items/toys/toys_vr.dm @@ -718,8 +718,8 @@ var/bullets_left = 0 var/max_shots = 6 -/obj/item/toy/russian_revolver/New() - ..() +/obj/item/toy/russian_revolver/Initialize(mapload) + . = ..() spin_cylinder() /obj/item/toy/russian_revolver/attack_self(mob/user) @@ -780,8 +780,8 @@ max_shots = 1 var/fake_bullets = 0 -/obj/item/toy/russian_revolver/trick_revolver/New() - ..() +/obj/item/toy/russian_revolver/trick_revolver/Initialize(mapload) + . = ..() fake_bullets = rand(2, 7) /obj/item/toy/russian_revolver/trick_revolver/examine(mob/user) @@ -848,8 +848,8 @@ var/popped = 0 var/real = 0 -/obj/item/toy/snake_popper/New() - ..() +/obj/item/toy/snake_popper/Initialize(mapload) + . = ..() if(prob(0.1)) real = 1 diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 378ab6b450..64b4875685 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -11,15 +11,12 @@ matter = list(MAT_STEEL = 30) var/age = 0 -/obj/item/trash/New(var/newloc, var/_age) - ..(newloc) +/obj/item/trash/Initialize(mapload, var/_age) + . = ..() if(!isnull(_age)) age = _age - -/obj/item/trash/Initialize(mapload) if(!mapload || !CONFIG_GET(flag/persistence_ignore_mapload)) SSpersistence.track_value(src, /datum/persistent/filth/trash) - . = ..() /obj/item/trash/Destroy() SSpersistence.forget_value(src, /datum/persistent/filth/trash) diff --git a/code/game/objects/items/weapons/game_kit.dm b/code/game/objects/items/weapons/game_kit.dm index 1e038d316b..8571725bac 100644 --- a/code/game/objects/items/weapons/game_kit.dm +++ b/code/game/objects/items/weapons/game_kit.dm @@ -3,9 +3,9 @@ CONTAINS: THAT STUPID GAME KIT */ -/obj/item/game_kit/New() - src.board_stat = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" - src.selected = "CR" +/obj/item/game_kit + board_stat = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" + selected = "CR" /obj/item/game_kit/MouseDrop(mob/user as mob) if (user == usr && !user.restrained() && !user.stat && (user.contents.Find(src) || in_range(src, user))) diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index b120b35804..298ecbae5d 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -16,15 +16,14 @@ drop_sound = 'sound/items/drop/cardboardbox.ogg' pickup_sound = 'sound/items/pickup/cardboardbox.ogg' -/obj/item/a_gift/New() - ..() +/obj/item/a_gift/Initialize(mapload) + . = ..() pixel_x = rand(-10,10) pixel_y = rand(-10,10) if(w_class > 0 && w_class < ITEMSIZE_LARGE) icon_state = "gift[w_class]" else icon_state = "gift[pick(1, 2, 3)]" - return /obj/item/gift/attack_self(mob/user as mob) user.drop_item() diff --git a/code/game/objects/items/weapons/grenades/confetti.dm b/code/game/objects/items/weapons/grenades/confetti.dm index 4100d05155..ded0d83500 100644 --- a/code/game/objects/items/weapons/grenades/confetti.dm +++ b/code/game/objects/items/weapons/grenades/confetti.dm @@ -9,10 +9,10 @@ var/datum/effect/effect/system/confetti_spread var/confetti_strength = 8 -/obj/item/grenade/confetti/New() - ..() - src.confetti_spread = new /datum/effect/effect/system/confetti_spread() - src.confetti_spread.attach(src) +/obj/item/grenade/confetti/Initialize(mapload) + . = ..() + confetti_spread = new /datum/effect/effect/system/confetti_spread() + confetti_spread.attach(src) /obj/item/grenade/confetti/Destroy() qdel(confetti_spread) diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm index 66c9bb03d9..cd68ca3f3a 100644 --- a/code/game/objects/items/weapons/grenades/smokebomb.dm +++ b/code/game/objects/items/weapons/grenades/smokebomb.dm @@ -11,10 +11,10 @@ var/smoke_color var/smoke_strength = 8 -/obj/item/grenade/smokebomb/New() - ..() - src.smoke = new /datum/effect/effect/system/smoke_spread/bad() - src.smoke.attach(src) +/obj/item/grenade/smokebomb/Initialize(mapload) + . = ..() + smoke = new /datum/effect/effect/system/smoke_spread/bad() + smoke.attach(src) /obj/item/grenade/smokebomb/Destroy() qdel(smoke) diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 1a538acc30..4cf1ba8a8c 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -108,9 +108,9 @@ GLOBAL_LIST_BOILERPLATE(all_tracking_implants, /obj/item/implant/tracking) /obj/item/implant/tracking/weak //This is for the loadout degrade_time = 2.5 MINUTES -/obj/item/implant/tracking/New() +/obj/item/implant/tracking/Initialize(mapload, ...) + . = ..() id = rand(1, 1000) - ..() /obj/item/implant/tracking/post_implant(var/mob/source) START_PROCESSING(SSobj, src) diff --git a/code/game/objects/items/weapons/implants/implantcircuits.dm b/code/game/objects/items/weapons/implants/implantcircuits.dm index 51207ed2c7..199adf9f6d 100644 --- a/code/game/objects/items/weapons/implants/implantcircuits.dm +++ b/code/game/objects/items/weapons/implants/implantcircuits.dm @@ -8,15 +8,15 @@ /obj/item/implant/integrated_circuit/islegal() return TRUE -/obj/item/implant/integrated_circuit/New() - ..() +/obj/item/implant/integrated_circuit/Initialize(mapload) + . = ..() IC = new(src) IC.implant = src /obj/item/implant/integrated_circuit/Destroy() IC.implant = null qdel(IC) - ..() + . = ..() /obj/item/implant/integrated_circuit/get_data() var/dat = {" diff --git a/code/game/objects/items/weapons/implants/implanter_vr.dm b/code/game/objects/items/weapons/implants/implanter_vr.dm index a794761998..baf80a396c 100644 --- a/code/game/objects/items/weapons/implants/implanter_vr.dm +++ b/code/game/objects/items/weapons/implants/implanter_vr.dm @@ -3,8 +3,7 @@ /obj/item/implanter/vrlanguage name = "implanter-language" -/obj/item/implanter/vrlanguage/New() - src.imp = new /obj/item/implant/vrlanguage( src ) - ..() +/obj/item/implanter/vrlanguage/Initialize(mapload) + . = ..() + imp = new /obj/item/implant/vrlanguage( src ) update() - return diff --git a/code/game/objects/items/weapons/implants/implantuplink.dm b/code/game/objects/items/weapons/implants/implantuplink.dm index e142c5bbda..0dc76d444b 100644 --- a/code/game/objects/items/weapons/implants/implantuplink.dm +++ b/code/game/objects/items/weapons/implants/implantuplink.dm @@ -3,13 +3,12 @@ desc = "Summon things." var/activation_emote = "chuckle" -/obj/item/implant/uplink/New() +/obj/item/implant/uplink/Initialize(mapload) activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink") hidden_uplink = new(src) //hidden_uplink.uses = 5 //Code currently uses a mind var for telecrystals, balancing is currently an issue. Will investigate. - ..() - return + . = ..() /obj/item/implant/uplink/post_implant(mob/source) var/choices = list("blink", "blink_r", "eyebrow", "chuckle", "twitch", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink") @@ -22,4 +21,3 @@ /obj/item/implant/uplink/trigger(emote, mob/source as mob) if(hidden_uplink && usr == source) // Let's not have another people activate our uplink hidden_uplink.check_trigger(source, emote, activation_emote) - return diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 69a7ff4e98..7d2c2e5f68 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -11,9 +11,6 @@ item_state = "book15" author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned title = "Particle Accelerator User's Guide" - -/obj/item/book/manual/engineering_particle_accelerator/New() - ..() dat = {"