diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index 7f2f509d01..c848a2f1df 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -157,7 +157,7 @@ if(co != null) carbon_amt = co ..() -/obj/effect/spawner/newbomb/New(newloc) +/obj/effect/spawner/newbomb/Initialize(newloc) ..(newloc) var/obj/item/device/transfer_valve/V = new(src.loc) diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 736d2919ff..9200d58820 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -83,7 +83,7 @@ icon_state = "jetpack-void" item_state_slots = list(slot_r_hand_str = "jetpack-void", slot_l_hand_str = "jetpack-void") -/obj/item/weapon/tank/jetpack/void/New() +/obj/item/weapon/tank/jetpack/void/Initialize() ..() air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) return @@ -94,7 +94,7 @@ icon_state = "jetpack" item_state_slots = list(slot_r_hand_str = "jetpack", slot_l_hand_str = "jetpack") -/obj/item/weapon/tank/jetpack/oxygen/New() +/obj/item/weapon/tank/jetpack/oxygen/Initialize() ..() air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) return @@ -106,7 +106,7 @@ icon_state = "jetpack-black" item_state_slots = list(slot_r_hand_str = "jetpack-black", slot_l_hand_str = "jetpack-black") -/obj/item/weapon/tank/jetpack/carbondioxide/New() +/obj/item/weapon/tank/jetpack/carbondioxide/Initialize() ..() air_contents.adjust_gas("carbon_dioxide", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) return diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index 60d748ff18..1c0071e47e 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -31,7 +31,7 @@ icon_state = "space_mountain_wind" center_of_mass = list("x"=16, "y"=10) -/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind/New() +/obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind/Initialize() ..() reagents.add_reagent("spacemountainwind", 30) @@ -51,7 +51,7 @@ icon_state = "dr_gibb" center_of_mass = list("x"=16, "y"=10) -/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb/New() +/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb/Initialize() ..() reagents.add_reagent("dr_gibb", 30) @@ -71,7 +71,7 @@ icon_state = "space-up" center_of_mass = list("x"=16, "y"=10) -/obj/item/weapon/reagent_containers/food/drinks/cans/space_up/New() +/obj/item/weapon/reagent_containers/food/drinks/cans/space_up/Initialize() ..() reagents.add_reagent("space_up", 30) @@ -81,7 +81,7 @@ icon_state = "lemon-lime" center_of_mass = list("x"=16, "y"=10) -/obj/item/weapon/reagent_containers/food/drinks/cans/lemon_lime/New() +/obj/item/weapon/reagent_containers/food/drinks/cans/lemon_lime/Initialize() ..() reagents.add_reagent("lemon_lime", 30) @@ -91,7 +91,7 @@ icon_state = "ice_tea_can" center_of_mass = list("x"=16, "y"=10) -/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea/New() +/obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea/Initialize() ..() reagents.add_reagent("icetea", 30) @@ -101,7 +101,7 @@ icon_state = "purple_can" center_of_mass = list("x"=16, "y"=10) -/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice/New() +/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice/Initialize() ..() reagents.add_reagent("grapejuice", 30) diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index 14a0fbd16e..e86539c427 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -189,7 +189,7 @@ item_state = "coffee" center_of_mass = list("x"=15, "y"=13) -/obj/item/weapon/reagent_containers/food/drinks/h_chocolate/New() +/obj/item/weapon/reagent_containers/food/drinks/h_chocolate/Initialize() ..() reagents.add_reagent("hot_coco", 30) @@ -198,7 +198,7 @@ desc = "Just add 10ml water, self heats! A taste that reminds you of your school years." icon_state = "ramen" center_of_mass = list("x"=16, "y"=11) -/obj/item/weapon/reagent_containers/food/drinks/dry_ramen/New() +/obj/item/weapon/reagent_containers/food/drinks/dry_ramen/Initialize() ..() reagents.add_reagent("dry_ramen", 30) diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm index d75f763cbe..423c7ee6d8 100644 --- a/code/modules/food/food/drinks/bottle.dm +++ b/code/modules/food/food/drinks/bottle.dm @@ -383,7 +383,7 @@ icon_state = "space-up_bottle" center_of_mass = list("x"=16, "y"=6) -/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up/New() +/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up/Initialize() ..() reagents.add_reagent("space_up", 100) @@ -393,7 +393,7 @@ icon_state = "space_mountain_wind_bottle" center_of_mass = list("x"=16, "y"=6) -/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind/New() +/obj/item/weapon/reagent_containers/food/drinks/bottle/space_mountain_wind/Initialize() ..() reagents.add_reagent("spacemountainwind", 100) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index a8900b911e..57d237ee5e 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -328,7 +328,7 @@ nutriment_amt = 4 nutriment_desc = list("candy corn" = 4) -/obj/item/weapon/reagent_containers/food/snacks/candy_corn/New() +/obj/item/weapon/reagent_containers/food/snacks/candy_corn/Initialize() ..() reagents.add_reagent("sugar", 2) bitesize = 2 @@ -1159,7 +1159,7 @@ nutriment_amt = 5 nutriment_desc = list("sweetness" = 3, "mushroom" = 3, "pie" = 2) -/obj/item/weapon/reagent_containers/food/snacks/amanita_pie/New() +/obj/item/weapon/reagent_containers/food/snacks/amanita_pie/Initialize() ..() reagents.add_reagent("amatoxin", 3) reagents.add_reagent("psilocybin", 1) @@ -1174,7 +1174,7 @@ nutriment_amt = 8 nutriment_desc = list("heartiness" = 2, "mushroom" = 3, "pie" = 3) -/obj/item/weapon/reagent_containers/food/snacks/plump_pie/New() +/obj/item/weapon/reagent_containers/food/snacks/plump_pie/Initialize() ..() if(prob(10)) name = "exceptional plump pie" @@ -1300,7 +1300,7 @@ filling_color = "#631212" center_of_mass = list("x"=15, "y"=9) -/obj/item/weapon/reagent_containers/food/snacks/sosjerky/New() +/obj/item/weapon/reagent_containers/food/snacks/sosjerky/Initialize() ..() reagents.add_reagent("protein", 4) bitesize = 2 @@ -1315,7 +1315,7 @@ nutriment_amt = 6 nutriment_desc = list("dried raisins" = 6) -/obj/item/weapon/reagent_containers/food/snacks/no_raisin/New() +/obj/item/weapon/reagent_containers/food/snacks/no_raisin/Initialize() ..() reagents.add_reagent("nutriment", 6) @@ -3595,7 +3595,7 @@ filling_color = "#631212" center_of_mass = list("x"=15, "y"=9) -/obj/item/weapon/reagent_containers/food/snacks/unajerky/New() +/obj/item/weapon/reagent_containers/food/snacks/unajerky/Initialize() ..() reagents.add_reagent("protein", 8) reagents.add_reagent("capsaicin", 2) diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm index 0eadc9b27c..5d4cd86e1c 100644 --- a/code/modules/mob/living/carbon/human/human_species.dm +++ b/code/modules/mob/living/carbon/human/human_species.dm @@ -36,7 +36,7 @@ /mob/living/carbon/human/promethean/Initialize(var/new_loc) return ..(new_loc, SPECIES_PROMETHEAN) -/mob/living/carbon/human/zaddat/New(var/new_loc) +/mob/living/carbon/human/zaddat/Initialize(var/new_loc) return ..(new_loc, SPECIES_ZADDAT) /mob/living/carbon/human/monkey/Initialize(var/new_loc)