From de0d93467ec65a93906f7d6589f975bbf9f524fc Mon Sep 17 00:00:00 2001 From: FrozenGuy5 Date: Sat, 11 Nov 2017 20:58:15 +0000 Subject: [PATCH] Adds alot of initialize() in lots of files --- .../kitchen_machinery/juicer.dm | 36 +++++++++---------- code/modules/food_and_drinks/pizzabox.dm | 24 ++++++------- code/modules/games/cards.dm | 2 +- code/modules/games/cas.dm | 4 +-- code/modules/holiday/easter.dm | 4 +-- code/modules/holodeck/items.dm | 12 +++---- code/modules/hydroponics/beekeeping/beebox.dm | 8 ++--- .../hydroponics/beekeeping/honeycomb.dm | 4 +-- code/modules/hydroponics/gene_modder.dm | 4 +-- code/modules/hydroponics/grown/random.dm | 4 +-- code/modules/hydroponics/sample.dm | 4 +-- code/modules/library/lib_items.dm | 12 +++---- code/modules/mining/abandoned_crates.dm | 4 +-- .../modules/mining/equipment/explorer_gear.dm | 4 +-- code/modules/mining/lavaland/ash_flora.dm | 8 ++--- code/modules/mining/machine_vending.dm | 4 +-- code/modules/mining/mine_items.dm | 4 +-- code/modules/mining/money_bag.dm | 4 +-- .../modules/mob/living/carbon/alien/organs.dm | 4 +-- .../mob/living/silicon/robot/robot_modules.dm | 4 +-- .../living/simple_animal/bot/construction.dm | 4 +-- .../friendly/drone/drones_as_items.dm | 4 +-- .../hostile/mining_mobs/gutlunch.dm | 2 +- .../simple_animal/hostile/venus_human_trap.dm | 4 +-- .../computers/item/laptop_presets.dm | 2 +- .../computers/item/tablet_presets.dm | 6 ++-- .../modular_computers/hardware/hard_drive.dm | 4 +-- code/modules/ninja/suit/suit.dm | 4 +-- code/modules/paperwork/filingcabinet.dm | 2 +- code/modules/paperwork/paper_cutter.dm | 8 ++--- code/modules/paperwork/pen.dm | 4 +-- code/modules/power/cell.dm | 32 ++++++++--------- code/modules/power/lighting.dm | 16 ++++----- 33 files changed, 123 insertions(+), 123 deletions(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm index 0e6a7e90340..d8201b9d69d 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm @@ -166,22 +166,22 @@ if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) break -/obj/structure/closet/crate/juice/New() - ..() - new/obj/machinery/juicer(src) - new/obj/item/reagent_containers/food/snacks/grown/tomato(src) - new/obj/item/reagent_containers/food/snacks/grown/carrot(src) - new/obj/item/reagent_containers/food/snacks/grown/berries(src) - new/obj/item/reagent_containers/food/snacks/grown/banana(src) - new/obj/item/reagent_containers/food/snacks/grown/grapes(src) - new/obj/item/reagent_containers/food/snacks/grown/tomato(src) - new/obj/item/reagent_containers/food/snacks/grown/carrot(src) - new/obj/item/reagent_containers/food/snacks/grown/berries(src) - new/obj/item/reagent_containers/food/snacks/grown/banana(src) - new/obj/item/reagent_containers/food/snacks/grown/grapes(src) - new/obj/item/reagent_containers/food/snacks/grown/tomato(src) - new/obj/item/reagent_containers/food/snacks/grown/carrot(src) - new/obj/item/reagent_containers/food/snacks/grown/berries(src) - new/obj/item/reagent_containers/food/snacks/grown/banana(src) - new/obj/item/reagent_containers/food/snacks/grown/grapes(src) +/obj/structure/closet/crate/juice/Initialize() + . = ..() + new /obj/machinery/juicer(src) + new /obj/item/reagent_containers/food/snacks/grown/tomato(src) + new /obj/item/reagent_containers/food/snacks/grown/carrot(src) + new /obj/item/reagent_containers/food/snacks/grown/berries(src) + new /obj/item/reagent_containers/food/snacks/grown/banana(src) + new /obj/item/reagent_containers/food/snacks/grown/grapes(src) + new /obj/item/reagent_containers/food/snacks/grown/tomato(src) + new /obj/item/reagent_containers/food/snacks/grown/carrot(src) + new /obj/item/reagent_containers/food/snacks/grown/berries(src) + new /obj/item/reagent_containers/food/snacks/grown/banana(src) + new /obj/item/reagent_containers/food/snacks/grown/grapes(src) + new /obj/item/reagent_containers/food/snacks/grown/tomato(src) + new /obj/item/reagent_containers/food/snacks/grown/carrot(src) + new /obj/item/reagent_containers/food/snacks/grown/berries(src) + new /obj/item/reagent_containers/food/snacks/grown/banana(src) + new /obj/item/reagent_containers/food/snacks/grown/grapes(src) diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm index 6788d1fc924..58a4f322b37 100644 --- a/code/modules/food_and_drinks/pizzabox.dm +++ b/code/modules/food_and_drinks/pizzabox.dm @@ -30,9 +30,9 @@ var/const/BOMB_TIMER_MIN = 1 var/const/BOMB_TIMER_MAX = 10 -/obj/item/pizzabox/New() +/obj/item/pizzabox/Initialize() update_icon() - ..() + . = ..() /obj/item/pizzabox/Destroy() unprocess() @@ -259,29 +259,29 @@ wires = null update_icon() -/obj/item/pizzabox/bomb/New() +/obj/item/pizzabox/bomb/Initialize() var/randompizza = pick(subtypesof(/obj/item/reagent_containers/food/snacks/pizza)) pizza = new randompizza(src) bomb = new(src) wires = new /datum/wires/explosive/pizza(src) - ..() + . = ..() -/obj/item/pizzabox/margherita/New() +/obj/item/pizzabox/margherita/Initialize() pizza = new /obj/item/reagent_containers/food/snacks/pizza/margherita(src) boxtag = "Margherita Deluxe" - ..() + . = ..() -/obj/item/pizzabox/vegetable/New() +/obj/item/pizzabox/vegetable/Initialize() pizza = new /obj/item/reagent_containers/food/snacks/pizza/vegetable(src) boxtag = "Gourmet Vegatable" - ..() + . = ..() -/obj/item/pizzabox/mushroom/New() +/obj/item/pizzabox/mushroom/Initialize() pizza = new /obj/item/reagent_containers/food/snacks/pizza/mushroom(src) boxtag = "Mushroom Special" - ..() + . = ..() -/obj/item/pizzabox/meat/New() +/obj/item/pizzabox/meat/Initialize() pizza = new /obj/item/reagent_containers/food/snacks/pizza/meat(src) boxtag = "Meatlover's Supreme" - ..() + . = ..() diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 89f63162973..babfb37940b 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -16,7 +16,7 @@ var/list/cards = list() -/obj/item/deck/New() +/obj/item/deck/Initialize() . = ..() var/cardcolor diff --git a/code/modules/games/cas.dm b/code/modules/games/cas.dm index ecdc1a641fb..abc2c6d749a 100644 --- a/code/modules/games/cas.dm +++ b/code/modules/games/cas.dm @@ -27,7 +27,7 @@ decksize = 50 card_text_file = "strings/cas_black.txt" -/obj/item/toy/cards/deck/cas/New() +/obj/item/toy/cards/deck/cas/Initialize() var/static/list/cards_against_space = list("cas_white" = world.file2list("strings/cas_white.txt"),"cas_black" = world.file2list("strings/cas_black.txt")) allcards = cards_against_space[card_face] var/list/possiblecards = allcards.Copy() @@ -52,7 +52,7 @@ P.card_icon = "cas_white" cards += P shuffle_inplace(cards) // distribute blank cards throughout deck - ..() + . = ..() /obj/item/toy/cards/deck/cas/attack_hand(mob/user) if(user.lying) diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 24f674219ee..f8044c6fe33 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -109,8 +109,8 @@ /obj/item/reagent_containers/food/snacks/egg/loaded containsPrize = TRUE -/obj/item/reagent_containers/food/snacks/egg/loaded/New() - ..() +/obj/item/reagent_containers/food/snacks/egg/loaded/Initialize() + . = ..() var/eggcolor = pick("blue","green","mime","orange","purple","rainbow","red","yellow") icon_state = "egg-[eggcolor]" item_color = "[eggcolor]" diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm index 54384753d73..cc8f00daf1d 100644 --- a/code/modules/holodeck/items.dm +++ b/code/modules/holodeck/items.dm @@ -25,13 +25,13 @@ armour_penetration = 50 var/active = 0 -/obj/item/holo/esword/green/New() - ..() +/obj/item/holo/esword/green/Initialize() + . = ..() item_color = "green" -/obj/item/holo/esword/red/New() - ..() +/obj/item/holo/esword/red/Initialize() + . = ..() item_color = "red" /obj/item/holo/esword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) @@ -42,9 +42,9 @@ /obj/item/holo/esword/attack(target as mob, mob/user as mob) ..() -/obj/item/holo/esword/New() +/obj/item/holo/esword/Initialize() item_color = pick("red","blue","green","purple") - ..() + . = ..() /obj/item/holo/esword/attack_self(mob/living/user as mob) active = !active diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm index fe24737cb89..fe8f1f3e2f3 100644 --- a/code/modules/hydroponics/beekeeping/beebox.dm +++ b/code/modules/hydroponics/beekeeping/beebox.dm @@ -37,8 +37,8 @@ var/bee_resources = 0 -/obj/structure/beebox/New() - ..() +/obj/structure/beebox/Initialize() + . = ..() START_PROCESSING(SSobj, src) @@ -55,8 +55,8 @@ var/random_reagent = FALSE -/obj/structure/beebox/premade/New() - ..() +/obj/structure/beebox/premade/Initialize() + . = ..() icon_state = "beebox" var/datum/reagent/R = null diff --git a/code/modules/hydroponics/beekeeping/honeycomb.dm b/code/modules/hydroponics/beekeeping/honeycomb.dm index 01609f67b16..d687b6fc090 100644 --- a/code/modules/hydroponics/beekeeping/honeycomb.dm +++ b/code/modules/hydroponics/beekeeping/honeycomb.dm @@ -12,8 +12,8 @@ list_reagents = list("honey" = 5) var/honey_color = "" -/obj/item/reagent_containers/honeycomb/New() - ..() +/obj/item/reagent_containers/honeycomb/Initialize() + . = ..() pixel_x = rand(8,-8) pixel_y = rand(8,-8) update_icon() diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm index bd0215138aa..86a3b9e6f60 100644 --- a/code/modules/hydroponics/gene_modder.dm +++ b/code/modules/hydroponics/gene_modder.dm @@ -422,8 +422,8 @@ var/read_only = 0 //Well, it's still a floppy disk unique_rename = 1 -/obj/item/disk/plantgene/New() - ..() +/obj/item/disk/plantgene/Initialize() + . = ..() add_overlay("datadisk_gene") src.pixel_x = rand(-5, 5) src.pixel_y = rand(-5, 5) diff --git a/code/modules/hydroponics/grown/random.dm b/code/modules/hydroponics/grown/random.dm index 4ba2451a5aa..ba67f21d716 100644 --- a/code/modules/hydroponics/grown/random.dm +++ b/code/modules/hydroponics/grown/random.dm @@ -12,9 +12,9 @@ icon_harvest = "xpod-harvest" growthstages = 4 -/obj/item/seeds/random/New() +/obj/item/seeds/random/Initialize() randomize_stats() - ..() + . = ..() if(prob(60)) add_random_reagents() if(prob(50)) diff --git a/code/modules/hydroponics/sample.dm b/code/modules/hydroponics/sample.dm index 52c2e1052fe..fff4c646ac8 100644 --- a/code/modules/hydroponics/sample.dm +++ b/code/modules/hydroponics/sample.dm @@ -5,8 +5,8 @@ yield = -1 var/sample_color = "#FFFFFF" -/obj/item/seeds/sample/New() - ..() +/obj/item/seeds/sample/Initialize() + . = ..() if(sample_color) var/mutable_appearance/filling = mutable_appearance(icon, "sample-filling") filling.color = sample_color diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 711ac4f33af..84198d6fe35 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -144,8 +144,8 @@ /obj/structure/bookcase/manuals/medical name = "medical manuals bookcase" -/obj/structure/bookcase/manuals/medical/New() - ..() +/obj/structure/bookcase/manuals/medical/Initialize() + . = ..() new /obj/item/book/manual/medical_cloning(src) update_icon() @@ -153,8 +153,8 @@ /obj/structure/bookcase/manuals/engineering name = "engineering manuals bookcase" -/obj/structure/bookcase/manuals/engineering/New() - ..() +/obj/structure/bookcase/manuals/engineering/Initialize() + . = ..() new /obj/item/book/manual/wiki/engineering_construction(src) new /obj/item/book/manual/engineering_particle_accelerator(src) new /obj/item/book/manual/wiki/engineering_hacking(src) @@ -167,8 +167,8 @@ /obj/structure/bookcase/manuals/research_and_development name = "\improper R&D manuals bookcase" -/obj/structure/bookcase/manuals/research_and_development/New() - ..() +/obj/structure/bookcase/manuals/research_and_development/Initialize() + . = ..() new /obj/item/book/manual/research_and_development(src) update_icon() diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index 6c445c9ceb7..5e7265f0430 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -11,8 +11,8 @@ var/codelen = 4 tamperproof = 90 -/obj/structure/closet/crate/secure/loot/New() - ..() +/obj/structure/closet/crate/secure/loot/Initialize() + . = ..() var/list/digits = list("1", "2", "3", "4", "5", "6", "7", "8", "9", "0") code = "" for(var/i = 0, i < codelen, i++) diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index f2cdefa9a44..729665034ef 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -43,8 +43,8 @@ ..() w_class = mask_adjusted ? WEIGHT_CLASS_NORMAL : WEIGHT_CLASS_SMALL -/obj/item/clothing/mask/gas/explorer/folded/New() - ..() +/obj/item/clothing/mask/gas/explorer/folded/Initialize() + . = ..() adjustmask() /obj/item/clothing/suit/space/hostile_environment diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 6d6587a73ad..781157081c1 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -20,8 +20,8 @@ var/regrowth_time_low = 4800 var/regrowth_time_high = 8400 -/obj/structure/flora/ash/New() - ..() +/obj/structure/flora/ash/Initialize() + . = ..() base_icon = "[icon_state][rand(1, 4)]" icon_state = base_icon if(prob(15)) @@ -161,8 +161,8 @@ max_integrity = 100 seed = /obj/item/seeds/lavaland/polypore -/obj/item/reagent_containers/food/snacks/grown/ash_flora/New() - ..() +/obj/item/reagent_containers/food/snacks/grown/ash_flora/Initialize() + . = ..() pixel_x = rand(-4, 4) pixel_y = rand(-4, 4) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index cbf7dfd8265..6c288134432 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -279,8 +279,8 @@ name = "mining conscription kit" desc = "A kit containing everything a crewmember needs to support a shaft miner in the field." -/obj/item/storage/backpack/duffelbag/mining_conscript/New() - ..() +/obj/item/storage/backpack/duffelbag/mining_conscript/Initialize() + . = ..() new /obj/item/pickaxe/mini(src) new /obj/item/clothing/glasses/meson(src) new /obj/item/device/t_scanner/adv_mining_scanner/lesser(src) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 1bac6400dd0..f3553762b93 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -8,8 +8,8 @@ var/set_luminosity = 8 var/set_cap = 0 -/obj/effect/light_emitter/New() - ..() +/obj/effect/light_emitter/Initialize() + . = ..() set_light(set_luminosity, set_cap) /**********************Miner Lockers**************************/ diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm index f26fa931bec..9a2ee4c7592 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -14,8 +14,8 @@ can_hold = list(/obj/item/coin, /obj/item/stack/spacecash) -/obj/item/storage/bag/money/vault/New() - ..() +/obj/item/storage/bag/money/vault/Initialize() + . = ..() new /obj/item/coin/silver(src) new /obj/item/coin/silver(src) new /obj/item/coin/silver(src) diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index ae8eec5529b..e0967dbfa28 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -3,12 +3,12 @@ icon_state = "xgibmid2" var/list/alien_powers = list() -/obj/item/organ/alien/New() +/obj/item/organ/alien/Initialize() for(var/A in alien_powers) if(ispath(A)) alien_powers -= A alien_powers += new A(src) - ..() + . = ..() /obj/item/organ/alien/Insert(mob/living/carbon/M, special = 0) ..() diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index b6e584e9399..91fbb4504ca 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -34,8 +34,8 @@ var/ride_allow_incapacitated = FALSE var/allow_riding = TRUE -/obj/item/robot_module/New() - ..() +/obj/item/robot_module/Initialize() + . = ..() for(var/i in basic_modules) var/obj/item/I = new i(src) basic_modules += I diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm index 0ef926f942a..a4e8d09121d 100644 --- a/code/modules/mob/living/simple_animal/bot/construction.dm +++ b/code/modules/mob/living/simple_animal/bot/construction.dm @@ -282,8 +282,8 @@ var/skin = null //Same as medbot, set to tox or ointment for the respective kits. w_class = WEIGHT_CLASS_NORMAL -/obj/item/firstaid_arm_assembly/New() - ..() +/obj/item/firstaid_arm_assembly/Initialize() + . = ..() spawn(5) if(skin) add_overlay("kit_skin_[skin]") diff --git a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm index 99001337235..015dc0c856b 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm @@ -16,8 +16,8 @@ origin_tech = "programming=2;biotech=4" var/drone_type = /mob/living/simple_animal/drone //Type of drone that will be spawned -/obj/item/drone_shell/New() - ..() +/obj/item/drone_shell/Initialize() + . = ..() var/area/A = get_area(src) if(A) notify_ghosts("A drone shell has been created in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm index 04282d12fd8..a7de9e2f802 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm @@ -123,7 +123,7 @@ /obj/item/udder/gutlunch name = "nutrient sac" -/obj/item/udder/gutlunch/New() +/obj/item/udder/gutlunch/Initialize() reagents = new(50) reagents.my_atom = src diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm index 8355bd2e279..29bc2cbff0a 100644 --- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm +++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm @@ -12,8 +12,8 @@ var/growth_time = 1200 -/obj/structure/alien/resin/flower_bud_enemy/New() - ..() +/obj/structure/alien/resin/flower_bud_enemy/Initialize() + . = ..() var/list/anchors = list() anchors += locate(x-2,y+2,z) anchors += locate(x+2,y+2,z) diff --git a/code/modules/modular_computers/computers/item/laptop_presets.dm b/code/modules/modular_computers/computers/item/laptop_presets.dm index 78270fb0d9e..a1f5f7e37f0 100644 --- a/code/modules/modular_computers/computers/item/laptop_presets.dm +++ b/code/modules/modular_computers/computers/item/laptop_presets.dm @@ -1,4 +1,4 @@ -/obj/item/device/modular_computer/laptop/preset/New() +/obj/item/device/modular_computer/laptop/preset/Initialize() . = ..() install_component(new /obj/item/computer_hardware/processor_unit/small) install_component(new /obj/item/computer_hardware/battery(src, /obj/item/stock_parts/cell/computer)) diff --git a/code/modules/modular_computers/computers/item/tablet_presets.dm b/code/modules/modular_computers/computers/item/tablet_presets.dm index c8f9282380b..21080e593f8 100644 --- a/code/modules/modular_computers/computers/item/tablet_presets.dm +++ b/code/modules/modular_computers/computers/item/tablet_presets.dm @@ -3,7 +3,7 @@ /obj/item/device/modular_computer/tablet/preset/cheap desc = "A low-end tablet often seen among low ranked station personnel." -/obj/item/device/modular_computer/tablet/preset/cheap/New() +/obj/item/device/modular_computer/tablet/preset/cheap/Initialize() . = ..() install_component(new /obj/item/computer_hardware/processor_unit/small) install_component(new /obj/item/computer_hardware/battery(src, /obj/item/stock_parts/cell/computer/micro)) @@ -11,7 +11,7 @@ install_component(new /obj/item/computer_hardware/network_card) // Alternative version, an average one, for higher ranked positions mostly -/obj/item/device/modular_computer/tablet/preset/advanced/New() +/obj/item/device/modular_computer/tablet/preset/advanced/Initialize() . = ..() install_component(new /obj/item/computer_hardware/processor_unit/small) install_component(new /obj/item/computer_hardware/battery(src, /obj/item/stock_parts/cell/computer)) @@ -20,7 +20,7 @@ install_component(new /obj/item/computer_hardware/card_slot) install_component(new /obj/item/computer_hardware/printer/mini) -/obj/item/device/modular_computer/tablet/preset/cargo/New() +/obj/item/device/modular_computer/tablet/preset/cargo/Initialize() . = ..() install_component(new /obj/item/computer_hardware/processor_unit/small) install_component(new /obj/item/computer_hardware/battery(src, /obj/item/stock_parts/cell/computer)) diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm index 2ad1caa951e..ff834071b92 100644 --- a/code/modules/modular_computers/hardware/hard_drive.dm +++ b/code/modules/modular_computers/hardware/hard_drive.dm @@ -121,9 +121,9 @@ stored_files = null return ..() -/obj/item/computer_hardware/hard_drive/New() +/obj/item/computer_hardware/hard_drive/Initialize() install_default_programs() - ..() + . = ..() /obj/item/computer_hardware/hard_drive/advanced diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm index d449396b669..00be3a3cd9e 100644 --- a/code/modules/ninja/suit/suit.dm +++ b/code/modules/ninja/suit/suit.dm @@ -58,8 +58,8 @@ Contents: /obj/item/clothing/suit/space/space_ninja/get_cell() return cell -/obj/item/clothing/suit/space/space_ninja/New() - ..() +/obj/item/clothing/suit/space/space_ninja/Initialize() + . = ..() //Spark Init spark_system = new() diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 3089360a0ea..ca807604bf8 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -185,7 +185,7 @@ GLOBAL_LIST_EMPTY(employmentCabinets) icon_state = "employmentcabinet" var/virgin = 1 -/obj/structure/filingcabinet/employment/New() +/obj/structure/filingcabinet/employment/Initialize() GLOB.employmentCabinets += src return ..() diff --git a/code/modules/paperwork/paper_cutter.dm b/code/modules/paperwork/paper_cutter.dm index 4a85d03df76..64585556434 100644 --- a/code/modules/paperwork/paper_cutter.dm +++ b/code/modules/paperwork/paper_cutter.dm @@ -12,8 +12,8 @@ pass_flags = PASSTABLE -/obj/item/papercutter/New() - ..() +/obj/item/papercutter/Initialize() + . = ..() storedcutter = new /obj/item/hatchet/cutterblade(src) update_icon() @@ -111,8 +111,8 @@ resistance_flags = FLAMMABLE max_integrity = 50 -/obj/item/paperslip/New() - ..() +/obj/item/paperslip/Initialize() + . = ..() pixel_x = rand(-5, 5) pixel_y = rand(-5, 5) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 4b31ce72620..081c816bd03 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -181,12 +181,12 @@ reagents.trans_to(M, reagents.total_volume) -/obj/item/pen/sleepy/New() +/obj/item/pen/sleepy/Initialize() create_reagents(45) reagents.add_reagent("chloralhydrate2", 20) reagents.add_reagent("mutetoxin", 15) reagents.add_reagent("tirizene", 10) - ..() + . = ..() /* * (Alan) Edaggers diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 58f370f00a4..e9b7146dac6 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -24,8 +24,8 @@ /obj/item/stock_parts/cell/get_cell() return src -/obj/item/stock_parts/cell/New() - ..() +/obj/item/stock_parts/cell/Initialize() + . = ..() START_PROCESSING(SSobj, src) charge = maxcharge if(ratingdesc) @@ -172,8 +172,8 @@ materials = list(MAT_GLASS=40) rating = 2 -/obj/item/stock_parts/cell/crap/empty/New() - ..() +/obj/item/stock_parts/cell/crap/empty/Initialize() + . = ..() charge = 0 /obj/item/stock_parts/cell/upgraded @@ -196,8 +196,8 @@ materials = list(MAT_GLASS=40) rating = 2.5 -/obj/item/stock_parts/cell/secborg/empty/New() - ..() +/obj/item/stock_parts/cell/secborg/empty/Initialize() + . = ..() charge = 0 /obj/item/stock_parts/cell/pulse //200 pulse shots @@ -230,8 +230,8 @@ maxcharge = 15000 chargerate = 2250 -/obj/item/stock_parts/cell/high/empty/New() - ..() +/obj/item/stock_parts/cell/high/empty/Initialize() + . = ..() charge = 0 /obj/item/stock_parts/cell/super @@ -243,8 +243,8 @@ rating = 4 chargerate = 2000 -/obj/item/stock_parts/cell/super/empty/New() - ..() +/obj/item/stock_parts/cell/super/empty/Initialize() + . = ..() charge = 0 /obj/item/stock_parts/cell/hyper @@ -256,8 +256,8 @@ rating = 5 chargerate = 3000 -/obj/item/stock_parts/cell/hyper/empty/New() - ..() +/obj/item/stock_parts/cell/hyper/empty/Initialize() + . = ..() charge = 0 /obj/item/stock_parts/cell/bluespace @@ -270,8 +270,8 @@ rating = 6 chargerate = 4000 -/obj/item/stock_parts/cell/bluespace/empty/New() - ..() +/obj/item/stock_parts/cell/bluespace/empty/Initialize() + . = ..() charge = 0 /obj/item/stock_parts/cell/infinite @@ -327,8 +327,8 @@ maxcharge = 500 rating = 2 -/obj/item/stock_parts/cell/emproof/empty/New() - ..() +/obj/item/stock_parts/cell/emproof/empty/Initialize() + . = ..() charge = 0 /obj/item/stock_parts/cell/emproof/emp_act(severity) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 98fb2ed2337..1988491c8e2 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -193,23 +193,23 @@ /obj/machinery/light/built icon_state = "tube-empty" -/obj/machinery/light/built/New() +/obj/machinery/light/built/Initialize() status = LIGHT_EMPTY update(0) - ..() + . = ..() /obj/machinery/light/small/built icon_state = "bulb-empty" -/obj/machinery/light/small/built/New() +/obj/machinery/light/small/built/Initialize() status = LIGHT_EMPTY update(0) - ..() + . = ..() // create a new lighting fixture -/obj/machinery/light/New() - ..() +/obj/machinery/light/Initialize() + . = ..() spawn(2) switch(fitting) if("tube") @@ -625,8 +625,8 @@ desc = "A broken [name]." -/obj/item/light/New() - ..() +/obj/item/light/Initialize() + . = ..() update()