diff --git a/code/datums/uplink/gear loadout.dm b/code/datums/uplink/gear loadout.dm index 52131a69e97..abdf49ec01f 100644 --- a/code/datums/uplink/gear loadout.dm +++ b/code/datums/uplink/gear loadout.dm @@ -214,3 +214,14 @@ desc = "A crate containing gear for a single individual." path = /obj/structure/closet/crate/secure/gear_loadout/exclusionist/single telecrystal_cost = 10 + +/datum/uplink_item/item/gear_loadout/hoplan + name = "Golden Deep Hoplan Assets (Group)" + desc = "A crate containing gear for a group. Includes merchant clothes as well. Recommended for IPCs." + path = /obj/structure/closet/crate/secure/gear_loadout/hoplan + +/datum/uplink_item/item/gear_loadout/exclusionist_single + name = "Golden Deep Hoplan Assets (Single)" + desc = "A crate containing gear for a single individual. Recommended for IPCs." + path = /obj/structure/closet/crate/secure/gear_loadout/hoplan/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 91357b9d86e..d18b3e853e1 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -1084,6 +1084,101 @@ new /obj/item/clothing/ears/antenna/trinary_halo/exclusionist(src) new /obj/item/melee/chainsword(src) +/obj/structure/closet/crate/secure/gear_loadout/hoplan/fill() + new /obj/item/clothing/shoes/jackboots(src) + new /obj/item/clothing/shoes/jackboots(src) + new /obj/item/clothing/shoes/jackboots(src) + new /obj/item/clothing/shoes/jackboots(src) + new /obj/item/clothing/under/goldendeep/hoplan(src) + new /obj/item/clothing/under/goldendeep/hoplan(src) + new /obj/item/clothing/under/goldendeep/hoplan(src) + new /obj/item/clothing/under/goldendeep/hoplan(src) + new /obj/item/clothing/accessory/leg_guard/hoplan/skirt(src) + new /obj/item/clothing/accessory/leg_guard/hoplan/skirt(src) + new /obj/item/clothing/suit/armor/carrier/hoplan(src) + new /obj/item/clothing/suit/armor/carrier/hoplan(src) + new /obj/item/clothing/suit/armor/carrier/hoplan(src) + new /obj/item/clothing/suit/armor/carrier/hoplan(src) + new /obj/item/clothing/head/helmet/hoplan(src) + new /obj/item/clothing/head/helmet/hoplan(src) + new /obj/item/clothing/head/helmet/hoplan(src) + new /obj/item/clothing/head/helmet/hoplan(src) + new /obj/item/clothing/head/goldendeep/hoplan(src) + new /obj/item/clothing/head/goldendeep/hoplan(src) + new /obj/item/clothing/head/goldendeep/hoplan(src) + new /obj/item/clothing/head/goldendeep/hoplan(src) + new /obj/item/clothing/accessory/holster/hip/brown(src) + new /obj/item/clothing/accessory/holster/hip/brown(src) + new /obj/item/clothing/accessory/holster/hip/brown(src) + new /obj/item/clothing/accessory/holster/hip/brown(src) + new /obj/item/storage/belt/military(src) + new /obj/item/storage/belt/military(src) + new /obj/item/storage/belt/military(src) + new /obj/item/storage/belt/military(src) + new /obj/item/storage/backpack/rucksack/tan(src) + new /obj/item/storage/backpack/rucksack/tan(src) + new /obj/item/storage/backpack/rucksack/tan(src) + new /obj/item/storage/backpack/rucksack/tan(src) + new /obj/item/gun/energy/rifle/laser(src) + new /obj/item/gun/energy/rifle/laser(src) + new /obj/item/gun/projectile/automatic/rifle/dnac(src) + new /obj/item/ammo_magazine/a65(src) + new /obj/item/ammo_magazine/a65(src) + new /obj/item/ammo_magazine/a65(src) + new /obj/item/ammo_magazine/a65(src) + new /obj/item/gun/projectile/automatic/rifle/shotgun/xanan(src) + new /obj/item/ammo_magazine/xanan_shotgun/shells(src) + new /obj/item/ammo_magazine/xanan_shotgun/shells(src) + new /obj/item/ammo_magazine/xanan_shotgun/slugs(src) + new /obj/item/ammo_magazine/xanan_shotgun/slugs(src) + new /obj/item/ammo_magazine/xanan_shotgun/incendiary(src) + new /obj/item/gun/projectile/pistol/sol/konyang(src) + new /obj/item/ammo_magazine/mc9mm(src) + new /obj/item/ammo_magazine/mc9mm(src) + new /obj/item/gun/projectile/pistol/sol/konyang(src) + new /obj/item/ammo_magazine/mc9mm(src) + new /obj/item/ammo_magazine/mc9mm(src) + new /obj/item/gun/projectile/xanupistol(src) + new /obj/item/ammo_magazine/c46m(src) + new /obj/item/ammo_magazine/c46m(src) + new /obj/item/gun/projectile/xanupistol(src) + new /obj/item/ammo_magazine/c46m(src) + new /obj/item/ammo_magazine/c46m(src) + new /obj/item/stack/nanopaste/surge(src) + new /obj/item/stack/nanopaste/surge(src) + new /obj/item/stack/nanopaste/surge(src) + new /obj/item/stack/nanopaste/surge(src) + new /obj/item/shield/energy/legion(src) + new /obj/item/shield/energy/legion(src) + new /obj/item/shield/energy(src) + new /obj/item/shield/energy(src) + new /obj/item/melee/energy/glaive(src) + new /obj/item/melee/energy/glaive(src) + new /obj/item/melee/energy/axe(src) + new /obj/item/melee/energy/axe(src) + +/obj/structure/closet/crate/secure/gear_loadout/hoplan/single/fill() + new /obj/item/clothing/shoes/jackboots(src) + new /obj/item/clothing/under/goldendeep/hoplan(src) + new /obj/item/clothing/accessory/leg_guard/hoplan/skirt(src) + new /obj/item/clothing/suit/armor/carrier/hoplan(src) + new /obj/item/clothing/head/helmet/hoplan(src) + new /obj/item/clothing/head/goldendeep/hoplan(src) + new /obj/item/clothing/accessory/holster/hip/brown(src) + new /obj/item/storage/belt/military(src) + new /obj/item/storage/backpack/rucksack/tan(src) + new /obj/item/gun/projectile/automatic/rifle/dnac(src) + new /obj/item/ammo_magazine/a65(src) + new /obj/item/ammo_magazine/a65(src) + new /obj/item/ammo_magazine/a65(src) + new /obj/item/ammo_magazine/a65(src) + new /obj/item/gun/projectile/pistol/sol/konyang(src) + new /obj/item/ammo_magazine/mc9mm(src) + new /obj/item/ammo_magazine/mc9mm(src) + new /obj/item/stack/nanopaste/surge(src) + new /obj/item/shield/energy/legion(src) + new /obj/item/melee/energy/glaive(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/factions/goldendeep.dm b/code/modules/clothing/factions/goldendeep.dm index 4c0a8bccd49..81fc2b9bcd2 100644 --- a/code/modules/clothing/factions/goldendeep.dm +++ b/code/modules/clothing/factions/goldendeep.dm @@ -56,6 +56,23 @@ icon = 'icons/clothing/under/uniforms/goldendeep_skirtsuit.dmi' contained_sprite = TRUE +// Hoplan +/obj/item/clothing/under/goldendeep/hoplan + name = "hoplan uniform" + desc = "A standard issued uniform for a Hoplan house, often provided to represent a particular merchant or merchant organization who is funding the group." + icon_state = "hoplan_uniform" + item_state = "hoplan_uniform" + icon = 'icons/clothing/under/uniforms/goldendeep_hoplan.dmi' + contained_sprite = TRUE + +/obj/item/clothing/head/goldendeep/hoplan + name = "hoplan combat hat" + desc = "A large poofy and floppy hat with a golden antennae sticking out its top where typically feathers would protrude. If you wanted to be historically accurate." + icon_state = "hoplan_combat_hat" + item_state = "hoplan_combat_hat" + icon = 'icons/clothing/head/hoplan_combat_hat.dmi' + contained_sprite = TRUE + //colorable items go under here //shirts diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm index 3b7a77e05b0..97e19d86274 100644 --- a/code/modules/clothing/suits/modular_armor.dm +++ b/code/modules/clothing/suits/modular_armor.dm @@ -122,6 +122,14 @@ /obj/item/clothing/accessory/storage/chest_gear ) +/obj/item/clothing/suit/armor/carrier/hoplan + starting_accessories = list( + /obj/item/clothing/accessory/armor_plate/heavy/hoplan, + /obj/item/clothing/accessory/leg_guard/hoplan, + /obj/item/clothing/accessory/arm_guard/hoplan, + /obj/item/clothing/accessory/storage/modular_pouch/large + ) + /obj/item/clothing/accessory/armor_plate name = "corporate armor plate" desc = "A particularly light-weight armor plate in stylish corporate black. Unfortunately, not very good if you hold it with your hands." @@ -244,6 +252,14 @@ icon_state = "dom_plate" item_state = "dom_plate" +/obj/item/clothing/accessory/armor_plate/heavy/hoplan + name = "hoplan breastplate" + desc = "What looks to you like a medieval relic, is actually ablative plating backed by ballistic padding! Have at thee!" + icon = 'icons/clothing/kit/modular_armor.dmi' + icon_state = "hoplan_breastplate" + item_state = "hoplan_breastplate" + contained_sprite = TRUE + /obj/item/clothing/accessory/armor_plate/tcaf name = "\improper TCAF legionnaire carapace" desc = "The blue carapace of the Tau Ceti Armed Forces. Polished and proud for Miranda Trasen's favorite soldiers." @@ -446,6 +462,21 @@ icon_state = "tcaf_helm_visor" item_state = "tcaf_helm_visor" +/obj/item/clothing/head/helmet/hoplan + name = "hoplan helm" + desc = "A modern combat helmet with a stylish outer shell to make it appear from another era entirely. What these robots do for fashion..." + icon = 'icons/clothing/kit/modular_armor.dmi' + contained_sprite = TRUE + icon_state = "hoplan_helm" + item_state = "hoplan_helm" + armor = list( + melee = ARMOR_MELEE_MAJOR, + bullet = ARMOR_BALLISTIC_MAJOR, + laser = ARMOR_LASER_MEDIUM, + energy = ARMOR_ENERGY_SMALL, + bomb = ARMOR_BOMB_PADDED, + ) + //Cosmetic Accessories /obj/item/clothing/accessory/sec_commander_stripes diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index 033b412d8fb..d58113e849b 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -139,6 +139,30 @@ bomb = ARMOR_BOMB_PADDED, ) +/obj/item/clothing/accessory/leg_guard/hoplan + name = "hoplan thigh protector" + desc = "Ablative plating fashioned to sit around the thigh from the hips, \ + made to link together with an adjoining breastplate. This ancient style is reinvigorated with ablative metals and ballistic padding." + icon = 'icons/clothing/kit/modular_armor.dmi' + icon_state = "hoplan_thigh_protector" + item_state = "hoplan_thigh_protector" + contained_sprite = TRUE + armor = list( + melee = ARMOR_MELEE_MAJOR, + bullet = ARMOR_BALLISTIC_MAJOR, + laser = ARMOR_LASER_MEDIUM, + energy = ARMOR_ENERGY_SMALL, + bomb = ARMOR_BOMB_PADDED, + ) + +/obj/item/clothing/accessory/leg_guard/hoplan/skirt + name = "hoplan ballistic skirt" + desc = "A long skirt that falls down to one's ankles with an outer layer of ballistic padding, and woven in pouches featuring ablative plates." + icon = 'icons/clothing/kit/modular_armor.dmi' + icon_state = "hoplan_ballistic_skirt" + item_state = "hoplan_ballistic_skirt" + contained_sprite = TRUE + //Arm guards. /obj/item/clothing/accessory/arm_guard name = "corporate arm guards" @@ -284,3 +308,19 @@ name = "striped TCAF carapace arm guards" icon_state = "tcaf_armguards_stripe" item_state = "tcaf_armguards_stripe" + +/obj/item/clothing/accessory/arm_guard/hoplan + name = "hoplan sleeves" + desc = "Big and poofy and reminiscent of an era more enlightened. \ + These are lined with special fabric woven in the laboratories of Pactolus to provide armor to an otherwise gaudy fashion piece." + icon = 'icons/clothing/kit/modular_armor.dmi' + icon_state = "hoplan_sleeves" + item_state = "hoplan_sleeves" + contained_sprite = TRUE + armor = list( + melee = ARMOR_MELEE_MAJOR, + bullet = ARMOR_BALLISTIC_MAJOR, + laser = ARMOR_LASER_MEDIUM, + energy = ARMOR_ENERGY_SMALL, + bomb = ARMOR_BOMB_PADDED, + ) diff --git a/html/changelogs/Ben10083 - Hoplan.yml b/html/changelogs/Ben10083 - Hoplan.yml new file mode 100644 index 00000000000..3e95dd63fc4 --- /dev/null +++ b/html/changelogs/Ben10083 - Hoplan.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Ben10083 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds new Golden Deep Hoplan uniform and armor. Thanks to NobleRow for lore and sprites." + - rscadd: "Hoplan assets added to traitor uplink." diff --git a/icons/clothing/head/hoplan_combat_hat.dmi b/icons/clothing/head/hoplan_combat_hat.dmi new file mode 100644 index 00000000000..b428557c14a Binary files /dev/null and b/icons/clothing/head/hoplan_combat_hat.dmi differ diff --git a/icons/clothing/kit/modular_armor.dmi b/icons/clothing/kit/modular_armor.dmi index 0c15be3b52e..2bca57ec6b2 100644 Binary files a/icons/clothing/kit/modular_armor.dmi and b/icons/clothing/kit/modular_armor.dmi differ diff --git a/icons/clothing/under/uniforms/goldendeep_hoplan.dmi b/icons/clothing/under/uniforms/goldendeep_hoplan.dmi new file mode 100644 index 00000000000..8b230f3e327 Binary files /dev/null and b/icons/clothing/under/uniforms/goldendeep_hoplan.dmi differ