diff --git a/code/modules/client/preference_setup/loadout/items/accessories.dm b/code/modules/client/preference_setup/loadout/items/accessories.dm index c1a1e29f960..ed829f410a9 100644 --- a/code/modules/client/preference_setup/loadout/items/accessories.dm +++ b/code/modules/client/preference_setup/loadout/items/accessories.dm @@ -626,6 +626,10 @@ flagpatch_national["flagpatch, nralakk"] = /obj/item/clothing/accessory/flagpatch/nralakk flagpatch_national["flagpatch, hegemony"] = /obj/item/clothing/accessory/flagpatch/hegemony flagpatch_national["flagpatch, port antillia"] = /obj/item/clothing/accessory/flagpatch/portantillia + flagpatch_national["flagpatch, sedantis"] = /obj/item/clothing/accessory/flagpatch/sedantis + flagpatch_national["flagpatch, zo'ra"] = /obj/item/clothing/accessory/flagpatch/zora + flagpatch_national["flagpatch, k'lax"] = /obj/item/clothing/accessory/flagpatch/klax + flagpatch_national["flagpatch, c'thur"] = /obj/item/clothing/accessory/flagpatch/cthur gear_tweaks += new /datum/gear_tweak/path(flagpatch_national) /datum/gear/accessory/aodai diff --git a/code/modules/client/preference_setup/loadout/items/augments.dm b/code/modules/client/preference_setup/loadout/items/augments.dm index 09981b32ab9..b90690f09f2 100644 --- a/code/modules/client/preference_setup/loadout/items/augments.dm +++ b/code/modules/client/preference_setup/loadout/items/augments.dm @@ -251,7 +251,7 @@ display_name = "phalanx facial plate" description = "This modular face plate accommodates a wide array of cybernetic augmentations, enabling seamless integration with Phalanx's transhumanist doctrine. Enhanced sensory overlays and HUDs offer Phalanx members superior situational awareness and promote a sense of hive-thinking." path = /obj/item/organ/internal/augment/eye_sensors/phalanx - whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Medical Personnel", "Security Officer", "Head of Security", "Warden", "Security Cadet", "Investigator", "Security Personnel", "Corporate Liaison", "Assistant", "Off-Duty Crew Member", "Captain") + whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI) + allowed_roles = list("Physician", "Surgeon", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Medical Personnel", "Security Officer", "Warden", "Security Cadet", "Investigator", "Security Personnel", "Corporate Liaison", "Assistant", "Off-Duty Crew Member") faction = "Private Military Contracting Group" cost = 1 diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm index 6df747b0da8..4890b457e43 100644 --- a/code/modules/client/preference_setup/loadout/items/factions.dm +++ b/code/modules/client/preference_setup/loadout/items/factions.dm @@ -457,6 +457,22 @@ wildlands_flag_patches["flagpatch, southern solarian military district"] = /obj/item/clothing/accessory/flagpatch/ssmd gear_tweaks += new /datum/gear_tweak/path(wildlands_flag_patches) +/datum/gear/faction/vekatak_rep + display_name = "ve'katak phalanx representative uniform" + path = /obj/item/clothing/under/rank/pmc/vekatak_phalanx + flags = GEAR_HAS_DESC_SELECTION + allowed_roles = list("Corporate Liaison") + faction = "Private Military Contracting Group" + slot = slot_w_uniform + +/datum/gear/faction/vekatak_res + display_name = "ve'katak phalanx reserve uniform" + path = /obj/item/clothing/under/rank/pmc/vekatak_phalanx/reserve + flags = GEAR_HAS_DESC_SELECTION + allowed_roles = list("Assistant", "Off-Duty Crew Member") + faction = "Private Military Contracting Group" + slot = slot_w_uniform + //Zeng-Hu /datum/gear/faction/zenghu_beret display_name = "zeng-hu headwear selection" diff --git a/code/modules/clothing/factions/pmcg.dm b/code/modules/clothing/factions/pmcg.dm index cb0bb25bc50..330ff572476 100644 --- a/code/modules/clothing/factions/pmcg.dm +++ b/code/modules/clothing/factions/pmcg.dm @@ -86,3 +86,18 @@ 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" + +/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/clothing/under/uniforms/pmcg.dmi' + icon_state = "phalanx-rep_jumpsuit" + item_state = "phalanx-rep_jumpsuit" + 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" diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm index 12fd5c72038..9c0d50c8fc4 100644 --- a/code/modules/clothing/suits/modular_armor.dm +++ b/code/modules/clothing/suits/modular_armor.dm @@ -696,6 +696,35 @@ icon_state = "flagpatch_portantillia" item_state = "flagpatch_portantillia" +/obj/item/clothing/accessory/flagpatch/zora + name = "zo'ra hive flagpatch" + desc = "A flagpatch representing the Zo'ra Hive. This flag depicts the Zo'rane capital world of Caprice, \ + bearing a torch representing their position within the Republic of Biesel." + icon_state = "flagpatch_zora" + item_state = "flagpatch_zora" + +/obj/item/clothing/accessory/flagpatch/klax + name = "k'lax hive flagpatch" + desc = "A flagpatch representing the K'lax Hive. This flag depicts the K'laxian capital world of Tret, \ + bearing the quartered colours of the Izweski Hegemony to represent the Hive's vassalage." + icon_state = "flagpatch_klax" + item_state = "flagpatch_klax" + +/obj/item/clothing/accessory/flagpatch/cthur + name = "c'thur hive flagpatch" + desc = "A flagpatch representing the C'thur Hive. This flag depicts the star borne by the Nralakk Federation's \ + own flag, representing the Hive's independence and gracious allegiance toward the Federation." + icon_state = "flagpatch_cthur" + item_state = "flagpatch_cthur" + +/obj/item/clothing/accessory/flagpatch/sedantis + name = "sedantis flagpatch" + desc = "A flagpatch representing the gas giant Sedantis and it's orbiting bodies. Sedantis I, also known as \ + Vaur'avek'uyit, was the homeworld of the Vaurca. Symbolism involving it is often employed to represent greater \ + pan-Vaurcaesian interests over the interests of the individual Hives." + icon_state = "flagpatch_sedantis" + item_state = "flagpatch_sedantis" + // Wildlands /obj/item/clothing/accessory/flagpatch/fsf diff --git a/html/changelogs/SimpleMaroon-vekataksovl.yml b/html/changelogs/SimpleMaroon-vekataksovl.yml new file mode 100644 index 00000000000..a713ef53ed5 --- /dev/null +++ b/html/changelogs/SimpleMaroon-vekataksovl.yml @@ -0,0 +1,44 @@ +################################ +# 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: SimpleMaroon + +# 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 2 new uniforms for the Ve'katak Phalanx." + - bugfix: "Fixes minor spriting issues with the existing Ve'katak uniforms." + - rscadd: "Adds four new flagpatches (Sedantis, Zo'ra, K'lax, C'thur)." + - bugfix: "Fixes minor issues with the Ve'katak faceplate." diff --git a/icons/clothing/kit/modular_armor_accessories.dmi b/icons/clothing/kit/modular_armor_accessories.dmi index a21ea64f183..e5ecf1c8df0 100644 Binary files a/icons/clothing/kit/modular_armor_accessories.dmi and b/icons/clothing/kit/modular_armor_accessories.dmi differ diff --git a/icons/clothing/under/uniforms/pmcg.dmi b/icons/clothing/under/uniforms/pmcg.dmi new file mode 100644 index 00000000000..df6627a602e Binary files /dev/null and b/icons/clothing/under/uniforms/pmcg.dmi differ diff --git a/icons/obj/item/clothing/department_uniforms/medical.dmi b/icons/obj/item/clothing/department_uniforms/medical.dmi index b202d28d711..5d35500a758 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 3b1f573c05f..f5a5cf21fd8 100644 Binary files a/icons/obj/item/clothing/department_uniforms/security.dmi and b/icons/obj/item/clothing/department_uniforms/security.dmi differ