diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm index 89773fc856c..5d06873594c 100644 --- a/code/game/mecha/combat/durand.dm +++ b/code/game/mecha/combat/durand.dm @@ -21,8 +21,8 @@ ..() defense_action.Remove(user) -/obj/mecha/combat/durand/loaded/New() - ..() +/obj/mecha/combat/durand/loaded/Initialize(mapload) + . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index 34b58a972e4..89451a886d6 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -26,8 +26,8 @@ ..() overload_action.Remove(user) -/obj/mecha/combat/gygax/loaded/New() - ..() +/obj/mecha/combat/gygax/loaded/Initialize(mapload) + . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/disabler ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang @@ -58,8 +58,8 @@ . = ..() thrusters_action.Remove(user) -/obj/mecha/combat/gygax/dark/loaded/New() - ..() +/obj/mecha/combat/gygax/dark/loaded/Initialize(mapload) + . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm index 20a6fba2a39..52e1bc2e645 100644 --- a/code/game/mecha/combat/honker.dm +++ b/code/game/mecha/combat/honker.dm @@ -20,8 +20,8 @@ . = ..() AddComponent(/datum/component/squeak, list('sound/effects/clownstep1.ogg' = 1, 'sound/effects/clownstep2.ogg' = 1), 50, falloff_exponent = 20, squeak_on_move = TRUE) //die off quick please -/obj/mecha/combat/honker/loaded/New() - ..() +/obj/mecha/combat/honker/loaded/Initialize(mapload) + . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/honker ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index f1cb2ebf434..914e3ab3bc9 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -31,8 +31,8 @@ smoke_action.Remove(user) zoom_action.Remove(user) -/obj/mecha/combat/marauder/loaded/New() - ..() +/obj/mecha/combat/marauder/loaded/Initialize(mapload) + . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack @@ -56,8 +56,8 @@ wreckage = /obj/structure/mecha_wreckage/ares max_equip = 4 -/obj/mecha/combat/marauder/ares/loaded/New() - ..() +/obj/mecha/combat/marauder/ares/loaded/Initialize(mapload) + . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/xray(src) @@ -83,8 +83,8 @@ /obj/mecha/combat/marauder/seraph/add_cell() cell = new /obj/item/stock_parts/cell/bluespace(src) -/obj/mecha/combat/marauder/seraph/loaded/New() - ..()//Let it equip whatever is needed. +/obj/mecha/combat/marauder/seraph/loaded/Initialize(mapload) + . = ..() //Let it equip whatever is needed. var/obj/item/mecha_parts/mecha_equipment/ME if(equipment.len)//Now to remove it and equip anew. for(ME in equipment) @@ -113,8 +113,8 @@ wreckage = /obj/structure/mecha_wreckage/mauler starting_voice = /obj/item/mecha_modkit/voice/syndicate -/obj/mecha/combat/marauder/mauler/loaded/New() - ..() +/obj/mecha/combat/marauder/mauler/loaded/Initialize(mapload) + . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg(src) ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot(src) diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm index 53fa849b83c..11e4f184473 100644 --- a/code/game/mecha/combat/phazon.dm +++ b/code/game/mecha/combat/phazon.dm @@ -30,8 +30,8 @@ phasing_action.Remove(user) switch_damtype_action.Remove(user) -/obj/mecha/combat/phazon/New() - ..() +/obj/mecha/combat/phazon/Initialize(mapload) + . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/rcd ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/gravcatapult diff --git a/code/game/mecha/combat/reticence.dm b/code/game/mecha/combat/reticence.dm index a6f9cb9d0be..9a0efb6de56 100644 --- a/code/game/mecha/combat/reticence.dm +++ b/code/game/mecha/combat/reticence.dm @@ -20,8 +20,8 @@ turnsound = null starting_voice = /obj/item/mecha_modkit/voice/silent -/obj/mecha/combat/reticence/loaded/New() - ..() +/obj/mecha/combat/reticence/loaded/Initialize(mapload) + . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine/silenced ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/mimercd //HAHA IT MAKES WALLS GET IT diff --git a/code/game/mecha/medical/medical.dm b/code/game/mecha/medical/medical.dm index 2255885030c..5bf52e88d69 100644 --- a/code/game/mecha/medical/medical.dm +++ b/code/game/mecha/medical/medical.dm @@ -2,6 +2,6 @@ turnsound = 'sound/mecha/mechmove01.ogg' stepsound = 'sound/mecha/mechstep.ogg' -/obj/mecha/medical/New() - ..() +/obj/mecha/medical/Initialize(mapload) + . = ..() trackers += new /obj/item/mecha_parts/mecha_tracking(src) diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 413d2a51be9..3e6ebbd60d9 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -100,8 +100,8 @@ step_energy_drain = 0 normal_step_energy_drain = 0 -/obj/mecha/working/ripley/deathripley/New() - ..() +/obj/mecha/working/ripley/deathripley/Initialize(mapload) + . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/kill ME.attach(src) return @@ -111,8 +111,8 @@ name = "APLU \"Miner\"" obj_integrity = 75 //Low starting health -/obj/mecha/working/ripley/mining/New() - ..() +/obj/mecha/working/ripley/mining/Initialize(mapload) + . = ..() if(cell) cell.charge = FLOOR(cell.charge * 0.25, 1) //Starts at very low charge //Attach drill diff --git a/code/game/mecha/working/working.dm b/code/game/mecha/working/working.dm index b29b64bed26..4bc60ad94f4 100644 --- a/code/game/mecha/working/working.dm +++ b/code/game/mecha/working/working.dm @@ -1,7 +1,7 @@ /obj/mecha/working internal_damage_threshold = 60 -/obj/mecha/working/New() - ..() +/obj/mecha/working/Initialize(mapload) + . = ..() if(!ruin_mecha) trackers += new /obj/item/mecha_parts/mecha_tracking(src)