diff --git a/aurorastation.dme b/aurorastation.dme index 777fa1c933e..ac337b17caa 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1271,6 +1271,7 @@ #include "code\modules\clothing\under\jobs\security.dm" #include "code\modules\clothing\under\xenos\resomi.dm" #include "code\modules\clothing\under\xenos\tajara.dm" +#include "code\modules\clothing\under\xenos\unathi.dm" #include "code\modules\custom_ka\barrels.dm" #include "code\modules\custom_ka\cells.dm" #include "code\modules\custom_ka\core.dm" diff --git a/code/datums/trading/misc.dm b/code/datums/trading/misc.dm index 5e4e90e69e8..2e2c8b0f61c 100644 --- a/code/datums/trading/misc.dm +++ b/code/datums/trading/misc.dm @@ -139,6 +139,7 @@ /obj/item/clothing/head/hasturhood = TRADER_THIS_TYPE, /obj/item/clothing/head/helmet/gladiator = TRADER_THIS_TYPE, /obj/item/clothing/head/plaguedoctorhat = TRADER_THIS_TYPE, + /obj/item/clothing/head/helmet/unathi = TRADER_THIS_TYPE, /obj/item/clothing/glasses/monocle = TRADER_THIS_TYPE, /obj/item/clothing/mask/smokable/pipe = TRADER_THIS_TYPE, /obj/item/clothing/mask/gas/plaguedoctor = TRADER_THIS_TYPE, @@ -147,6 +148,7 @@ /obj/item/clothing/suit/judgerobe = TRADER_THIS_TYPE, /obj/item/clothing/suit/wizrobe/magusred = TRADER_THIS_TYPE, /obj/item/clothing/suit/wizrobe/magusblue = TRADER_THIS_TYPE, + /obj/item/clothing/suit/armor/unathi = TRADER_THIS_TYPE, /obj/item/clothing/under/gladiator = TRADER_THIS_TYPE, /obj/item/clothing/under/kilt = TRADER_THIS_TYPE, /obj/item/clothing/under/redcoat = TRADER_THIS_TYPE, diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 4fd6ed102a9..2eb3356ebc3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -40,6 +40,16 @@ un_gloves["white gloves"] = /obj/item/clothing/gloves/white/unathi gear_tweaks += new/datum/gear_tweak/path(un_gloves) +/datum/gear/uniform/unathi + display_name = "sinta tunic (Unathi)" + path = /obj/item/clothing/under/unathi + whitelisted = list("Unathi") + sort_category = "Xenowear" + +/datum/gear/uniform/unathi/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) + //skrell items /datum/gear/ears/f_skrell diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 8c9f144df5c..bb86d593a02 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -164,6 +164,16 @@ cold_protection = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE +/obj/item/clothing/head/helmet/unathi + name = "unathi helmet" + desc = "A helmet designated to be worn by an unathi, used commonly by the hegemony levies." + icon = 'icons/obj/unathi_items.dmi' + icon_state = "unathi_helmet" + item_state = "unathi_helmet" + contained_sprite = 1 + species_restricted = list("Unathi") + armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) + //Non-hardsuit ERT helmets. /obj/item/clothing/head/helmet/ert name = "emergency response team helmet" diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm index dcf766a0e43..eb727f04035 100644 --- a/code/modules/clothing/suits/alien.dm +++ b/code/modules/clothing/suits/alien.dm @@ -10,7 +10,7 @@ /obj/item/clothing/suit/unathi/robe/robe_coat //I was at a loss for names under-the-hood. name = "tzirzi robes" desc = "A casual Moghes-native garment typically worn by Unathi while planet-side." - icon = 'icons/obj/clothing/robe_coat.dmi' + icon = 'icons/obj/unathi_items.dmi' icon_state = "robe_coat" item_state = "robe_coat" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 6c2069f490d..1b9343e7695 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -491,8 +491,17 @@ icon_state = "ert_peacekeeper" item_state = "ert_peacekeeper" -//warden armor +//unathi armor +/obj/item/clothing/suit/armor/unathi + name = "unathi body armor" + desc = "An armored chestplate designated to be worn by an unathi, used commonly by the hegemony levies." + icon = 'icons/obj/unathi_items.dmi' + icon_state = "unathi_armor" + item_state = "unathi_armor" + contained_sprite = 1 + species_restricted = list("Unathi") + armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) //All of the armor below is mostly unused diff --git a/code/modules/clothing/under/xenos/unathi.dm b/code/modules/clothing/under/xenos/unathi.dm new file mode 100644 index 00000000000..1096796f7c0 --- /dev/null +++ b/code/modules/clothing/under/xenos/unathi.dm @@ -0,0 +1,7 @@ +/obj/item/clothing/under/unathi + name = "sinta tunic" + desc = "A tunic common on both Moghes and Ouerea, it's simple and easy to manufacture design makes it universally favorable." + icon = 'icons/obj/unathi_items.dmi' + icon_state = "unathi_tunic" + item_state = "unathi_tunic" + contained_sprite = 1 diff --git a/html/changelogs/alberyk-unathi.yml b/html/changelogs/alberyk-unathi.yml new file mode 100644 index 00000000000..744e9fad90a --- /dev/null +++ b/html/changelogs/alberyk-unathi.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - rscadd: "Added a new unathi clothing to the loadout." diff --git a/icons/obj/clothing/robe_coat.dmi b/icons/obj/clothing/robe_coat.dmi deleted file mode 100644 index 0b996cfc6bd..00000000000 Binary files a/icons/obj/clothing/robe_coat.dmi and /dev/null differ diff --git a/icons/obj/unathi_items.dmi b/icons/obj/unathi_items.dmi new file mode 100644 index 00000000000..c4dc0f86ece Binary files /dev/null and b/icons/obj/unathi_items.dmi differ