diff --git a/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm b/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm index 6bb4f2e48c99..f5040429ad76 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm @@ -2417,7 +2417,7 @@ /obj/item/toy/plush/moth/firewatch, /obj/item/toy/plush/lizardplushie, /obj/item/toy/plush/knight, -/obj/item/toy/prize/mauler, +/obj/item/toy/prize/touro, /obj/item/toy/talking/AI, /turf/open/floor/plasteel/mono/white, /area/ruin/rockplanet/shippingdockwarehouse) diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm index 8a29a537d060..987b372d217a 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm @@ -4269,7 +4269,7 @@ /turf/open/floor/plating, /area/ship/engineering) "PA" = ( -/obj/structure/mecha_wreckage/mauler, +/obj/structure/mecha_wreckage/touro, /obj/effect/turf_decal/techfloor{ dir = 8 }, diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index d7f80fc45680..24f66242d58e 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -17,7 +17,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( /obj/item/toy/prize/honk = 1, /obj/item/toy/prize/marauder = 1, /obj/item/toy/prize/seraph = 1, - /obj/item/toy/prize/mauler = 1, + /obj/item/toy/prize/touro = 1, /obj/item/toy/prize/odysseus = 1, /obj/item/toy/prize/phazon = 1, /obj/item/toy/prize/reticence = 1, diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index d1d4bfc1ea48..825d5e24a1b8 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -71,22 +71,22 @@ ME.attach(src) max_ammo() -/obj/mecha/combat/marauder/mauler - desc = "Heavy-duty, combat exosuit, developed off of the existing Marauder model." - name = "\improper Mauler" - icon_state = "mauler" +/obj/mecha/combat/marauder/touro + desc = "A powerful ICW-era combat exosuit, developed off of Nanotrasen's Marauder model by Cybersun Biodynamics." + name = "\improper Touro" + icon_state = "touro" operation_req_access = list(ACCESS_SYNDICATE) internals_req_access = list(ACCESS_SYNDICATE) - wreckage = /obj/structure/mecha_wreckage/mauler + wreckage = /obj/structure/mecha_wreckage/touro max_equip = 6 destruction_sleep_duration = 20 -/obj/mecha/combat/marauder/mauler/Initialize() +/obj/mecha/combat/marauder/touro/Initialize() . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/thrusters/ion(src) ME.attach(src) -/obj/mecha/combat/marauder/mauler/loaded/Initialize() +/obj/mecha/combat/marauder/touro/loaded/Initialize() . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg(src) ME.attach(src) diff --git a/code/game/mecha/equipment/weapons/mecha_ammo.dm b/code/game/mecha/equipment/weapons/mecha_ammo.dm index 73597ff21e49..0febe3327cb6 100644 --- a/code/game/mecha/equipment/weapons/mecha_ammo.dm +++ b/code/game/mecha/equipment/weapons/mecha_ammo.dm @@ -50,7 +50,7 @@ /obj/item/mecha_ammo/lmg name = "machine gun ammo" - desc = "A box of linked ammunition, designed for the Ultra AC 2 exosuit weapon." + desc = "A box of linked ammunition, designed for the UMG-2 exosuit weapon." icon_state = "lmg" rounds = 300 ammo_type = "lmg" diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index f09c529b45a1..39b39ffeeff0 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -300,7 +300,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine - name = "\improper FNX-99 \"Hades\" Carbine" + name = "\improper FNX-99 \"Phoenix\" Exosuit Carbine" desc = "A weapon for combat exosuits. Shoots incendiary bullets." icon_state = "mecha_carbine" equip_cooldown = 10 @@ -323,7 +323,7 @@ harmful = TRUE /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot - name = "\improper LBX AC 10 \"Scattershot\"" + name = "\improper LBX-10 \"Scattershot\" Heavy Shotgun" desc = "A weapon for combat exosuits. Shoots a spread of pellets." icon_state = "mecha_scatter" equip_cooldown = 20 @@ -337,7 +337,7 @@ ammo_type = "scattershot" /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg - name = "\improper Ultra AC 2" + name = "\improper UMG-2 Mounted Machine Gun" desc = "A weapon for combat exosuits. Shoots a rapid, three shot burst." icon_state = "mecha_uac2" equip_cooldown = 10 @@ -353,7 +353,7 @@ ammo_type = "lmg" /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/mounted - name = "\improper mounted HMG" + name = "\improper Mounted Heavy Machine Gun" desc = "A heavy calibre machine gun commonly used by motorized forces, famed for it's ability to give people on the recieving end more holes than normal. It is modified to be attached to vehicles" projectile = /obj/projectile/bullet/lmg fire_sound = 'sound/weapons/gun/hmg/hmg.ogg' diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index 27c680120fae..b8808944b5bd 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -129,9 +129,9 @@ name = "\improper Marauder wreckage" icon_state = "marauder-broken" -/obj/structure/mecha_wreckage/mauler - name = "\improper Mauler wreckage" - icon_state = "mauler-broken" +/obj/structure/mecha_wreckage/touro + name = "\improper Touro wreckage" + icon_state = "touro-broken" desc = "The syndicate won't be very happy about this..." /obj/structure/mecha_wreckage/seraph diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 92123969a4cd..125b10a10043 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -603,10 +603,10 @@ new /obj/item/mecha_ammo/scattershot(src) new /obj/item/storage/belt/utility/syndicate(src) -/obj/item/storage/backpack/duffelbag/syndie/ammo/mauler +/obj/item/storage/backpack/duffelbag/syndie/ammo/touro desc = "A large duffel bag, packed to the brim with various exosuit ammo." -/obj/item/storage/backpack/duffelbag/syndie/ammo/mauler/PopulateContents() +/obj/item/storage/backpack/duffelbag/syndie/ammo/touro/PopulateContents() new /obj/item/mecha_ammo/lmg(src) new /obj/item/mecha_ammo/lmg(src) new /obj/item/mecha_ammo/lmg(src) diff --git a/code/game/objects/items/toy_mechs.dm b/code/game/objects/items/toy_mechs.dm index 2a821c7a8317..738cfa83c0f5 100644 --- a/code/game/objects/items/toy_mechs.dm +++ b/code/game/objects/items/toy_mechs.dm @@ -535,10 +535,10 @@ special_attack_type = SPECIAL_ATTACK_DAMAGE special_attack_cry = "ROCKET BARRAGE" -/obj/item/toy/prize/mauler - name = "toy Mauler" +/obj/item/toy/prize/touro + name = "toy Touro" desc = "9/13" - icon_state = "maulertoy" + icon_state = "tourotoy" max_combat_health = 7 //500 integrity special_attack_type = SPECIAL_ATTACK_DAMAGE special_attack_cry = "BULLET STORM" diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm index a4c997b46078..5c6f83ad5734 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm @@ -225,7 +225,7 @@ /datum/blackmarket_item/weapon/mecha_hades name = "Mounted FNX-99 Carbine" - desc = "This so called \"Hades\" carbine is sure to burn brightly above the competition! Not to be confused with the \"Hades\" energy rifle. Exosuit not included." + desc = "This so called \"Phoenix\" carbine is sure to burn brightly above the competition! Exosuit not included." item = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine pair_item = list(/datum/blackmarket_item/ammo/mecha_hades_ammo) diff --git a/code/modules/cargo/packs/mechs.dm b/code/modules/cargo/packs/mechs.dm index fd978f99749e..7790e696ee15 100644 --- a/code/modules/cargo/packs/mechs.dm +++ b/code/modules/cargo/packs/mechs.dm @@ -262,7 +262,7 @@ weapons ) /datum/supply_pack/mech/weapon/scattershot - name = "LBX AC 10 kit" + name = "LBX-10 kit" desc = "Contains a \"Scattershot\" gun to mount on combat exosuits." cost = 1750 contains = list( @@ -270,7 +270,7 @@ weapons ) /datum/supply_pack/mech/weapon/lmg - name = "Ultra AC 2 kit" + name = "UMG-2 kit" desc = "Contains a mounted gun which fires in three round bursts." cost = 2250 contains = list( @@ -295,16 +295,16 @@ ammo crate_name = "exosuit ammo crate" /datum/supply_pack/mech/ammo/scattershot_ammo - name = "LBX AC 10 ammo box" - desc = "Contains a fourty-round box of upscaled buckshot, to be loaded directly in a mounted LBX AC 10." + name = "LBX-10 ammo box" + desc = "Contains a fourty-round box of upscaled buckshot, to be loaded directly in a mounted LBX-10." cost = 500 contains = list( /obj/item/mecha_ammo/scattershot ) /datum/supply_pack/mech/ammo/lmg_ammo - name = "Ultra AC 2 ammo box" - desc = "Contains a three hundred-round box of heavy ammunition for the Ultra AC 2." + name = "UMG-2 ammo box" + desc = "Contains a three hundred-round box of heavy ammunition for the UMG-2." cost = 750 contains = list( /obj/item/mecha_ammo/lmg diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 2e40c8ed04c6..5baed7a45309 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -143,7 +143,7 @@ /obj/item/toy/prize/durand, /obj/item/toy/prize/marauder, /obj/item/toy/prize/seraph, - /obj/item/toy/prize/mauler, + /obj/item/toy/prize/touro, /obj/item/toy/prize/odysseus, /obj/item/toy/prize/phazon, /obj/item/toy/prize/reticence, diff --git a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm index 7caaf4f1e436..e72211f66012 100644 --- a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm +++ b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm @@ -25,7 +25,7 @@ Featuring: search_objects = 0 mob_biotypes = MOB_ORGANIC|MOB_HUMANOID - var/spawn_mecha_type = /obj/mecha/combat/marauder/mauler/loaded + var/spawn_mecha_type = /obj/mecha/combat/marauder/touro/loaded var/obj/mecha/mecha //Ref to pilot's mecha instance var/required_mecha_charge = 7500 //If the pilot doesn't have a mecha, what charge does a potential Grand Theft Mecha need? (Defaults to half a battery) var/mecha_charge_evacuate = 50 //Amount of charge at which the pilot tries to abandon the mecha diff --git a/code/modules/research/designs/mecha_designs.dm b/code/modules/research/designs/mecha_designs.dm index 61fb07e77502..965a164e35d6 100644 --- a/code/modules/research/designs/mecha_designs.dm +++ b/code/modules/research/designs/mecha_designs.dm @@ -133,8 +133,8 @@ //////////////////////////////////////// /datum/design/mech_scattershot - name = "Exosuit Weapon (LBX AC 10 \"Scattershot\")" - desc = "Allows for the construction of LBX AC 10." + name = "Exosuit Weapon (LBX-10 \"Scattershot\")" + desc = "Allows for the construction of LBX-10." id = "mech_scattershot" build_type = MECHFAB build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot @@ -143,8 +143,8 @@ category = list("Exosuit Equipment") /datum/design/mech_scattershot_ammo - name = "LBX AC 10 Scattershot Ammunition" - desc = "Ammunition for the LBX AC 10 exosuit weapon." + name = "LBX-10 Scattershot Ammunition" + desc = "Ammunition for the LBX-10 exosuit weapon." id = "mech_scattershot_ammo" build_type = PROTOLATHE | MECHFAB build_path = /obj/item/mecha_ammo/scattershot @@ -153,7 +153,7 @@ category = list("Exosuit Ammunition", "Ammo") /datum/design/mech_carbine - name = "Exosuit Weapon (FNX-99 \"Hades\" Carbine)" + name = "Exosuit Weapon (FNX-99 \"Phoenix\" Carbine)" desc = "Allows for the construction of FNX-99 \"Hades\" Carbine." id = "mech_carbine" build_type = MECHFAB @@ -164,7 +164,7 @@ /datum/design/mech_carbine_ammo name = "FNX-99 Carbine Ammunition" - desc = "Ammunition for the FNX-99 \"Hades\" Carbine." + desc = "Ammunition for the FNX-99 \"Phoenix\" Carbine." id = "mech_carbine_ammo" build_type = PROTOLATHE | MECHFAB build_path = /obj/item/mecha_ammo/incendiary @@ -403,7 +403,7 @@ category = list("Exosuit Equipment") /datum/design/mech_lmg - name = "Exosuit Weapon (\"Ultra AC 2\" LMG)" + name = "Exosuit Weapon (\"UMG-2\" LMG)" desc = "A weapon for combat exosuits. Shoots a rapid, three shot burst." id = "mech_lmg" build_type = MECHFAB @@ -413,8 +413,8 @@ category = list("Exosuit Equipment") /datum/design/mech_lmg_ammo - name = "Ultra AC 2 Ammunition" - desc = "Ammunition for the Ultra AC 2 LMG" + name = "UMG-2 Ammunition" + desc = "Ammunition for the UMG-2 LMG" id = "mech_lmg_ammo" build_type = PROTOLATHE | MECHFAB build_path = /obj/item/mecha_ammo/lmg diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 6d2236a974b9..31a7c508eecd 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -840,7 +840,7 @@ /datum/techweb_node/mech_scattershot id = "mecha_tools" - display_name = "Exosuit Weapon (LBX AC 10 \"Scattershot\")" + display_name = "Exosuit Weapon (LBX-10 \"Scattershot\")" description = "An advanced piece of exosuit weaponry" prereq_ids = list("ballistic_weapons") design_ids = list("mech_scattershot", "mech_scattershot_ammo") @@ -849,7 +849,7 @@ /datum/techweb_node/mech_carbine id = "mech_carbine" - display_name = "Exosuit Weapon (FNX-99 \"Hades\" Carbine)" + display_name = "Exosuit Weapon (FNX-99 \"Phoenix\" Carbine)" description = "An advanced piece of exosuit weaponry" prereq_ids = list("ballistic_weapons") design_ids = list("mech_carbine", "mech_carbine_ammo") @@ -948,7 +948,7 @@ /datum/techweb_node/mech_lmg id = "mech_lmg" - display_name = "Exosuit Weapon (\"Ultra AC 2\" LMG)" + display_name = "Exosuit Weapon (\"UMG-2\" LMG)" description = "An advanced piece of exosuit weaponry" prereq_ids = list("ballistic_weapons") design_ids = list("mech_lmg", "mech_lmg_ammo") diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 84485cbe903d..ce89f62761db 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -938,15 +938,15 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/ammo/mech/bag name = "Exosuit Support Kit Bag" - desc = "A duffel bag containing ammo for four full reloads of the scattershotm which is equipped on standard Dark Gygax and Mauler exosuits. Also comes with some support equipment for maintaining the mech, including tools and an inducer." + desc = "A duffel bag containing ammo for four full reloads of the scattershot which is equipped on standard Dark Gygax and Touro exosuits. Also comes with some support equipment for maintaining the exosuit, including tools and an inducer." item = /obj/item/storage/backpack/duffelbag/syndie/ammo/mech cost = 4 include_modes = list(/datum/game_mode/nuclear) -/datum/uplink_item/ammo/mauler/bag - name = "Mauler Ammo Bag" - desc = "A duffel bag containing ammo for three full reloads of the LMG, scattershot carbine, and SRM-8 missile laucher that are equipped on a standard Mauler exosuit." - item = /obj/item/storage/backpack/duffelbag/syndie/ammo/mauler +/datum/uplink_item/ammo/touro/bag + name = "Touro Ammo Bag" + desc = "A duffel bag containing ammo for three full reloads of the LMG, scattershot carbine, and SRM-8 missile laucher that are equipped on a standard Touro exosuit." + item = /obj/item/storage/backpack/duffelbag/syndie/ammo/touro cost = 6 include_modes = list(/datum/game_mode/nuclear) @@ -1195,11 +1195,11 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 80 include_modes = list(/datum/game_mode/nuclear/clown_ops) -/datum/uplink_item/support/mauler - name = "Mauler Exosuit" - desc = "A massive and incredibly deadly military-grade exosuit. Features long-range targeting, thrust vectoring \ +/datum/uplink_item/support/touro + name = "Touro Exosuit" + desc = "A well-armored and incredibly deadly military-grade exosuit. Features long-range targeting, thrust vectoring \ and deployable smoke. Comes equipped with an LMG, scattershot carbine, missile rack, an antiprojectile armor booster and a Tesla energy array." - item = /obj/mecha/combat/marauder/mauler/loaded + item = /obj/mecha/combat/marauder/touro/loaded cost = 140 // Stealth Items diff --git a/icons/mecha/mecha.dmi b/icons/mecha/mecha.dmi index b894d9191225..9b9c2b479c7b 100644 Binary files a/icons/mecha/mecha.dmi and b/icons/mecha/mecha.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index 78aebb9416c4..0894fa0a466a 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ