diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm index fc2985c9431..bb03ee30b03 100644 --- a/code/modules/client/preference_setup/loadout/items/factions.dm +++ b/code/modules/client/preference_setup/loadout/items/factions.dm @@ -530,6 +530,7 @@ GLOBAL_DATUM_INIT(gear_tweak_modsuit_configuration, /datum/gear_tweak/modsuit_co var/list/epmc_uniform_phys_med = list() epmc_uniform_phys_med["PMCG physician uniform"] = /obj/item/clothing/under/rank/medical/pmc/alt epmc_uniform_phys_med["Nexus Corporate Security medic uniform"] = /obj/item/clothing/under/rank/medical/pmc/nexus + epmc_uniform_phys_med["Ve'katak Phalanx medical uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/vekatak_phalanx gear_tweaks += new /datum/gear_tweak/path(epmc_uniform_phys_med) /datum/gear/faction/epmc_uniform_pharm_med @@ -596,7 +597,7 @@ GLOBAL_DATUM_INIT(gear_tweak_modsuit_configuration, /datum/gear_tweak/modsuit_co epmc_uniform_para_med["EPMC paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/epmc epmc_uniform_para_med["PMCG paramedic uniform, alt"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/alt epmc_uniform_para_med["Sekhmet Intergalactic paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/sekh - epmc_uniform_para_med["Ve'katak Phalanx paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/vekatak_phalanx + epmc_uniform_para_med["Ve'katak Phalanx medical uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/vekatak_phalanx epmc_uniform_para_med["Nexus Corporate Security paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/nexus gear_tweaks += new /datum/gear_tweak/path(epmc_uniform_para_med) diff --git a/code/modules/clothing/factions/pmcg.dm b/code/modules/clothing/factions/pmcg.dm index 567cd8ff23c..9bd2bc3a88f 100644 --- a/code/modules/clothing/factions/pmcg.dm +++ b/code/modules/clothing/factions/pmcg.dm @@ -84,32 +84,39 @@ /obj/item/clothing/under/rank/security/pmc/vekatak_phalanx name = "\improper Ve'katak Phalanx security uniform" - desc = "A uniform used by the forces of the Ve'katak Phalanx, a Vaurca-run private military company. This one has the standard red shoulder stripes, as well as pale blue ornamentation, identifying it as belonging to a Phalanx member in the employ of the Private Military Contracting Group." + desc = "A uniform used by the forces of the Ve'katak Phalanx, a Vaurca-run private military company. This one has red shoulder stripes, identifying it as belonging to a standard Phalanx member in active service." desc_extended = "These uniforms are designed to fit under the combat hardsuits favored by the Phalanx. They are utilitarian in design, and reportedly somewhat uncomfortable - though few of the non-Vaurcae bold enough to join Ve'katak seem to complain." - icon_state = "phalanx-sec-jumpsuit" - item_state = "phalanx-sec-jumpsuit" + icon_state = "phalanx_sec" + item_state = "phalanx_sec" + +/obj/item/clothing/under/rank/security/pmc/vekatak_phalanx/leader + name = "\improper Ve'katak Phalanx squad leader uniform" + desc = "A uniform used by the forces of the Ve'katak Phalanx, a Vaurca-run private military company. This one has amber shoulder stripes, identifying it as belonging to a Phalanx member responsible for command and coordination of a squad." + desc_extended = "These uniforms are designed to fit under the combat hardsuits favored by the Phalanx. They are utilitarian in design, and reportedly somewhat uncomfortable - though few of the non-Vaurcae bold enough to join Ve'katak seem to complain." + icon_state = "phalanx_lead" + item_state = "phalanx_lead" /obj/item/clothing/under/rank/medical/paramedic/pmc/vekatak_phalanx name = "\improper Ve'katak Phalanx medical uniform" - desc = "A uniform used by the forces of the Ve'katak Phalanx, a Vaurca-run private military company. This one has dark blue shoulder stripes and ornamentation, identifying it as belonging to a Phalanx medic in the employ of the Private Military Contracting Group." + desc = "A uniform used by the forces of the Ve'katak Phalanx, a Vaurca-run private military company. This one has dark blue shoulder stripes, identifying it as belonging to a Phalanx member tasked with providing medical support to their assigned crew or squad." desc_extended = "These uniforms are designed to fit under the combat hardsuits favored by the Phalanx. They are utilitarian in design, and reportedly somewhat uncomfortable - though few of the non-Vaurcae bold enough to join Ve'katak seem to complain." - icon_state = "phalanx-med_jumpsuit" - item_state = "phalanx-med_jumpsuit" + icon_state = "phalanx_med" + item_state = "phalanx_med" /obj/item/clothing/under/rank/pmc/vekatak_phalanx name = "\improper Ve'katak Phalanx representative uniform" desc = "A uniform used by the forces of the Ve'katak Phalanx, a Vaurca-run private military company. This one has ice blue shoulder stripes, identifying it as belonging to a Phalanx member that is representing the direct interests of the Phalanx and their immediate employers." desc_extended = "These uniforms are designed to fit under the combat hardsuits favored by the Phalanx. They are utilitarian in design, and reportedly somewhat uncomfortable - though few of the non-Vaurcae bold enough to join Ve'katak seem to complain." icon = 'icons/obj/item/clothing/department_uniforms/service.dmi' - icon_state = "phalanx-rep_jumpsuit" - item_state = "phalanx-rep_jumpsuit" + icon_state = "phalanx_rep" + item_state = "phalanx_rep" contained_sprite = TRUE /obj/item/clothing/under/rank/pmc/vekatak_phalanx/reserve name = "\improper Ve'katak Phalanx reserve uniform" desc = "A uniform used by the forces of the Ve'katak Phalanx, a Vaurca-run private military company. This one has green shoulder stripes, identifying it as belonging to a Phalanx member that is not presently serving in an active combat role." - icon_state = "phalanx-res_jumpsuit" - item_state = "phalanx-res_jumpsuit" + icon_state = "phalanx_res" + item_state = "phalanx_res" /obj/item/clothing/under/rank/security/pmc/grupo_amapola name = "Grupo Amapola uniform" diff --git a/html/changelogs/flpfs-phalanxuniforms.yml b/html/changelogs/flpfs-phalanxuniforms.yml new file mode 100644 index 00000000000..020a364f569 --- /dev/null +++ b/html/changelogs/flpfs-phalanxuniforms.yml @@ -0,0 +1,60 @@ +################################ +# 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: RustingWithYou, GMR25, Flpfs + +# 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 a new Ve'katak Phalanx uniform for future off-ship use." + - imageadd: "Standardises the existing Ve'katak Phalanx uniforms." + - rscadd: "Allows physicians to take the Phalanx medical uniform in the loadout." diff --git a/icons/obj/item/clothing/department_uniforms/medical.dmi b/icons/obj/item/clothing/department_uniforms/medical.dmi index 86fc2f19d74..29f5ee5a282 100644 Binary files a/icons/obj/item/clothing/department_uniforms/medical.dmi and b/icons/obj/item/clothing/department_uniforms/medical.dmi differ diff --git a/icons/obj/item/clothing/department_uniforms/security.dmi b/icons/obj/item/clothing/department_uniforms/security.dmi index c63ad75e9fc..6420f97ae63 100644 Binary files a/icons/obj/item/clothing/department_uniforms/security.dmi and b/icons/obj/item/clothing/department_uniforms/security.dmi differ diff --git a/icons/obj/item/clothing/department_uniforms/service.dmi b/icons/obj/item/clothing/department_uniforms/service.dmi index 47ccabf2383..6b834f05bd2 100644 Binary files a/icons/obj/item/clothing/department_uniforms/service.dmi and b/icons/obj/item/clothing/department_uniforms/service.dmi differ