diff --git a/aurorastation.dme b/aurorastation.dme index 6b8454329e39..cb416059dace 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1364,6 +1364,7 @@ #include "code\modules\clothing\factions\dominia.dm" #include "code\modules\clothing\factions\elyra.dm" #include "code\modules\clothing\factions\europa.dm" +#include "code\modules\clothing\factions\gadpathur.dm" #include "code\modules\clothing\factions\himeo.dm" #include "code\modules\clothing\factions\konyang.dm" #include "code\modules\clothing\factions\vysoka.dm" diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 21e9f0387793..5146e7d4ac1f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -272,4 +272,18 @@ /datum/gear/accessory/whalebone display_name = "europan bone charm" path = /obj/item/clothing/accessory/whalebone - flags = GEAR_HAS_DESC_SELECTION \ No newline at end of file + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/accessory/gadpathur + display_name = "gadpathurian cadre brassard selection" + description = "A selection of cadre brassards from Gadpathur." + path = /obj/item/clothing/accessory/armband/gadpathur + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/accessory/gadpathur/New() + ..() + var/gadpathur = list() + gadpathur["cadre brassard"] = /obj/item/clothing/accessory/armband/gadpathur + gadpathur["industrial cadre brassard"] = /obj/item/clothing/accessory/armband/gadpathur/ind + gadpathur["medical cadre brassard"] = /obj/item/clothing/accessory/armband/gadpathur/med + gear_tweaks += new/datum/gear_tweak/path(gadpathur) \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 4a69d9b852a2..85b3786013af 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -289,3 +289,16 @@ display_name = "bucket hat" path = /obj/item/clothing/head/buckethat flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/head/gadpathur + display_name = "gadpathurian headgear selection" + description = "A selection of headgear from Gadpathur." + path = /obj/item/clothing/head/soft/gadpathur + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/head/gadpathur/New() + ..() + var/gadpathur = list() + gadpathur["gadpathurian sidecap"] = /obj/item/clothing/head/soft/gadpathur + gadpathur["gadpathurian beret"] = /obj/item/clothing/head/soft/gadpathur/beret + gear_tweaks += new/datum/gear_tweak/path(gadpathur) \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_mask.dm b/code/modules/client/preference_setup/loadout/loadout_mask.dm index b882a3e71f8d..188a0566b5ae 100644 --- a/code/modules/client/preference_setup/loadout/loadout_mask.dm +++ b/code/modules/client/preference_setup/loadout/loadout_mask.dm @@ -19,4 +19,4 @@ /datum/gear/mask/cloth display_name = "cloth mask" path = /obj/item/clothing/mask/cloth - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index a2b76e729577..d0cf4d1b9c91 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -332,4 +332,9 @@ /datum/gear/suit/submariner display_name = "submariner jacket" path = /obj/item/clothing/suit/storage/toggle/overlay/submariner - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION \ No newline at end of file + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/suit/gadpathur + display_name = "gadpathurian overcoat" + path = /obj/item/clothing/suit/storage/gadpathur + flags = GEAR_HAS_DESC_SELECTION \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 76d396032fe0..1988e4e2d5fb 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -321,3 +321,8 @@ hanbok["magenta-blue hanbok"] = /obj/item/clothing/under/konyang hanbok["white-pink hanbok"] = /obj/item/clothing/under/konyang/pink gear_tweaks += new/datum/gear_tweak/path(hanbok) + +/datum/gear/uniform/gadpathur + display_name = "gadpathurian fatigues" + path = /obj/item/clothing/under/uniform/gadpathur + flags = GEAR_HAS_DESC_SELECTION \ No newline at end of file diff --git a/code/modules/clothing/factions/gadpathur.dm b/code/modules/clothing/factions/gadpathur.dm new file mode 100644 index 000000000000..dccd8df56cf4 --- /dev/null +++ b/code/modules/clothing/factions/gadpathur.dm @@ -0,0 +1,66 @@ +/obj/item/clothing/under/uniform/gadpathur + name = "gadpathurian fatigues" + desc = "A simple black cloth shirt and brown NBC-treated pants commonly worn by Gadpathurians." + desc_fluff = "Gadpathur is, perhaps, the only planet with a government-mandated planetary costume. These uniforms can be \ + found throughout the planet and are one of the most common markers of Gadpathurians abroad, due to the distinctive black \ + shirt of the uniform. While some personalization is common on these uniforms, they mostly remain the same regardless of \ + which cadre one belongs to." + icon = 'icons/clothing/under/uniforms/gadpathur_uniform.dmi' + icon_state = "gadpathur_uniform" + item_state = "gadpathur_uniform" + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/gadpathur + name = "gadpathurian overcoat" + desc = "A simple canvas overcoat typically worn by Gadpathurians. The dull colors of it make manufacturing easier." + desc_fluff = "Due to the extremely hostile surface conditions of Gadpathur, overcoats such as this one are a common sight \ + in order to protect against hazards. They are typically chemically treated to better resist chemicals and radiation, \ + and are often the difference between life and death on the planet's surface." + icon = 'icons/clothing/suits/coats/gadpathur_coat.dmi' + icon_state = "gadpathur_coat" + item_state = "gadpathur_coat" + contained_sprite = TRUE + +/obj/item/clothing/head/soft/gadpathur + name = "cadre cap" + desc = "A snugly-fitting cap with the traditional Gadpathurian red-and-orange sun on its face. It has no other identifying features." + desc_fluff = "Soft headgear is commonly worn by cadre members while indoors on Gadpathur or while traveling abroad from the planet. \ + Gadpathurian cadres universally avoid decorating their headgear beyond the barest essentials - such as the cadre one belongs \ + to - in order to not give away unwanted information to observers." + icon = 'icons/clothing/head/gadpathur_cap.dmi' + icon_state = "gadpathur_cap" + item_state = "gadpathur_cap" + contained_sprite = TRUE + +/obj/item/clothing/head/soft/gadpathur/beret + name = "cadre beret" + desc = "A canvas beret with the traditional Gadpathurian red-and-orange sun on its badge. It has no other identifying marks." + desc_fluff = "Berets are commonly worn by cadre members while indoors on Gadpathur or while traveling abroad from the planet. \ + Gadpathurian cadres universally avoid decorating their headgear beyond the barest essentials - such as the cadre one belongs \ + to - in order to not give away unwanted information to observers." + icon = 'icons/clothing/head/gadpathur_beret.dmi' + icon_state = "gadpathur_beret" + item_state = "gadpathur_beret" + +/obj/item/clothing/accessory/armband/gadpathur + name = "cadre brassard" + desc = "Gadpathurian cadres use these brassards, worn on their uniforms or their coats, to distinguish themselves." + desc_fluff = "Stop reading the fluff description of an accessory friend, we must fight the Solarian imperialists!" + icon = 'icons/clothing/accessories/gadpathur_brassard.dmi' + icon_state = "gadpathur_brassard" + item_state = "gadpathur_brassard" + contained_sprite = TRUE + +/obj/item/clothing/accessory/armband/gadpathur/med + name = "medical cadre brassard" + desc = "Gadpathurian cadres use these brassards, worn on their uniforms or their coats, to distinguish themselves. This one depicts a golden cross \ + on a white background." + icon_state = "gadpathur_brassard_med" + item_state = "gadpathur_brassard_med" + +/obj/item/clothing/accessory/armband/gadpathur/ind + name = "industrial cadre brassard" + desc = "Gadpathurian cadres use these brassards, worn on their uniforms or their coats, to distinguish themselves. This one depicts a crossed hammer and\ + shovel with golden heads." + icon_state = "gadpathur_brassard_ind" + item_state = "gadpathur_brassard_ind" \ No newline at end of file diff --git a/html/changelogs/stryker-gadpathur.yml b/html/changelogs/stryker-gadpathur.yml new file mode 100644 index 000000000000..38c8938e8d34 --- /dev/null +++ b/html/changelogs/stryker-gadpathur.yml @@ -0,0 +1,4 @@ +author: The Stryker, NewOriginalSchwann +delete-after: True +changes: + - rscadd: "Adds Gadpathurian clothes (uniform, hats, cadre brassards, overcoat) under their appropriate categories in the loadout. Descriptions done by Schwann." \ No newline at end of file diff --git a/icons/clothing/accessories/gadpathur_brassard.dmi b/icons/clothing/accessories/gadpathur_brassard.dmi new file mode 100644 index 000000000000..90e1c39ef7fd Binary files /dev/null and b/icons/clothing/accessories/gadpathur_brassard.dmi differ diff --git a/icons/clothing/head/gadpathur_beret.dmi b/icons/clothing/head/gadpathur_beret.dmi new file mode 100644 index 000000000000..2035d1374d58 Binary files /dev/null and b/icons/clothing/head/gadpathur_beret.dmi differ diff --git a/icons/clothing/head/gadpathur_cap.dmi b/icons/clothing/head/gadpathur_cap.dmi new file mode 100644 index 000000000000..b009bbb657ed Binary files /dev/null and b/icons/clothing/head/gadpathur_cap.dmi differ diff --git a/icons/clothing/suits/coats/gadpathur_coat.dmi b/icons/clothing/suits/coats/gadpathur_coat.dmi new file mode 100644 index 000000000000..6323afd9dcb1 Binary files /dev/null and b/icons/clothing/suits/coats/gadpathur_coat.dmi differ diff --git a/icons/clothing/under/uniforms/gadpathur_uniform.dmi b/icons/clothing/under/uniforms/gadpathur_uniform.dmi new file mode 100644 index 000000000000..d244f00da30c Binary files /dev/null and b/icons/clothing/under/uniforms/gadpathur_uniform.dmi differ