From 3be7ca0d3167cb8c97ee057373e0d06d1e126a96 Mon Sep 17 00:00:00 2001 From: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com> Date: Tue, 23 Jan 2024 00:26:04 +1300 Subject: [PATCH] Izweski Hegemony Navy Uniform (#18238) * hegemony navy uniforms * loadout & cl --- .../crates_lockers/crates/gear_loadout.dm | 20 ++++++--- code/modules/clothing/under/xenos/unathi.dm | 18 ++++++++ .../RustingWithYou - izweskiuniform.yml | 41 ++++++++++++++++++ icons/clothing/under/uniforms/izweski.dmi | Bin 0 -> 1022 bytes .../hegemony_corvette/hegemony_ghostroles.dm | 21 ++------- 5 files changed, 77 insertions(+), 23 deletions(-) create mode 100644 html/changelogs/RustingWithYou - izweskiuniform.yml create mode 100644 icons/clothing/under/uniforms/izweski.dmi 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 b247a885700..f51ff2672aa 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -559,27 +559,33 @@ new /obj/item/ammo_magazine/mc9mm(src) /obj/structure/closet/crate/secure/gear_loadout/hegemony/fill() - new/obj/item/clothing/under/unathi(src) - new/obj/item/clothing/under/unathi(src) - new/obj/item/clothing/under/unathi(src) - new/obj/item/clothing/under/unathi(src) + new/obj/item/clothing/under/unathi/izweski(src) + new/obj/item/clothing/under/unathi/izweski(src) + new/obj/item/clothing/under/unathi/izweski(src) + new/obj/item/clothing/under/unathi/izweski(src) + new/obj/item/clothing/under/unathi/izweski/officer(src) new /obj/item/clothing/head/helmet/space/void/hegemony(src) new /obj/item/clothing/head/helmet/space/void/hegemony(src) new /obj/item/clothing/head/helmet/space/void/hegemony(src) + new /obj/item/clothing/head/helmet/space/void/hegemony/specialist(src) new /obj/item/clothing/head/helmet/space/void/hegemony/captain(src) new /obj/item/clothing/suit/space/void/hegemony(src) new /obj/item/clothing/suit/space/void/hegemony(src) new /obj/item/clothing/suit/space/void/hegemony(src) + new /obj/item/clothing/suit/space/void/hegemony/specialist(src) new /obj/item/clothing/suit/space/void/hegemony/captain(src) new /obj/item/clothing/suit/armor/unathi/klax(src) new /obj/item/clothing/head/helmet/unathi/klax(src) new /obj/item/gun/energy/rifle/hegemony(src) new /obj/item/gun/energy/rifle/hegemony(src) new /obj/item/gun/energy/rifle/hegemony(src) + new /obj/item/gun/energy/rifle/hegemony(src) new /obj/item/gun/energy/pistol/hegemony(src) new /obj/item/gun/energy/pistol/hegemony(src) new /obj/item/gun/energy/pistol/hegemony(src) new /obj/item/gun/energy/pistol/hegemony(src) + new /obj/item/gun/energy/pistol/hegemony(src) + new /obj/item/melee/energy/sword/hegemony(src) new /obj/item/melee/energy/sword/hegemony(src) new /obj/item/melee/energy/sword/hegemony(src) new /obj/item/melee/energy/sword/hegemony(src) @@ -604,7 +610,7 @@ new /obj/item/material/twohanded/pike/flag/hegemony(src) /obj/structure/closet/crate/secure/gear_loadout/hegemony/single/fill() - new/obj/item/clothing/under/unathi(src) + new/obj/item/clothing/under/unathi/izweski(src) new /obj/item/clothing/head/helmet/space/void/hegemony(src) new /obj/item/clothing/suit/space/void/hegemony(src) new /obj/item/gun/energy/rifle/hegemony(src) @@ -625,7 +631,7 @@ new /obj/item/clothing/suit/space/void/kataphract(src) new /obj/item/clothing/suit/space/void/kataphract(src) new /obj/item/clothing/suit/space/void/kataphract(src) - new /obj/item/rig/unathi/fancy(src) + new /obj/item/rig/unathi/fancy/equipped(src) new /obj/item/gun/energy/pistol/hegemony(src) new /obj/item/gun/energy/pistol/hegemony(src) new /obj/item/gun/energy/pistol/hegemony(src) @@ -634,6 +640,8 @@ new /obj/item/melee/energy/sword/hegemony(src) new /obj/item/melee/energy/sword/hegemony(src) new /obj/item/melee/energy/sword/hegemony(src) + new /obj/item/melee/energy/sword/hegemony(src) + new /obj/item/shield/energy/hegemony/kataphract(src) new /obj/item/shield/energy/hegemony/kataphract(src) new /obj/item/shield/energy/hegemony/kataphract(src) new /obj/item/shield/energy/hegemony/kataphract(src) diff --git a/code/modules/clothing/under/xenos/unathi.dm b/code/modules/clothing/under/xenos/unathi.dm index 65d9a615adb..475357f2cf6 100644 --- a/code/modules/clothing/under/xenos/unathi.dm +++ b/code/modules/clothing/under/xenos/unathi.dm @@ -93,3 +93,21 @@ build_from_parts = TRUE worn_overlay = "belt" has_accents = TRUE + +/obj/item/clothing/under/unathi/izweski + name = "izweski navy uniform" + desc = "A lightweight red jumpsuit with a brown-orange vest, this uniform is an odd fusion of modern design and traditional Unathi aesthetics. Its insignia indicates it as belonging to a soldier of the Izweski Hegemony's Navy." + icon = 'icons/clothing/under/uniforms/izweski.dmi' + icon_state = "izweski" + item_state = "izweski" + armor = list( + melee = ARMOR_MELEE_SMALL, + bullet = ARMOR_BALLISTIC_MINOR, + laser = ARMOR_LASER_MINOR + ) + +/obj/item/clothing/under/unathi/izweski/officer + name = "izweski navy officer's uniform" + desc = "A lightweight red jumpsuit with a brown-orange vest, this uniform is an odd fusion of modern design and traditional Unathi aesthetics. Its golden ornamentation indicates it as belonging to an officer of the Izweski Hegemony's Navy." + icon_state = "izweski_officer" + item_state = "izweski_officer" diff --git a/html/changelogs/RustingWithYou - izweskiuniform.yml b/html/changelogs/RustingWithYou - izweskiuniform.yml new file mode 100644 index 00000000000..a058f3a3c81 --- /dev/null +++ b/html/changelogs/RustingWithYou - izweskiuniform.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: RustingWithYou + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds Izweski Hegemony navy uniforms." diff --git a/icons/clothing/under/uniforms/izweski.dmi b/icons/clothing/under/uniforms/izweski.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c7f1c5f0eef5715e0511b56c89115699de7fa9ea GIT binary patch literal 1022 zcmV8PAwu@eQ6#-sR>a=5^$_D zO)8a2rFzMj&maHFy8hwpo8v`)p3UpyZ#ips-)<;h8Gp$4-b}{(aRvAxfFAyn1Y#F*Ur9<)sO()b;KI)*9rElO!@PZrk)0_qk>;{hPT`jPUd zgm?f+6=WA$Yr*9=$L~8p0>p>N9cT}cJ0Ogge6b+AzCOJJX8}H*BK-2yo8u)P&gmu! zV4ka~^GpGl&1W99tdCa}Rv%wdT;I3~6I5pi0vL}z1Hk(dz+^X{{4o;7OMWkyxB@}a z__OmXz%Ky68_Zl|$ycdVDwXOd=*SNhT_fcOk`HskOQV2bux4aP`GK4-K;r&>Sldqcs00EjvK3yT zpRog(-+_GP4)ms#>))Rq-QAv3&j$*h4-_UJ_zr?nq$;O#lD@07*qoM6N<$f{EP8;{X5v literal 0 HcmV?d00001 diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm index b0fa9088f8d..67c63ab01cc 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm @@ -52,7 +52,6 @@ max_count = 1 assigned_role = "Izweski Navy Specialist" special_role = "Izweski Navy Specialist" - mob_name_prefix = "Ens. " /datum/ghostspawner/human/izweski/warpriest short_name = "heg_pri" @@ -70,7 +69,7 @@ /datum/outfit/admin/izweski name = "Izweski Crewman" - uniform = /obj/item/clothing/under/unathi + uniform = /obj/item/clothing/under/unathi/izweski belt = /obj/item/melee/energy/sword/hegemony shoes = /obj/item/clothing/shoes/sandals/caligae id = /obj/item/card/id/distress/kataphract @@ -83,17 +82,12 @@ /obj/item/storage/box/donkpockets = 1 ) -/datum/outfit/admin/izweski/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - if(H?.w_uniform) - H.w_uniform.color = pick("#1f8c3c", "#ab7318", "#1846ba") - H.w_uniform.accent_color = H.w_uniform.color - /datum/outfit/admin/izweski/get_id_access() return list(ACCESS_KATAPHRACT, ACCESS_EXTERNAL_AIRLOCKS) /datum/outfit/admin/izweski/klax - uniform = /obj/item/clothing/under/vaurca + uniform = /obj/item/clothing/under/unathi/izweski mask = /obj/item/clothing/mask/gas/vaurca/filter belt = /obj/item/melee/energy/sword/hegemony shoes = /obj/item/clothing/shoes/vaurca @@ -113,12 +107,6 @@ H.internal = preserve H.internals.icon_state = "internal1" - var/uniform_colour = pick("#1f8c3c", "#ab7318", "#1846ba") - if(H?.w_uniform) - H.w_uniform.color = uniform_colour - if(H?.shoes) - H.shoes.color = uniform_colour - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/klax(H) var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) A.replaced(H, affected) @@ -126,8 +114,7 @@ /datum/outfit/admin/izweski/captain name = "Hegemony Navy Captain" - uniform = /obj/item/clothing/under/unathi/mogazali/orange - suit = /obj/item/clothing/suit/unathi/robe/robe_coat/orange + uniform = /obj/item/clothing/under/unathi/izweski/officer /datum/outfit/admin/izweski/captain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -136,6 +123,6 @@ /datum/outfit/admin/izweski/priest name = "Hegemony Warpriest" - uniform = /obj/item/clothing/under/unathi/mogazali + uniform = /obj/item/clothing/under/unathi/izweski /datum/outfit/admin/izweski/priest/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)