diff --git a/code/modules/background/accent/human.dm b/code/modules/background/accent/human.dm index a6a74b2f460..7c51bca4765 100644 --- a/code/modules/background/accent/human.dm +++ b/code/modules/background/accent/human.dm @@ -45,7 +45,7 @@ /datum/accent/silversun_original name = ACCENT_SILVERSUN_ORIGINAL - description = "The native accent of Silversun is a sing-song take on standard Sol Common that has, since massive investment into the planet by Idris Incorporated, come to be associated with the planet’s renowned tourism industry. \ + description = "The native accent of Silversun is a sing-song take on standard Sol Common that has, since massive investment into the planet by Idris Incorporated, come to be associated with the planet's renowned tourism industry. \ Many native residents of Silversun are bitter that their accent - and planet - are seen as nothing more than an enormous vacation retreat by the greater Orion Spur. This accent is commonly used by Idris Incorporated shell positronic \ frames, much to the consternation of Silversun's Originals." tag_icon = "silversun_original" diff --git a/code/modules/background/religion/human.dm b/code/modules/background/religion/human.dm index 64a4e1f7548..3f8e13e7314 100644 --- a/code/modules/background/religion/human.dm +++ b/code/modules/background/religion/human.dm @@ -68,7 +68,7 @@ /datum/religion/luceism name = RELIGION_LUCEISM description = "An unusual syncretic religion originating upon the planet of Assunzione, Luceism is a quasi-Abrahamic religion descended from a variety of faiths \ - held by the original colonists that first emerged following the unexpected extinguishing of Assunzione’s star in 2274. While arguably a branch of \ + held by the original colonists that first emerged following the unexpected extinguishing of Assunzione's star in 2274. While arguably a branch of \ modern Abrahamic religions, Luceism is a hard-to-define religion dedicated to the worship of an abstract representation of light referred to as \ the Ennoia. Though it is, unsurprisingly, strongest on Assunzione, followers of the faith can be found throughout the Orion Spur alongside their \ houses of worship." diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 3b656ebba96..4f646a46ff5 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -274,7 +274,7 @@ flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION /datum/gear/accessory/scc_patch - display_name = "Stellar Corporate Conglomerate sleeve patch" + display_name = "stellar corporate conglomerate sleeve patch" path = /obj/item/clothing/accessory/sleevepatch/scc flags = 0 @@ -297,6 +297,18 @@ gadpathur["medical cadre brassard"] = /obj/item/clothing/accessory/armband/gadpathur/med gear_tweaks += new/datum/gear_tweak/path(gadpathur) +/datum/gear/accessory/gadpathur_leader + display_name = "gadpathurian section leader badge" + description = "A small metal badge worn by Gadpathurian Section Leaders." + path = /obj/item/clothing/accessory/gadpathurian_leader + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/accessory/gadpathur_dogtags + display_name = "gadpathurian dogtags" + description = "Dogtags issued to Gadpathurians." + path = /obj/item/clothing/accessory/dogtags/gadpathur + flags = GEAR_HAS_DESC_SELECTION + /datum/gear/accessory/sash_coloured display_name = "sash (colourable)" path = /obj/item/clothing/accessory/sash/colourable diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 3b14802e748..94d283f92cd 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -321,6 +321,9 @@ var/gadpathur = list() gadpathur["gadpathurian sidecap"] = /obj/item/clothing/head/gadpathur gadpathur["gadpathurian beret"] = /obj/item/clothing/head/beret/gadpathur + gadpathur["gadpathurian engineer beret"] = /obj/item/clothing/head/beret/gadpathur/engineer + gadpathur["gadpathurian medical beret"] = /obj/item/clothing/head/beret/gadpathur/medical + gadpathur["gadpathurian turban"] = /obj/item/clothing/head/turban/gadpathur gear_tweaks += new/datum/gear_tweak/path(gadpathur) /datum/gear/head/dominia diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 86959247ed1..45f54a42e53 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -423,6 +423,15 @@ datum/gear/suit/colorvest flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION /datum/gear/suit/gadpathur - display_name = "gadpathurian overcoat" + display_name = "gadpathurian coat selection" path = /obj/item/clothing/suit/storage/gadpathur - flags = GEAR_HAS_DESC_SELECTION \ No newline at end of file + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/suit/gadpathur/New() + ..() + var/gadpathur_coat = list() + gadpathur_coat["gadpathurian overcoat"] = /obj/item/clothing/suit/storage/gadpathur + gadpathur_coat["gadpathurian trenchcoat"] = /obj/item/clothing/suit/storage/toggle/trench/gadpathur + gadpathur_coat["gadpathurian leather coat"] = /obj/item/clothing/suit/storage/toggle/trench/gadpathur/leather + gadpathur_coat["thermal coat"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/gadpathur + gear_tweaks += new/datum/gear_tweak/path(gadpathur_coat) \ No newline at end of file diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm index 5df24b0635b..39e43d0acbd 100644 --- a/code/modules/clothing/factions/dominia.dm +++ b/code/modules/clothing/factions/dominia.dm @@ -421,7 +421,7 @@ item_state = "dominia_beret_priest" /obj/item/clothing/head/beret/dominia/consular - name = "tribunalist’s beret" + name = "tribunalist's beret" desc = "A beret in gold and red worn by members of the clergy affiliated with His Majesty's Diplomatic Service." desc_fluff = "His Majesty's Diplomatic Service - as with much of the Empire tends to be dominated by the great houses, though the Service also employs may commoners - \ as long as they can pass the rigorous examinations required to become a full member of the Diplomatic Service." diff --git a/code/modules/clothing/factions/gadpathur.dm b/code/modules/clothing/factions/gadpathur.dm index b29007cd0cc..0a10cb764fe 100644 --- a/code/modules/clothing/factions/gadpathur.dm +++ b/code/modules/clothing/factions/gadpathur.dm @@ -21,6 +21,34 @@ item_state = "gadpathur_coat" contained_sprite = TRUE +/obj/item/clothing/suit/storage/toggle/trench/gadpathur + name = "gadpathurian trenchcoat" + desc = "A heavier Gadpathurian overcoat with some piping on the shoulders. Likely meant for the colder regions of the planet." + 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 = "gadpathurtrench" + item_state = "gadpathurtrench" + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/toggle/trench/gadpathur/leather + name = "gadpathurian leather coat" + desc = "A Gadpathurian overcoat made of leather rather than the typical canvas. Typically issued to exceptional Gadpathurians before they are sent abroad." + icon_state = "gadpathurleather" + item_state = "gadpathurleather" + +/obj/item/clothing/suit/storage/toggle/leather_jacket/gadpathur + name = "thermal coat" + desc = "A thermally insulated coat commonly worn by Gadpathurians during the planet's bitterly cold nights." + 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 = "gadpathurthermal" + item_state = "gadpathurthermal" + contained_sprite = TRUE + /obj/item/clothing/head/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." @@ -32,6 +60,13 @@ item_state = "gadpathur_cap" contained_sprite = TRUE +/obj/item/clothing/head/turban/gadpathur + name = "gadpathurian turban" + desc = "A turban commonly worn by Gadpathur's Sikh population. Like most Gadpathurian clothing, this turban is made of canvas." + icon = 'icons/clothing/head/gadpathur_cap.dmi' + icon_state = "turban_gadpathur" + item_state = "turban_gadpathur" + /obj/item/clothing/head/beret/gadpathur name = "cadre beret" desc = "A canvas beret with the traditional Gadpathurian red-and-orange sun on its badge. It has no other identifying marks." @@ -42,6 +77,19 @@ icon_state = "gadpathur_beret" item_state = "gadpathur_beret" +/obj/item/clothing/head/beret/gadpathur/engineer + name = "gadpathurian industrial beret" + desc = "A blue canvas beret with the typical crossed hammer and shovel icon of an industrial cadre on its badge." + icon_state = "gadpathur_engineer_beret" + item_state = "gadpathur_engineer_beret" + +/obj/item/clothing/head/beret/gadpathur/medical + name = "gadpathurian medical beret" + desc = "A red canvas beret with the golden cross of a medical cadre upon its badge." + icon_state = "gadpathur_medic_beret" + item_state = "gadpathur_medic_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." @@ -63,4 +111,50 @@ 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 + item_state = "gadpathur_brassard_ind" + +/obj/item/clothing/accessory/gadpathurian_leader + name = "section leader badge" + desc = "A Section Leader's badge is typically worn below one's overwear, in order to ensure that the hated Solarians will be unable to easily identify a leader in a crowd." + icon_state = "gadpathurleaderbadge" + item_state = "gadpathurleaderbadge" + overlay_state = "gadpathurleaderbadge" + + flippable = TRUE + + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' + +/obj/item/clothing/accessory/dogtags/gadpathur + name = "gadpathurian dogtags" + desc = "Gadpathurian dogtags are issued to every non-exiled member of the planet's highly-militarized society and list their wearer's name, cadre, cadre ID, religion, and blood type. \ + They can be easily ripped in half in the event of the wearer's death." + icon_state = "gadpathur_dogtags" + item_state = "gadpathur_dogtags" + var/separated = FALSE + +/obj/item/clothing/accessory/dogtags/gadpathur/attack_self(mob/user) + if(!separated) + if (user.a_intent == I_HURT) + user.visible_message(SPAN_NOTICE("[user] yanks apart \the [src]!")) + separated = TRUE + var/obj/item/gadpathur_tag/tag = new(get_turf(user)) + user.put_in_hands(tag) + separated = TRUE + update_icon() + +/obj/item/clothing/accessory/dogtags/gadpathur/update_icon() + if(separated) + icon_state = "[icon_state]_single" + item_state = "[item_state]_single" + else + icon_state = initial(icon_state) + item_state = initial(item_state) + +/obj/item/gadpathur_tag + name = "gadpathurian dogtag" + desc = "Gadpathurian dogtags are issued to every non-exiled member of the planet's highly-militarized society and list their wearer's name, cadre, cadre ID, religion, and blood type. \ + They can be easily ripped in half in the event of the wearer's death." + icon = 'icons/clothing/accessories/dogtags.dmi' + icon_state = "gadpathur_tag" + w_class = ITEMSIZE_SMALL \ No newline at end of file diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 9301e6bcdd2..779ac435b17 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -393,6 +393,20 @@ throwforce = 7.0 w_class = ITEMSIZE_SMALL +/obj/item/shovel/gadpathur + name = "trench shovel" + desc = "A standard-issue Gadpathurian entrenching tool. Sharpened edges make this tool/weapon equally adept at breaking earth and collarbones." + icon_state = "gadpathur_shovel" + item_state = "gadpathur_shovel" + force = 10 + w_class = ITEMSIZE_NORMAL + origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1, TECH_COMBAT = 2) + attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked", "slashed", "cut") + sharp = TRUE + +/obj/item/shovel/gadpathur/iscrowbar() + return TRUE + // Flags. /obj/item/stack/flag diff --git a/html/changelogs/alberyk_gadpathurclothing.yml b/html/changelogs/alberyk_gadpathurclothing.yml new file mode 100644 index 00000000000..406752b3780 --- /dev/null +++ b/html/changelogs/alberyk_gadpathurclothing.yml @@ -0,0 +1,6 @@ +author: Alberyk, Canon35 + +delete-after: True + +changes: + - rscadd: "Added new gadpathurian clothing options to the loadout." diff --git a/icons/clothing/accessories/dogtags.dmi b/icons/clothing/accessories/dogtags.dmi index 3b687b05c0e..66f7c58b9de 100644 Binary files a/icons/clothing/accessories/dogtags.dmi and b/icons/clothing/accessories/dogtags.dmi differ diff --git a/icons/clothing/head/gadpathur_beret.dmi b/icons/clothing/head/gadpathur_beret.dmi index b6a9ba444d6..6583ec8a5ea 100644 Binary files a/icons/clothing/head/gadpathur_beret.dmi 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 index b009bbb657e..a596e870d00 100644 Binary files a/icons/clothing/head/gadpathur_cap.dmi 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 index 6323afd9dcb..c80113e4ea0 100644 Binary files a/icons/clothing/suits/coats/gadpathur_coat.dmi and b/icons/clothing/suits/coats/gadpathur_coat.dmi differ diff --git a/icons/mob/items/lefthand_mining.dmi b/icons/mob/items/lefthand_mining.dmi index 99f33acd11e..7ec130e61fc 100644 Binary files a/icons/mob/items/lefthand_mining.dmi and b/icons/mob/items/lefthand_mining.dmi differ diff --git a/icons/mob/items/righthand_mining.dmi b/icons/mob/items/righthand_mining.dmi index ae366c4493a..f84fa242f7f 100644 Binary files a/icons/mob/items/righthand_mining.dmi and b/icons/mob/items/righthand_mining.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 4d4c1e953cb..c0a6d857278 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 6409cf004b8..60aae3cd530 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi index 95002b6d92a..b196d280514 100644 Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ