diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm index 8d9102fe96a..5caa1dee309 100644 --- a/code/controllers/subsystems/job.dm +++ b/code/controllers/subsystems/job.dm @@ -710,10 +710,10 @@ else metadata = list() var/obj/item/CI = G.spawn_item(null,metadata, H) - if (G.slot == slot_wear_mask || G.slot == slot_wear_suit || G.slot == slot_head) + if (G.slot == slot_w_uniform) if (leftovers) leftovers += thing - Debug("EC/([H]): [thing] failed mask/suit/head check; leftovers=[!!leftovers]") + Debug("EC/([H]): [thing] failed uniform check; leftovers=[!!leftovers]") else if (H.equip_to_slot_or_del(CI, G.slot)) to_chat(H, "Equipping you with [thing]!") if(G.slot != slot_tie) diff --git a/code/datums/outfits/ert/ap_eridani.dm b/code/datums/outfits/ert/ap_eridani.dm index 239871f0dcb..ae7171d3632 100644 --- a/code/datums/outfits/ert/ap_eridani.dm +++ b/code/datums/outfits/ert/ap_eridani.dm @@ -132,7 +132,7 @@ uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc suit = /obj/item/clothing/suit/storage/medical_chest_rig suit_store = /obj/item/clothing/head/hardhat/first_responder - head = /obj/item/clothing/head/softcap/medical/pmc + head = /obj/item/clothing/head/softcap/pmc mask = /obj/item/clothing/mask/surgical glasses = /obj/item/clothing/glasses/hud/health/aviator gloves = /obj/item/clothing/gloves/latex/nitrile diff --git a/code/game/jobs/faction/idris.dm b/code/game/jobs/faction/idris.dm index efe691b5a6e..b2c2bc9c5b4 100644 --- a/code/game/jobs/faction/idris.dm +++ b/code/game/jobs/faction/idris.dm @@ -68,7 +68,7 @@ uniform = /obj/item/clothing/under/rank/warden/idris suit = /obj/item/clothing/suit/storage/toggle/warden/idris id = /obj/item/card/id/idris/sec - glasses = /obj/item/clothing/glasses/sunglasses/sechud/idris + glasses = /obj/item/clothing/glasses/sunglasses/sechud/aviator/idris /datum/outfit/job/forensics/idris name = "Investigator - Idris" @@ -111,7 +111,7 @@ name = "Janitor - Idris" uniform = /obj/item/clothing/under/rank/janitor/idris - head = /obj/item/clothing/head/softcap/janitor/idris + head = /obj/item/clothing/head/softcap/idris id = /obj/item/card/id/idris /datum/outfit/job/librarian/idris diff --git a/code/game/jobs/faction/pmc.dm b/code/game/jobs/faction/pmc.dm index 3398c2347f9..b9b272443f3 100644 --- a/code/game/jobs/faction/pmc.dm +++ b/code/game/jobs/faction/pmc.dm @@ -68,7 +68,7 @@ uniform = /obj/item/clothing/under/rank/warden/pmc suit = /obj/item/clothing/suit/storage/toggle/warden/pmc id = /obj/item/card/id/pmc - glasses = /obj/item/clothing/glasses/sunglasses/sechud/pmc + glasses = /obj/item/clothing/glasses/sunglasses/sechud/aviator/pmc /datum/outfit/job/intern_sec/pmc name = "Security Cadet - PMC" @@ -118,7 +118,7 @@ /datum/outfit/job/med_tech/pmc name = "First Responder - PMC" - head = /obj/item/clothing/head/softcap/medical/pmc + head = /obj/item/clothing/head/softcap/pmc uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc suit = /obj/item/clothing/suit/storage/toggle/fr_jacket/pmc id = /obj/item/card/id/pmc diff --git a/code/game/jobs/faction/zavodskoi.dm b/code/game/jobs/faction/zavodskoi.dm index d33db4440c6..b07cd50c62b 100644 --- a/code/game/jobs/faction/zavodskoi.dm +++ b/code/game/jobs/faction/zavodskoi.dm @@ -94,7 +94,7 @@ uniform = /obj/item/clothing/under/rank/warden/zavod suit = /obj/item/clothing/suit/storage/toggle/warden/zavod id = /obj/item/card/id/zavodskoi/sec - glasses = /obj/item/clothing/glasses/sunglasses/sechud/zavod + glasses = /obj/item/clothing/glasses/sunglasses/sechud/aviator/zavod /datum/outfit/job/intern_sec/zavodskoi name = "Security Cadet - Zavodskoi Interstellar" diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm index cf14df19215..ba8cf196a67 100644 --- a/code/game/jobs/faction/zeng_hu.dm +++ b/code/game/jobs/faction/zeng_hu.dm @@ -95,7 +95,7 @@ /datum/outfit/job/med_tech/zeng_hu name = "First Responder - Zeng-Hu" - head = /obj/item/clothing/head/softcap/medical/zeng + head = /obj/item/clothing/head/softcap/zeng uniform = /obj/item/clothing/under/rank/medical/first_responder/zeng suit = /obj/item/clothing/suit/storage/toggle/fr_jacket/zeng id = /obj/item/card/id/zeng_hu diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 7b52e50c8b8..c44bb5f9f50 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -268,7 +268,7 @@ base_name = "First Responder" jobtype = /datum/job/med_tech - head = /obj/item/clothing/head/softcap/medical/nt + head = /obj/item/clothing/head/softcap/nt uniform = /obj/item/clothing/under/rank/medical/first_responder suit = /obj/item/clothing/suit/storage/toggle/fr_jacket shoes = /obj/item/clothing/shoes/jackboots diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index d5053b624f3..b75f9fc65d1 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -97,7 +97,7 @@ uniform = /obj/item/clothing/under/rank/warden suit = /obj/item/clothing/suit/storage/toggle/warden shoes = /obj/item/clothing/shoes/jackboots - glasses = /obj/item/clothing/glasses/sunglasses/sechud + glasses = /obj/item/clothing/glasses/sunglasses/sechud/aviator l_pocket = /obj/item/device/flash headset = /obj/item/device/radio/headset/headset_warden diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index d6b19a973ef..938d4520273 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -248,11 +248,11 @@ /datum/gear/head/surgical/New() ..() var/list/surgical = list() - surgical["surgical cap, nanotrasen navy blue"] = /obj/item/clothing/under/rank/medical/surgeon/zeng - surgical["surgical cap, zeng-hu purple"] = /obj/item/clothing/under/rank/medical/surgeon/zeng + 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, zavodskoi black"] = /obj/item/clothing/under/rank/medical/surgeon/zavod - surgical["surgical cap, idris green"] = /obj/item/clothing/under/rank/medical/surgeon/idris + 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) /datum/gear/head/headbando diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 4331308b4ad..c7834e1010e 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -662,12 +662,12 @@ BLIND // can't see anything /obj/item/clothing/glasses/sunglasses/sechud/pmc name = "PMCG HUDsunglasses" - desc = "Sunglasses in the colours of the Eridani PMC organisation. They come with a blue-tinted HUD and a chrome finish." + 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_pmc" /obj/item/clothing/glasses/sunglasses/sechud/big/pmc name = "fat PMCG HUDsunglasses" - desc = "Fat sunglasses in the colours of the Eridani PMC organisation. They come with a blue-tinted HUD and a chrome finish." + 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_pmc" /obj/item/clothing/glasses/sunglasses/sechud/idris diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index cecb4f0d17d..204195ff80f 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -95,10 +95,6 @@ icon_state = "surgcap_pmc" item_state = "surgcap_pmc" -/obj/item/clothing/head/surgery/pmc - icon_state = "surgcap_pmc" - item_state = "surgcap_pmc" - // 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/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index b7ddc7762a2..268ef15f224 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -116,12 +116,8 @@ desc = "It's a peaked cap, freshly sanitized and ready for a day of viscera cleanup." icon = 'icons/obj/contained_items/department_uniforms/service.dmi' contained_sprite = TRUE - icon_state = "nt_janitor_cap" - item_state = "nt_janitor_cap" - -/obj/item/clothing/head/softcap/janitor/idris - icon_state = "idris_janitor_cap" - item_state = "idris_janitor_cap" + icon_state = "softcap_janitor" + item_state = "softcap_janitor" // Corporate. @@ -133,19 +129,23 @@ /obj/item/clothing/head/softcap/idris name = "idris cap" - desc = "It's a company-issue Idris cap. Comes with flagrant corporate branding." + desc = "A company-issue Idris cap. Comes with flagrant corporate branding. There's a liability waiver written on the inside, somehow." icon_state = "idris" item_state = "idris" /obj/item/clothing/head/softcap/pmc - name = "eridani cap" - desc = "A grey PMCG fatigue cap with the symbol of the Eridani Corporate Federation on its front. For amoral mercenaries that prefer style over protection." + name = "PMCG cap" + desc = "A company-issue PMCG cap. For amoral mercenaries that prefer style over protection." icon_state = "pmc" item_state = "pmc" +/obj/item/clothing/head/softcap/pmc/alt + icon_state = "pmcalt" + item_state = "pmcalt" + /obj/item/clothing/head/softcap/zavod name = "zavodskoi cap" - desc = "A tan company-issue Zavokdskoi cap with the symbol of the corporation at its front." + desc = "A company-issue Zavokdskoi cap with the symbol of the corporation at its front. It seems to be immaculately starched; maybe it's just the material it's made out of." icon_state = "zav" item_state = "zav" @@ -153,20 +153,12 @@ icon_state = "zavalt" item_state = "zavalt" -/obj/item/clothing/head/softcap/medical/zeng - desc = "A medical cap in Zeng-Hu colors." - icon = 'icons/obj/contained_items/department_uniforms/medical.dmi' - icon_state = "zeng_emt_cap" - item_state = "zeng_emt_cap" +/obj/item/clothing/head/softcap/zeng + desc = "A company-issue Zeng-Hu cap. It feels synthetic to the touch." + icon_state = "zeng" + item_state = "zeng" -/obj/item/clothing/head/softcap/medical/nt - desc = "A medical cap in NanoTrasen colors." - icon = 'icons/obj/contained_items/department_uniforms/medical.dmi' - icon_state = "nt_emt_cap" - item_state = "nt_emt_cap" - -/obj/item/clothing/head/softcap/medical/pmc - desc = "A medical cap in PMC colors." - icon = 'icons/obj/contained_items/department_uniforms/medical.dmi' - icon_state = "pmc_emt_cap" - item_state = "pmc_emt_cap" +/obj/item/clothing/head/softcap/nt + desc = "A company-issue NanoTrasen cap. Smells of phoron." + icon_state = "nt" + item_state = "nt" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 23b207e7f68..ee8d2d84f6c 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -172,6 +172,7 @@ obj/item/clothing/suit/apron/overalls/blue /obj/item/clothing/suit/storage/det_jacket/idris icon_state = "idris_invest_coat" item_state = "idris_invest_coat" + /obj/item/clothing/suit/storage/toggle/det_trench name = "brown trenchcoat" desc = "A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. Perfect for your next act of autodefenestration!" @@ -211,6 +212,7 @@ obj/item/clothing/suit/apron/overalls/blue icon = 'icons/obj/contained_items/department_uniforms/security.dmi' icon_state = "nt_warden_coat" item_state = "nt_warden_coat" + opened = TRUE contained_sprite = TRUE /obj/item/clothing/suit/storage/toggle/warden/zavod diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index b66e2025606..637ca20f7e6 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -195,8 +195,8 @@ // 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 - icon_state = "zavod_surgeon" - item_state = "zavod_surgeon" + icon_state = "zav_surgeon" + item_state = "zav_surgeon" /obj/item/clothing/under/rank/medical/surgeon/idris icon_state = "idris_surgeon" diff --git a/html/changelogs/wezzy_NBTuniformtweaks.yml b/html/changelogs/wezzy_NBTuniformtweaks.yml new file mode 100644 index 00000000000..853c0870d14 --- /dev/null +++ b/html/changelogs/wezzy_NBTuniformtweaks.yml @@ -0,0 +1,53 @@ +################################ +# 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: + - bugfix: "Fixes invisible PMC sunhud." + - tweak: "Tweaked warden overcoat color schemes." + - tweak: "Swaps Warden and Officer uniforms for better contrast. Tweaks Idris uniforms to use tertiary color." + - tweak: "Loadout suits, hats and masks now override default jobspawn clothing." + - imageadd: "Adds corporate logos to the back of corporate labcoats." + - tweak: "Janitor uniform no longer has purple highlights." + - tweak: "Tweaks some Idris clothing items to use correct white/teal instead of white/gold color scheme." + - bugfix: "Fixes loadout surgical caps spawning in wrongly." + - bugfix: "Wardens spawn with proper glasses now." + - tweak: "Nanotrasen EMT jacket color scheme has been tweaked." + - backend: "Removed superfluous caps." + - bugfix: "Fixes missing pixels for rolled civillian uniforms." + - bugfix: "Fixes wrongly colored pixels on pants." diff --git a/icons/mob/clothing/suit/labcoat.dmi b/icons/mob/clothing/suit/labcoat.dmi index a044226029b..e667e21ed85 100644 Binary files a/icons/mob/clothing/suit/labcoat.dmi and b/icons/mob/clothing/suit/labcoat.dmi differ diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 4ef44c6a68a..c2d2f64311c 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/obj/clothing/hats/berets.dmi b/icons/obj/clothing/hats/berets.dmi index aea0970bbda..71952604988 100644 Binary files a/icons/obj/clothing/hats/berets.dmi and b/icons/obj/clothing/hats/berets.dmi differ diff --git a/icons/obj/clothing/hats/soft_caps.dmi b/icons/obj/clothing/hats/soft_caps.dmi index f79996fb1da..1192e0fb708 100644 Binary files a/icons/obj/clothing/hats/soft_caps.dmi and b/icons/obj/clothing/hats/soft_caps.dmi differ diff --git a/icons/obj/contained_items/department_uniforms/medical.dmi b/icons/obj/contained_items/department_uniforms/medical.dmi index 71e0874362f..9417ed26241 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 cf7e0c93afb..6bce25828b3 100644 Binary files a/icons/obj/contained_items/department_uniforms/security.dmi and b/icons/obj/contained_items/department_uniforms/security.dmi differ diff --git a/icons/obj/contained_items/department_uniforms/service.dmi b/icons/obj/contained_items/department_uniforms/service.dmi index 1a44bae1087..37200f6e276 100644 Binary files a/icons/obj/contained_items/department_uniforms/service.dmi and b/icons/obj/contained_items/department_uniforms/service.dmi differ