From 791f3d043a16441fbfcb89fe5e97149ce4e793dd Mon Sep 17 00:00:00 2001 From: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Date: Sat, 21 Jun 2025 11:12:29 +1000 Subject: [PATCH] Updates the mech ammo duffel bags into two separate types for each kind of mech. Each with equivalent ammunition and the toolbelt. (#91711) --- code/game/objects/items/storage/dufflebags.dm | 16 +++++++++------- code/modules/uplink/uplink_items/nukeops.dm | 10 +++++----- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/code/game/objects/items/storage/dufflebags.dm b/code/game/objects/items/storage/dufflebags.dm index 05d50bcda2f..f1f806f1a3c 100644 --- a/code/game/objects/items/storage/dufflebags.dm +++ b/code/game/objects/items/storage/dufflebags.dm @@ -293,10 +293,13 @@ icon_state = "duffel-syndieammo" inhand_icon_state = "duffel-syndieammo" -/obj/item/storage/backpack/duffelbag/syndie/ammo/mech - desc = "A large duffel bag, packed to the brim with various exosuit ammo." +/obj/item/storage/backpack/duffelbag/syndie/ammo/darkgygax + name = "\improper Dark Gygax ammunition duffel bag" + desc = "A large duffel bag, packed to the brim with ammunition for the scattershot exosuit weapon. Suited to equipping the standard loadout of a Dark Gygax." -/obj/item/storage/backpack/duffelbag/syndie/ammo/mech/PopulateContents() +/obj/item/storage/backpack/duffelbag/syndie/ammo/darkgygax/PopulateContents() + new /obj/item/mecha_ammo/scattershot(src) + new /obj/item/mecha_ammo/scattershot(src) new /obj/item/mecha_ammo/scattershot(src) new /obj/item/mecha_ammo/scattershot(src) new /obj/item/mecha_ammo/scattershot(src) @@ -304,18 +307,17 @@ new /obj/item/storage/belt/utility/syndicate(src) /obj/item/storage/backpack/duffelbag/syndie/ammo/mauler - desc = "A large duffel bag, packed to the brim with various exosuit ammo." + name = "\improper Mauler ammunition duffel bag" + desc = "A large duffel bag, packed to the brim with various exosuit ammo. Suited to equipping the standard loadout of a Dark Gygax." /obj/item/storage/backpack/duffelbag/syndie/ammo/mauler/PopulateContents() new /obj/item/mecha_ammo/lmg(src) new /obj/item/mecha_ammo/lmg(src) new /obj/item/mecha_ammo/lmg(src) - new /obj/item/mecha_ammo/scattershot(src) - new /obj/item/mecha_ammo/scattershot(src) - new /obj/item/mecha_ammo/scattershot(src) new /obj/item/mecha_ammo/missiles_srm(src) new /obj/item/mecha_ammo/missiles_srm(src) new /obj/item/mecha_ammo/missiles_srm(src) + new /obj/item/storage/belt/utility/syndicate(src) /obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle desc = "A large duffel bag containing a medical equipment, a Donksoft LMG, a big jumbo box of riot darts, and a magboot MODsuit module." diff --git a/code/modules/uplink/uplink_items/nukeops.dm b/code/modules/uplink/uplink_items/nukeops.dm index 507ae16f38b..6c396bc8153 100644 --- a/code/modules/uplink/uplink_items/nukeops.dm +++ b/code/modules/uplink/uplink_items/nukeops.dm @@ -592,15 +592,15 @@ // ~~ Mech Support ~~ /datum/uplink_item/mech/support_bag - name = "Mech Support Kit Bag" - desc = "A duffel bag containing ammo for four full reloads of the scattershot carbine 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." - item = /obj/item/storage/backpack/duffelbag/syndie/ammo/mech + name = "Dark Gygax Support Duffel Bag" + desc = "A duffel bag containing ammo for isx full reloads of the scattershot exosuit weapon, which is equipped on standard Dark Gygax exosuits. Also comes with some support equipment for maintaining the mech, including tools and an inducer." + item = /obj/item/storage/backpack/duffelbag/syndie/ammo/darkgygax cost = 4 purchasable_from = UPLINK_SERIOUS_OPS /datum/uplink_item/mech/support_bag/mauler - name = "Mauler Ammo Bag" - desc = "A duffel bag containing ammo for three full reloads of the LMG, scattershot carbine, and SRM-8 missile launcher that are equipped on a standard Mauler exosuit." + name = "Mauler Support Duffel Bag" + desc = "A duffel bag containing ammo for three full reloads of the LMG and SRM-8 missile launcher that are equipped on a standard Mauler exosuit. Also comes with some support equipment for maintaining the mech, including tools and an inducer." item = /obj/item/storage/backpack/duffelbag/syndie/ammo/mauler cost = 6 purchasable_from = UPLINK_SERIOUS_OPS