From 1fdf2c750ca9f2e316934e2a423a94a855fc6699 Mon Sep 17 00:00:00 2001 From: Sparky Date: Sun, 17 Dec 2023 21:44:52 +0000 Subject: [PATCH] Hammertail Gear (#17960) * Hammertail Gear Adds a Hammertail Smiths jumsuit, as well as adding themed gear crates to the uplink. * Fix? * Fix again * Forgot to rename uplink * Missing space * Group Gear Looped As requested --- code/datums/uplink/gear loadout.dm | 11 +++++++ .../crates_lockers/crates/gear_loadout.dm | 30 ++++++++++++++++++ code/modules/clothing/under/syndicate.dm | 11 +++++++ html/changelogs/hammertail_gear.yml | 7 ++++ icons/obj/item/clothing/under/hammertail.dmi | Bin 0 -> 3694 bytes 5 files changed, 59 insertions(+) create mode 100644 html/changelogs/hammertail_gear.yml create mode 100644 icons/obj/item/clothing/under/hammertail.dmi diff --git a/code/datums/uplink/gear loadout.dm b/code/datums/uplink/gear loadout.dm index ed4eca5a066..285b1bd8c62 100644 --- a/code/datums/uplink/gear loadout.dm +++ b/code/datums/uplink/gear loadout.dm @@ -157,3 +157,14 @@ desc = "A crate containing gear for a single individual. The hardsuit is only usable by humans and skrell." path = /obj/structure/closet/crate/gear_loadout/nanotrasen/single telecrystal_cost = 15 + +/datum/uplink_item/item/gear_loadout/hammertail + name = "Hammertail Smiths Assets (Group)" + desc = "A crate containing gear for a group. The voidsuits are are only usable by humans." + path = /obj/structure/closet/crate/secure/gear_loadout/hammertail + +/datum/uplink_item/item/gear_loadout/hammertail_single + name = "Hammertail Smiths Assets (Single)" + desc = "A crate containing gear for a single individual. The voidsuit is only usable by humans." + path = /obj/structure/closet/crate/secure/gear_loadout/hammertail/single + telecrystal_cost = 10 diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm index 896aaeda0fd..b7c8500f1ea 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -807,6 +807,36 @@ new /obj/item/gun/energy/pistol(src) new /obj/item/shield/riot/tact(src) + +/obj/structure/closet/crate/secure/gear_loadout/hammertail/fill() + var/i + for(i=0, i<6, i++) //6 outfits + new /obj/item/clothing/under/syndicate/hammertail(src) + for(i=0, i<4, i++) //4 voidsuits w/helmets + new /obj/item/clothing/head/helmet/space/void/merc(src) + new /obj/item/clothing/suit/space/void/merc(src) + for(i=0, i<4, i++) //4 e-swords + new /obj/item/melee/energy/sword(src) + for(i=0, i<4, i++) //4 heavy pistols w/spare magazines + new /obj/item/gun/projectile/pistol/super_heavy(src) + new /obj/item/ammo_magazine/super_heavy(src) + for(i=0, i<4, i++) //4 tungsten slug guns w/spare magazines + new /obj/item/gun/projectile/gauss(src) + new /obj/item/ammo_magazine/gauss(src) + for(i=0, i<2, i++) //2 assault rifles w/spare magazines + new /obj/item/gun/projectile/automatic/rifle/sts35(src) + new /obj/item/ammo_magazine/c762(src) + +/obj/structure/closet/crate/secure/gear_loadout/hammertail/single/fill() + new /obj/item/clothing/under/syndicate/hammertail(src) //1 outfit + new /obj/item/clothing/head/helmet/space/void/merc(src) //1 voidsuit w/helmet + new /obj/item/clothing/suit/space/void/merc(src) + new /obj/item/melee/energy/sword(src) //1 e-sword + new /obj/item/gun/projectile/revolver(src) //1 .357 pistol w/spare speedloader + new /obj/item/ammo_magazine/a357(src) + new /obj/item/gun/projectile/gauss(src) //1 tungsten slug gun w/spare magazine + new /obj/item/ammo_magazine/gauss(src) + //ninja stuff /obj/structure/closet/crate/secure/gear_loadout/ninja var/associated_hardsuit = /obj/item/rig/light/ninja diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index e8eeec9e953..0eb041f7703 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -37,3 +37,14 @@ icon_state = "ninja" item_state = "ninja" worn_state = "ninja" + +/obj/item/clothing/under/syndicate/hammertail + name = "\improper crimson jumpsuit" + desc = "A blood-red jumpsuit with purple shoulder patches and a thick black apron tied around the front. The patches are cut in the shape of two energy swords." + desc_extended = "While black markets may be common, the concept of a “black factory” is much rarer, the idea of an entire industry producing and selling in \ + illegality, generally to other criminal elements. The Hammertail Smiths are just that, an organization of engineers, scientists, machinists, and industrial workers \ + whose ingenuity, and occasionally deranged inspiration, is fueled and funded by eager clients, from pirate fleets and other Unathi criminal organizations to \ + individual actors, may they be in the Hegemony, or on the other side of the spur." + icon_state = "hammertail" + item_state = "hammertail" + worn_state = "hammertail" diff --git a/html/changelogs/hammertail_gear.yml b/html/changelogs/hammertail_gear.yml new file mode 100644 index 00000000000..be232917cf2 --- /dev/null +++ b/html/changelogs/hammertail_gear.yml @@ -0,0 +1,7 @@ +author: Dessysalta (sprites), Sparky_hotdog (code) + +delete-after: True + +changes: + - rscadd: "Adds a Hammertail Smiths jumpsuit." + - rscadd: "Adds new Hammertail Smiths gear crates to the uplink." diff --git a/icons/obj/item/clothing/under/hammertail.dmi b/icons/obj/item/clothing/under/hammertail.dmi new file mode 100644 index 0000000000000000000000000000000000000000..279541d976fe7eea384af482aa8e4f23638ef77e GIT binary patch literal 3694 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