diff --git a/code/modules/client/preference_setup/loadout/loadout_factions.dm b/code/modules/client/preference_setup/loadout/loadout_factions.dm index 57f65d8f8ba..a4de2ca05dc 100644 --- a/code/modules/client/preference_setup/loadout/loadout_factions.dm +++ b/code/modules/client/preference_setup/loadout/loadout_factions.dm @@ -35,6 +35,7 @@ var/list/idris_sec_uniforms = list() idris_sec_uniforms["idris uniform"] = /obj/item/clothing/under/rank/security/idris/idrissec idris_sec_uniforms["idris uniform, alt"] = /obj/item/clothing/under/rank/security/idris/idrissec/alt + idris_sec_uniforms["idris detective uniform"] = /obj/item/clothing/under/det/idris/alt gear_tweaks += new /datum/gear_tweak/path(idris_sec_uniforms) /datum/gear/faction/idris_armband @@ -128,6 +129,7 @@ var/list/zavod_sec_uniforms = list() zavod_sec_uniforms["zavodskoi uniform"] = /obj/item/clothing/under/rank/security/zavod/zavodsec zavod_sec_uniforms["zavodskoi uniform, alt"] = /obj/item/clothing/under/rank/security/zavod/zavodsec/alt + zavod_sec_uniforms["zavodskoi detective uniform"] = /obj/item/clothing/under/det/zavod/alt gear_tweaks += new /datum/gear_tweak/path(zavod_sec_uniforms) /datum/gear/faction/zavodskoi_labcoat @@ -191,6 +193,9 @@ pmc_sunglasses["HUDsunglasses, PMCG"] = /obj/item/clothing/glasses/sunglasses/sechud/pmc pmc_sunglasses["fat HUDsunglasses, PMCG"] = /obj/item/clothing/glasses/sunglasses/sechud/big/pmc pmc_sunglasses["aviator sunglasses, PMCG"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator/pmc + pmc_sunglasses["HUDsunglasses alt, PMCG"] = /obj/item/clothing/glasses/sunglasses/sechud/pmc/alt + pmc_sunglasses["fat HUDsunglasses alt, PMCG"] = /obj/item/clothing/glasses/sunglasses/sechud/big/pmc/alt + pmc_sunglasses["aviator sunglasses alt, PMCG"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator/pmc/alt gear_tweaks += new /datum/gear_tweak/path(pmc_sunglasses) /datum/gear/faction/pmc_labcoat @@ -246,6 +251,7 @@ var/list/pmcg_sec_uniforms = list() pmcg_sec_uniforms["EPMC uniform"] = /obj/item/clothing/under/rank/security/pmc/epmc pmcg_sec_uniforms["EPMC uniform, alt"] = /obj/item/clothing/under/rank/security/pmc/epmc/alt + pmcg_sec_uniforms["EPMC detective uniform"] = /obj/item/clothing/under/det/pmc/alt gear_tweaks += new /datum/gear_tweak/path(pmcg_sec_uniforms) /datum/gear/faction/erisec_patch @@ -261,13 +267,56 @@ slot = slot_tie faction = "Private Military Contracting Group" +/datum/gear/faction/pmc_patch/New() + ..() + var/list/pmc_patch = list() + pmc_patch["PMCG armband"] = /obj/item/clothing/accessory/armband/pmc + pmc_patch["PMCG armband, alt"] = /obj/item/clothing/accessory/armband/pmc/alt + gear_tweaks += new /datum/gear_tweak/path(pmc_patch) + +/datum/gear/faction/epmc_uniform_phys_med + display_name = "PMCG physician uniform" + path = /obj/item/clothing/under/rank/medical/pmc/alt + slot = slot_w_uniform + faction = "Private Military Contracting Group" + allowed_roles = list("Physician") + +/datum/gear/faction/epmc_uniform_pharm_med + display_name = "PMCG pharmacist uniform" + path = /obj/item/clothing/under/rank/medical/pharmacist/pmc/alt + slot = slot_w_uniform + faction = "Private Military Contracting Group" + allowed_roles = list("Pharmacist") + +/datum/gear/faction/epmc_uniform_psych_med + display_name = "PMCG psychiatrist uniform" + path = /obj/item/clothing/under/rank/medical/psych/pmc/alt + slot = slot_w_uniform + faction = "Private Military Contracting Group" + allowed_roles = list("Psychiatrist") + +/datum/gear/faction/epmc_uniform_intern_med + display_name = "PMCG medical intern uniform" + path = /obj/item/clothing/under/rank/medical/intern/pmc/alt + slot = slot_w_uniform + faction = "Private Military Contracting Group" + allowed_roles = list("Medical Intern") + /datum/gear/faction/epmc_uniform_fr_med - display_name = "EPMC first responder uniform" + display_name = "PMCG/EPMC first responder uniform" path = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc slot = slot_w_uniform faction = "Private Military Contracting Group" allowed_roles = list("First Responder") +/datum/gear/faction/epmc_uniform_fr_med/New() + ..() + var/list/epmc_uniform_fr_med = list() + epmc_uniform_fr_med["EPMC first responder uniform"] = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc + epmc_uniform_fr_med["PMCG first responder uniform, alt"] = /obj/item/clothing/under/rank/medical/first_responder/pmc/alt + epmc_uniform_fr_med["Sekhmet Intergalactic first responder uniform"] = /obj/item/clothing/under/rank/medical/first_responder/pmc/sekh + gear_tweaks += new /datum/gear_tweak/path(epmc_uniform_fr_med) + //Zeng-Hu /datum/gear/faction/zenghu_beret display_name = "Zeng-Hu beret selection" diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index a448275c762..f62a649bb94 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -266,6 +266,7 @@ surgical["surgical cap, nanotrasen navy blue"] = /obj/item/clothing/head/surgery surgical["surgical cap, zeng-hu purple"] = /obj/item/clothing/head/surgery/zeng surgical["surgical cap, PMCG blue"] = /obj/item/clothing/head/surgery/pmc + surgical["surgical cap, PMCG grey"] = /obj/item/clothing/head/surgery/pmc/alt surgical["surgical cap, zavodskoi black"] = /obj/item/clothing/head/surgery/zavod surgical["surgical cap, idris green"] = /obj/item/clothing/head/surgery/idris gear_tweaks += new /datum/gear_tweak/path(surgical) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index e0f0e95d90a..2f4f5f003f5 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -103,6 +103,7 @@ scrubs["scrubs, nanotrasen navy blue"] = /obj/item/clothing/under/rank/medical/surgeon scrubs["scrubs, zeng-hu purple"] = /obj/item/clothing/under/rank/medical/surgeon/zeng scrubs["scrubs, PMCG blue"] = /obj/item/clothing/under/rank/medical/surgeon/pmc + scrubs["scrubs, PMCG grey"] = /obj/item/clothing/under/rank/medical/surgeon/pmc/alt scrubs["scrubs, zavodskoi black"] = /obj/item/clothing/under/rank/medical/surgeon/zavod scrubs["scrubs, idris green"] = /obj/item/clothing/under/rank/medical/surgeon/idris diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 934b1d49c6d..f194b385647 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -675,11 +675,17 @@ BLIND // can't see anything desc = "Sunglasses in the colours of the Private Military Contracting Group. They come with a blue-tinted HUD and a chrome finish." icon_state = "sunhud_pmcg" +/obj/item/clothing/glasses/sunglasses/sechud/pmc/alt + icon_state = "sunhud_pmcg_alt" + /obj/item/clothing/glasses/sunglasses/sechud/big/pmc name = "fat PMCG HUDsunglasses" desc = "Fat sunglasses in the colours of the Private Military Contracting Group. They come with a blue-tinted HUD and a chrome finish." icon_state = "bigsunglasses_hud_pmcg" +/obj/item/clothing/glasses/sunglasses/sechud/big/pmc/alt + icon_state = "bigsunglasses_hud_pmcg_alt" + /obj/item/clothing/glasses/sunglasses/sechud/idris name = "Idris HUDsunglasses" desc = "Sunglasses in the colours of Idris Incorporated. They come with a teal-tinted HUD and a chrome finish." @@ -772,6 +778,10 @@ BLIND // can't see anything icon_state = "aviator_sec_pmcg" off_state = "aviator_sec_pmcg_off" +/obj/item/clothing/glasses/sunglasses/sechud/aviator/pmc/alt + icon_state = "aviator_sec_pmcg_alt" + off_state = "aviator_sec_pmcg_alt_off" + /obj/item/clothing/glasses/sunglasses/sechud/aviator/idris name = "Idris HUD aviators" desc = "Idris security aviator glasses that can be switched between HUD and flash protection modes. They come with a built-in prescription overlay." diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 4fdeaf55e9b..6b0e571e42d 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -105,6 +105,10 @@ icon_state = "surgcap_pmc" item_state = "surgcap_pmc" +/obj/item/clothing/head/surgery/pmc/alt + icon_state = "surgcap_pmc_alt" + item_state = "surgcap_pmc_alt" + // Zavodskoi and Idris don't have medical jobs, but jobs like xenobiologist and investigators use them ancilliarily. /obj/item/clothing/head/surgery/zavod diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 3ddfb08a0eb..c884ad071db 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -323,6 +323,10 @@ obj/item/clothing/suit/apron/overalls/blue icon_state = "pmc_emt_jacket" item_state = "pmc_emt_jacket" +/obj/item/clothing/suit/storage/toggle/fr_jacket/pmc/alt + icon_state = "pmc_alt_emt_jacket" + item_state = "pmc_alt_emt_jacket" + /obj/item/clothing/suit/storage/medical_chest_rig name = "medic chest-rig" diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/under/accessories/armband.dm index 2337bb5523e..1e72b01f98f 100644 --- a/code/modules/clothing/under/accessories/armband.dm +++ b/code/modules/clothing/under/accessories/armband.dm @@ -74,6 +74,10 @@ icon_state = "pmc_armband" overlay_state = "pmc_armband" +/obj/item/clothing/accessory/armband/pmc/alt + icon_state = "pmc_alt_armband" + overlay_state = "pmc_alt_armband" + /obj/item/clothing/accessory/armband/colourable name = "armband" desc = "An armband in 16,777,216 designer colors." @@ -90,4 +94,4 @@ name = "Stellar Corporate Conglomerate armband" desc = "An armband, tailored with all the colors of the Sellar Corporate Conglomerate." desc_fluff = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur." - icon_state = "scc" \ No newline at end of file + icon_state = "scc" diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 9d88bded824..0f665023ed5 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -147,6 +147,10 @@ icon_state = "pmc_phys" item_state = "pmc_phys" +/obj/item/clothing/under/rank/medical/pmc/alt + icon_state = "pmc_alt_phys" + item_state = "pmc_alt_phys" + // Intern /obj/item/clothing/under/rank/medical/intern @@ -163,6 +167,10 @@ icon_state = "pmc_intern" item_state = "pmc_intern" +/obj/item/clothing/under/rank/medical/intern/pmc/alt + icon_state = "pmc_alt_intern" + item_state = "pmc_alt_intern" + // First Responder /obj/item/clothing/under/rank/medical/first_responder @@ -179,10 +187,18 @@ icon_state = "pmc_emt" item_state = "pmc_emt" -/obj/item/clothing/under/rank/medical/first_responder/pmc/epmc // Note: Item Icon placeholder +/obj/item/clothing/under/rank/medical/first_responder/pmc/alt + icon_state = "pmc_emt" + item_state = "pmc_emt" + +/obj/item/clothing/under/rank/medical/first_responder/pmc/epmc icon_state = "epmc_emt" item_state = "epmc_emt" +/obj/item/clothing/under/rank/medical/first_responder/pmc/sekh + icon_state = "sekh_emt" + item_state = "sekh_emt" + // Surgeon /obj/item/clothing/under/rank/medical/surgeon name = "surgeon's scrubs" @@ -199,6 +215,10 @@ icon_state = "pmc_surgeon" item_state = "pmc_surgeon" +/obj/item/clothing/under/rank/medical/surgeon/pmc/alt + icon_state = "pmc_alt_surgeon" + item_state = "pmc_alt_surgeon" + // Zavodskoi and Idris don't have medical jobs, but jobs like xenobiologist and investigators use them ancilliarily. /obj/item/clothing/under/rank/medical/surgeon/zavod @@ -225,6 +245,10 @@ icon_state = "pmc_psych" item_state = "pmc_psych" +/obj/item/clothing/under/rank/medical/psych/pmc/alt + icon_state = "pmc_alt_psych" + item_state = "pmc_alt_psych" + // Pharmacist /obj/item/clothing/under/rank/medical/pharmacist @@ -240,3 +264,7 @@ /obj/item/clothing/under/rank/medical/pharmacist/pmc icon_state = "pmc_chemist" item_state = "pmc_chemist" + +/obj/item/clothing/under/rank/medical/pharmacist/pmc/alt + icon_state = "pmc_chemist" + item_state = "pmc_chemist" diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 789e99f9fa5..d3a1134dafa 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -158,6 +158,22 @@ icon_state = "pmc_invest" item_state = "pmc_invest" +/obj/item/clothing/under/det/zavod/alt + name = "zavodskoi interstellar detective's uniform" + icon_state = "zav_invest_alt" + item_state = "zav_invest_alt" + +/obj/item/clothing/under/det/idris/alt + name = "idris incorporated detective's uniform" + icon_state = "idris_invest_alt" + item_state = "idris_invest_alt" + +/obj/item/clothing/under/det/pmc/alt + name = "PMCG detective's uniform" + icon_state = "pmc_invest_alt" + item_state = "pmc_invest_alt" + + /* * Head of Security */ diff --git a/html/changelogs/wezzy_neuniforms.yml b/html/changelogs/wezzy_neuniforms.yml new file mode 100644 index 00000000000..f7afe9048aa --- /dev/null +++ b/html/changelogs/wezzy_neuniforms.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: Wowzewow (Wezzy) + +# 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: "Re-adds old grey PMCG uniforms as an alt option." + - rscadd: "Accessories relating to PMCG have been finally updated with new pallete. Old grey accessories are alt options." + - rscadd: "PMCG Medical palette has been updated to match PMCG Security. As always, old uniforms are an alt option. Old(er) FT uniform is now called Sekhmet Intergalactic FT uniform. Highlights are blue to avoid confusion with Zavodskoi." + - rscadd: "Adds new corporate detective alt uniforms similar to the old detective alt uniform." diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 42c9b85936c..aed59cbda49 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index d9f34c3b2b7..18e841146ed 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 6fdbce1bc38..2df7c2f8a85 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index b4faa952820..53cfe70ccf8 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/contained_items/department_uniforms/medical.dmi b/icons/obj/contained_items/department_uniforms/medical.dmi index aff537595d1..a0af0fe710f 100644 Binary files a/icons/obj/contained_items/department_uniforms/medical.dmi and b/icons/obj/contained_items/department_uniforms/medical.dmi differ diff --git a/icons/obj/contained_items/department_uniforms/security.dmi b/icons/obj/contained_items/department_uniforms/security.dmi index 3c406755776..2fefe83678a 100644 Binary files a/icons/obj/contained_items/department_uniforms/security.dmi and b/icons/obj/contained_items/department_uniforms/security.dmi differ