diff --git a/code/modules/client/preference_setup/loadout/loadout_factions.dm b/code/modules/client/preference_setup/loadout/loadout_factions.dm index 10f3ca5ee1a..8900d4d1f73 100644 --- a/code/modules/client/preference_setup/loadout/loadout_factions.dm +++ b/code/modules/client/preference_setup/loadout/loadout_factions.dm @@ -65,8 +65,10 @@ /datum/gear/faction/idris_labcoat/New() ..() var/list/idris_labcoats = list() - idris_labcoats["labcoat, Idris"] = /obj/item/clothing/suit/storage/toggle/labcoat/idris - idris_labcoats["labcoat, Idris alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/idris/alt + idris_labcoats["idris labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/idris + idris_labcoats["idris labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/idris/alt + idris_labcoats["idris letterman labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/idris/letterman + idris_labcoats["idris letterman labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/idris/letterman/alt gear_tweaks += new /datum/gear_tweak/path(idris_labcoats) /datum/gear/faction/zavodskoi_beret @@ -96,6 +98,15 @@ slot = slot_wear_suit faction = "Zavodskoi Interstellar" +/datum/gear/faction/zavodskoi_labcoat/New() + ..() + var/list/zavodskoi_labcoats = list() + zavodskoi_labcoats["zavodskoi labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi + zavodskoi_labcoats["zavodskoi labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi/alt + zavodskoi_labcoats["zavodskoi letterman labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi/letterman + zavodskoi_labcoats["zavodskoi letterman labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi/letterman/alt + gear_tweaks += new /datum/gear_tweak/path(zavodskoi_labcoats) + /datum/gear/faction/zavod_sunglasses display_name = "zavodskoi security HUD selection" description = "A selection of Zavodskoi security HUDs." @@ -142,8 +153,8 @@ gear_tweaks += new /datum/gear_tweak/path(pmc_sunglasses) /datum/gear/faction/pmc_labcoat - display_name = "PMCG labcoat selection" - description = "A selection of PMCG labcoats." + display_name = "PMCG/EPMC labcoat selection" + description = "A selection of PMCG/EPMC labcoats." path = /obj/item/clothing/suit/storage/toggle/labcoat/pmc slot = slot_wear_suit faction = "Private Military Contracting Group" @@ -153,6 +164,7 @@ var/list/pmc_labcoats = list() pmc_labcoats["labcoat, PMCG"] = /obj/item/clothing/suit/storage/toggle/labcoat/pmc pmc_labcoats["labcoat alt, PMCG"] = /obj/item/clothing/suit/storage/toggle/labcoat/pmc/alt + pmc_labcoats["labcoat, PMCG"] = /obj/item/clothing/suit/storage/toggle/labcoat/epmc gear_tweaks += new /datum/gear_tweak/path(pmc_labcoats) /datum/gear/faction/pmc_patch @@ -235,11 +247,15 @@ /datum/gear/faction/zenghu_labcoat/New() ..() - var/list/masks = list() - masks["zeng-hu labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng - masks["zeng-hu labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/alt - masks["zeng-hu first responder jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket/zeng - gear_tweaks += new /datum/gear_tweak/path(masks) + var/list/zenghu_labcoats = list() + zenghu_labcoats["zeng-hu labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng + zenghu_labcoats["zeng-hu labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/alt + zenghu_labcoats["zeng-hu labcoat, classic"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/alt2 + zenghu_labcoats["zeng-hu letterman labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/letterman + zenghu_labcoats["zeng-hu letterman labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/letterman/alt + zenghu_labcoats["zeng-hu letterman labcoat, classic"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/letterman/alt2 + zenghu_labcoats["zeng-hu first responder jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket/zeng + gear_tweaks += new /datum/gear_tweak/path(zenghu_labcoats) /datum/gear/faction/zenghu_apron display_name = "zeng-hu vinyl apron" @@ -285,6 +301,13 @@ slot = slot_wear_suit faction = "Hephaestus Industries" +/datum/gear/faction/heph_labcoat/New() + ..() + var/list/heph_labcoats = list() + heph_labcoats["hephaestus labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/heph + heph_labcoats["hephaestus letterman labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/heph/letterman + gear_tweaks += new /datum/gear_tweak/path(heph_labcoats) + /datum/gear/faction/heph_beret display_name = "hephaestus beret" path = /obj/item/clothing/head/beret/corporate/heph diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 7d62c145c09..f3920386c87 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -17,7 +17,6 @@ name = "chief medical officer's labcoat" desc = "Bluer than the standard model." icon_state = "labcoat_cmo" - item_state = "labcoat_cmo" /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt name = "chief medical officer labcoat" @@ -35,11 +34,12 @@ icon_state = "labcoat_sci" - +//Nanotrasen /obj/item/clothing/suit/storage/toggle/labcoat/nt - name = "nt labcoat" + name = "nanotrasen labcoat" icon_state = "labcoat_nt" +//Zeng-Hu /obj/item/clothing/suit/storage/toggle/labcoat/zeng name = "zeng-hu labcoat" icon_state = "labcoat_zeng" @@ -47,14 +47,43 @@ /obj/item/clothing/suit/storage/toggle/labcoat/zeng/alt icon_state = "labcoat_zeng_alt" +/obj/item/clothing/suit/storage/toggle/labcoat/zeng/alt2 + icon_state = "labcoat_zeng_alt2" + +/obj/item/clothing/suit/storage/toggle/labcoat/zeng/letterman + icon_state = "labcoat_letterman_zeng" + +/obj/item/clothing/suit/storage/toggle/labcoat/zeng/letterman/alt + icon_state = "labcoat_letterman_zeng_alt" + +/obj/item/clothing/suit/storage/toggle/labcoat/zeng/letterman/alt2 + icon_state = "labcoat_letterman_zeng_alt2" + +//Zavodskoi + /obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi name = "zavodskoi interstellar labcoat" icon_state = "labcoat_zav" +/obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi/alt + icon_state = "labcoat_zav_alt" + +/obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi/letterman + icon_state = "labcoat_letterman_zav" + +/obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi/letterman/alt + icon_state = "labcoat_letterman_zav_alt" + +//Hephaestus + /obj/item/clothing/suit/storage/toggle/labcoat/heph name = "hephaestus labcoat" icon_state = "labcoat_heph" +/obj/item/clothing/suit/storage/toggle/labcoat/heph/letterman + icon_state = "labcoat_letterman_heph" + +// PMGC / EPMC /obj/item/clothing/suit/storage/toggle/labcoat/pmc name = "PMCG labcoat" icon_state = "labcoat_pmc" @@ -62,16 +91,27 @@ /obj/item/clothing/suit/storage/toggle/labcoat/pmc/alt icon_state = "labcoat_pmc_alt" -/obj/item/clothing/suit/storage/toggle/labcoat/iac - name = "iac labcoat" - icon_state = "labcoat_iac" - item_state = "labcoat_iac" +/obj/item/clothing/suit/storage/toggle/labcoat/epmc + name = "EPMC labcoat" + icon_state = "labcoat_epmc" +//Idris /obj/item/clothing/suit/storage/toggle/labcoat/idris name = "idris labcoat" icon_state = "labcoat_idris" - item_state = "labcoat_idris" /obj/item/clothing/suit/storage/toggle/labcoat/idris/alt icon_state = "labcoat_idris_alt" - item_state = "labcoat_idris_alt" + +/obj/item/clothing/suit/storage/toggle/labcoat/idris/letterman + name = "idris labcoat" + icon_state = "labcoat_letterman_idris" + +/obj/item/clothing/suit/storage/toggle/labcoat/idris/letterman/alt + icon_state = "labcoat_letterman_idris_alt" + +//IAC + +/obj/item/clothing/suit/storage/toggle/labcoat/iac + name = "iac labcoat" + icon_state = "labcoat_iac" diff --git a/html/changelogs/wezzy_labcoatening.yml b/html/changelogs/wezzy_labcoatening.yml new file mode 100644 index 00000000000..78434d92ede --- /dev/null +++ b/html/changelogs/wezzy_labcoatening.yml @@ -0,0 +1,43 @@ +################################ +# 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: + - imageadd: "Adds new letterman labcoats. The old Idris labcoat with the giant symbol has returned and falls under this category as well." + - imageadd: "Re-adds classic vibrant Zeng-Hu labcoat and EPMC labcoat variations." + - imageadd: "Improves IAC labcoat." diff --git a/icons/mob/clothing/suit/labcoat.dmi b/icons/mob/clothing/suit/labcoat.dmi index 290497f1c57..ac5f4ab6ec7 100644 Binary files a/icons/mob/clothing/suit/labcoat.dmi and b/icons/mob/clothing/suit/labcoat.dmi differ