diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm index 5072a2eb204..6ec19c86979 100644 --- a/code/modules/client/preference_setup/loadout/items/factions.dm +++ b/code/modules/client/preference_setup/loadout/items/factions.dm @@ -452,6 +452,53 @@ GLOBAL_DATUM_INIT(gear_tweak_modsuit_configuration, /datum/gear_tweak/modsuit_co gear_tweaks += new /datum/gear_tweak/path(pmcg_sec_uniforms) gear_tweaks += list(GLOB.gear_tweak_uniform_rolled_state) +/datum/gear/faction/kog_sec_uniform + display_name = "Kazarrhaldiye Operations Group security uniform" + path = /obj/item/clothing/under/rank/security/pmc/kog/uniform + slot = slot_w_uniform + faction = "Private Military Contracting Group" + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + allowed_roles = list("Security Officer", "Warden", "Head of Security", "Security Personnel") + +/datum/gear/faction/kog_jacket_officer + display_name = "Kazarrhaldiye Operations Group officer jacket" + path = /obj/item/clothing/suit/storage/toggle/armor/kog/officer + slot = slot_wear_suit + faction = "Private Military Contracting Group" + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + allowed_roles = list("Security Officer", "Security Personnel") + +/datum/gear/faction/kog_jacket_warden + display_name = "Kazarrhaldiye Operations Group warden jacket" + path = /obj/item/clothing/suit/storage/toggle/armor/kog/warden + slot = slot_wear_suit + faction = "Private Military Contracting Group" + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + allowed_roles = list("Warden", "Security Personnel") + +/datum/gear/faction/kog_jacket_commander + display_name = "Kazarrhaldiye Operations Group head of security jacket" + path = /obj/item/clothing/suit/storage/toggle/armor/kog/commander + slot = slot_wear_suit + faction = "Private Military Contracting Group" + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI) + allowed_roles = list("Head of Security", "Security Personnel") + +/datum/gear/faction/kog_tabs + display_name = "KOG Shoulder Tabs" + path = /obj/item/clothing/accessory/sleevepatch/kog + slot = slot_tie + faction = "Private Military Contracting Group" + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + +/datum/gear/faction/kog_tabs/New() + ..() + var/list/kog_tabs = list() + kog_tabs["Motorheads, PRA"] = /obj/item/clothing/accessory/sleevepatch/kog/pra + kog_tabs["Last Chancers, DPRA/ALA"] = /obj/item/clothing/accessory/sleevepatch/kog/ala + kog_tabs["Starry Knights, NKA"] = /obj/item/clothing/accessory/sleevepatch/kog/nka + gear_tweaks += new /datum/gear_tweak/path(kog_tabs) + /datum/gear/faction/erisec_patch display_name = "EPMC sleeve patch" path = /obj/item/clothing/accessory/sleevepatch/erisec @@ -520,6 +567,22 @@ GLOBAL_DATUM_INIT(gear_tweak_modsuit_configuration, /datum/gear_tweak/modsuit_co faction = "Private Military Contracting Group" allowed_roles = list("Medical Intern", "Medical Personnel") +/datum/gear/faction/kog_uniform_med + display_name = "Kazarrhaldiye Operations Group medical uniform" + path = /obj/item/clothing/under/rank/medical/pmc/kog/medical + slot = slot_w_uniform + faction = "Private Military Contracting Group" + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + allowed_roles = list("Medical Intern", "Paramedic","Physician","Surgeon", "Psychiatrist", "Medical Personnel") + +/datum/gear/faction/kog_jacket_med + display_name = "Kazarrhaldiye Operations Group medical jacket" + path = /obj/item/clothing/suit/storage/toggle/labcoat/kog + slot = slot_wear_suit + faction = "Private Military Contracting Group" + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + allowed_roles = list("Medical Intern", "Paramedic","Physician","Surgeon", "Psychiatrist", "Medical Personnel") + /datum/gear/faction/epmc_uniform_para_med display_name = "PMCG/EPMC paramedic uniform" path = /obj/item/clothing/under/rank/medical/paramedic/pmc/epmc diff --git a/code/modules/clothing/factions/pmcg.dm b/code/modules/clothing/factions/pmcg.dm index 1d743ccd7cf..567cd8ff23c 100644 --- a/code/modules/clothing/factions/pmcg.dm +++ b/code/modules/clothing/factions/pmcg.dm @@ -139,3 +139,64 @@ desc_extended = "More rugged than traditional medical attire, Nexus's uniforms are designed to be comfortable in every environment, be it the sterile hallways of a Mendell clinic or the battered roads of Mictlan." icon_state = "nexus_med" item_state = "nexus_med" + +/obj/item/clothing/under/rank/security/pmc/kog/uniform + name = "Kazarrhaldiye Operations Group security uniform" + desc= "A uniform used by employees of Kazarrhaldiye Operations Group, a Tajaran mercenary company originating from Little Adhomai." + desc_extended = "Kazarrhaldiye Operations Group uniforms are based on First Revolution-era naval uniforms. With modern clothing materials, these uniforms were redesigned to be much lighter and breathable for use in Human-environments. Despite the white coloration, a holdover from the snowy fields of Adhomai, the uniform remains popular." + icon_state = "kog_security" + item_state = "kog_security" + contained_sprite = TRUE + no_overheat = TRUE + +/obj/item/clothing/under/rank/medical/pmc/kog/medical + name = "Kazarrhaldiye Operations Group medical uniform" + desc= "A uniform used by employees of Kazarrhaldiye Operations Group, a Tajaran mercenary company originating from Little Adhomai. The green accents identifies the wearer as a member of the KOG's medical corp, also known as Messa's Men." + desc_extended = "Kazarrhaldiye Operations Group uniforms are based on First Revolution-era naval uniforms. With modern clothing materials, these uniforms were redesigned to be much lighter and breathable for use in Human-environments. Despite the white coloration, a holdover from the snowy fields of Adhomai, the uniform remains popular." + icon_state = "kog_medical" + item_state = "kog_medical" + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/toggle/armor/kog/ + icon = 'icons/obj/item/clothing/department_uniforms/security.dmi' + contained_sprite = TRUE + opened = FALSE + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + armor = list( + MELEE = ARMOR_MELEE_KNIVES, + BULLET = ARMOR_BALLISTIC_PISTOL, + LASER = ARMOR_LASER_SMALL, + ENERGY = ARMOR_ENERGY_MINOR, + BOMB = ARMOR_BOMB_PADDED + ) + +/obj/item/clothing/suit/storage/toggle/armor/kog/officer + name = "Kazarrhaldiye Operations Group officer jacket" + desc= "A jacket used by employees of Kazarrhaldiye Operations Group, a Tajaran mercenary company originating from Little Adhomai. The bronze trim identifies the wearer as a Security Officer." + desc_extended = "Kazarrhaldiye Operations Group uniform jackets were originally based on First Revolution-era designs made with modern materials. These rugged and durable jackets were popular across the mercenary group for being a fashionable yet practical part of the uniform. Following the first SCC-based contracts by the KOG, many jackets were refitted to utilize special trims denoting role." + icon_state = "kog_officer" + item_state = "kog_officer" + + +/obj/item/clothing/suit/storage/toggle/armor/kog/warden + name = "Kazarrhaldiye Operations Group warden jacket" + desc= "A jacket used by employees of Kazarrhaldiye Operations Group, a Tajaran mercenary company originating from Little Adhomai. The silver trim identifies the wearer as a Warden." + desc_extended = "Kazarrhaldiye Operations Group uniform jackets were originally based on First Revolution-era designs made with modern materials. These rugged and durable jackets were popular across the mercenary group for being a fashionable yet practical part of the uniform. Following the first SCC-based contracts by the KOG, many jackets were refitted to utilize special trims denoting role." + icon_state = "kog_warden" + item_state = "kog_warden" + +/obj/item/clothing/suit/storage/toggle/armor/kog/commander + name = "Kazarrhaldiye Operations Group head of security jacket" + desc= "A jacket used by employees of Kazarrhaldiye Operations Group, a Tajaran mercenary company originating from Little Adhomai. The gold trim identifies the wearer as a Head of Security." + desc_extended = "Kazarrhaldiye Operations Group uniform jackets were originally based on First Revolution-era designs made with modern materials. These rugged and durable jackets were popular across the mercenary group for being a fashionable yet practical part of the uniform. Following the first SCC-based contracts by the KOG, many jackets were refitted to utilize special trims denoting role." + icon_state = "kog_commander" + item_state = "kog_commander" + +/obj/item/clothing/suit/storage/toggle/labcoat/kog + icon = 'icons/obj/item/clothing/department_uniforms/medical.dmi' + name = "Kazarrhaldiye Operations Group medical jacket" + desc= "A jacket used by employees of Kazarrhaldiye Operations Group, a Tajaran mercenary company originating from Little Adhomai. The bronze trim identifies the wearer as a member of the KOG's medical corp, also known as Messa's Men." + desc_extended = "Kazarrhaldiye Operations Group uniform jackets were originally based on First Revolution-era designs made with modern materials. These rugged and durable jackets were popular across the mercenary group for being a fashionable yet practical part of the uniform. Following the first SCC-based contracts by the KOG, many jackets were refitted to utilize special trims denoting role." + icon_state = "kog_medical_jacket" + item_state = "kog_medical_jacket" + opened = FALSE diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index b7ed310dbc3..34b23a42b25 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -995,6 +995,30 @@ icon_state = "idrissec_patch" overlay_state = "idrissec_patch" +/obj/item/clothing/accessory/sleevepatch/kog/pra + name = "\improper KOG Motorheads shoulder tabs" + desc = "A patch attached to the shoulders of a uniform or armor. This one denotes the wearer as a member of KOG's PRA division the Motorheads." + desc_extended = "Kazarrhaldiye Operations Group splits employees based on nationality to remove possible political tensions. The PRA division, called the Motorheads, specializes in motorized warfare and quick response force operations." + icon_state = "kog_tabs_pra" + overlay_state = "kog_tabs_pra" + flippable = 0 + +/obj/item/clothing/accessory/sleevepatch/kog/ala + name = "\improper KOG Last Chancers shoulder tabs" + desc = "A patch attached to the shoulders of a uniform or armor. This one denotes the wearer as a member of KOG's DPRA/ALA division the Last Chancers." + desc_extended = "Kazarrhaldiye Operations Group splits employees based on nationality to remove possible political tensions. The ALA/DPRA division, known as the Last Chancers, focus on sabatoge and explosives. They have become infamous for nighttime infiltrations wherein their explosive expertise leads to devastating effects." + icon_state = "kog_tabs_ala" + overlay_state = "kog_tabs_ala" + flippable = 0 + +/obj/item/clothing/accessory/sleevepatch/kog/nka + name = "\improper KOG Starry Knights shoulder tabs" + desc = "A patch attached to the shoulders of a uniform or armor. This one denotes the wearer as a member of KOG's NKA division the Starry Knights." + desc_extended = "Kazarrhaldiye Operations Group splits employees based on nationality to remove possible political tensions. The NKA divison, called the Starry Knights, are the defensive experts of the KOG. Using datasets regarding various entities of the Spur, the Starry Knights are capable of preparing an adaptable and formidable defense." + icon_state = "kog_tabs_nka" + overlay_state = "kog_tabs_nka" + flippable = 0 + /obj/item/clothing/accessory/kneepads name = "kneepads" desc = "A pair of synthetic kneepads. Doesn't provide protection from more than arthritis." diff --git a/html/changelogs/CatsinHD - koguniforms.yml b/html/changelogs/CatsinHD - koguniforms.yml new file mode 100644 index 00000000000..5da2308fd99 --- /dev/null +++ b/html/changelogs/CatsinHD - koguniforms.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: CatsinHD + +# 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: "Added uniforms for Security and Medical roles for Kazarrhaldiye Operations Group." + - rscadd: "Added jackets for Security Officers, Wardens, Heads of Security, and Medical roles for Kazarrhaldiye Operations Group." + - rscadd: "Added shoulder tabs for PRA, DPRA/ALA, and NKA members of Kazarrhaldiye Operations Group." diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 46229371f6f..b7b014758ef 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 7a4b8a3fb1a..7c4457df841 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/item/clothing/department_uniforms/medical.dmi b/icons/obj/item/clothing/department_uniforms/medical.dmi index c39715af475..6cd809f23bf 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 6dbbf02ecc2..c63ad75e9fc 100644 Binary files a/icons/obj/item/clothing/department_uniforms/security.dmi and b/icons/obj/item/clothing/department_uniforms/security.dmi differ