diff --git a/code/modules/client/preference_setup/loadout/loadout_factions.dm b/code/modules/client/preference_setup/loadout/loadout_factions.dm index e86fa13dc09..d05e6b91338 100644 --- a/code/modules/client/preference_setup/loadout/loadout_factions.dm +++ b/code/modules/client/preference_setup/loadout/loadout_factions.dm @@ -87,6 +87,7 @@ 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 + idris_labcoats["idris labcoat, long"] = /obj/item/clothing/suit/storage/longcoat/idris idris_labcoats["idris windbreaker"] = /obj/item/clothing/suit/storage/toggle/idris gear_tweaks += new /datum/gear_tweak/path(idris_labcoats) @@ -143,6 +144,7 @@ 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 + zavodskoi_labcoats["zavodskoi labcoat, long"] = /obj/item/clothing/suit/storage/longcoat/zavodskoi gear_tweaks += new /datum/gear_tweak/path(zavodskoi_labcoats) /datum/gear/faction/zavod_sunglasses @@ -202,9 +204,10 @@ /datum/gear/faction/pmc_labcoat/New() ..() 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 + pmc_labcoats["PMCG labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/pmc + pmc_labcoats["PMCG labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/pmc/alt + pmc_labcoats["PMCG labcoat, long"] = /obj/item/clothing/suit/storage/longcoat/pmc + pmc_labcoats["EPMC labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/epmc gear_tweaks += new /datum/gear_tweak/path(pmc_labcoats) /datum/gear/faction/pmcg_headwear @@ -297,6 +300,7 @@ 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 labcoat, long"] = /obj/item/clothing/suit/storage/longcoat/zeng 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) @@ -331,6 +335,7 @@ 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 + heph_labcoats["hephaestus labcoat, long"] = /obj/item/clothing/suit/storage/longcoat/heph gear_tweaks += new /datum/gear_tweak/path(heph_labcoats) /datum/gear/faction/heph_beret @@ -346,6 +351,12 @@ faction = "Hephaestus Industries" //NanoTrasen +/datum/gear/faction/nanotrasen_labcoat + display_name = "nanotrasen labcoat, long" + path = /obj/item/clothing/suit/storage/longcoat/nt + slot = slot_wear_suit + faction = "NanoTrasen" + /datum/gear/faction/nt_custodialjumpsuit display_name = "nanotrasen custodial jumpsuit, alternative" path = /obj/item/clothing/under/rank/janitor/alt diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index ca6de63cafc..72358ec1ff1 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -13,6 +13,20 @@ ) opened = TRUE // spawns opened +/obj/item/clothing/suit/storage/longcoat + name = "long labcoat" + desc = "A long, victorian styled labcoat. For those inclined to cartoonish villiany and manaical laughter." + icon = 'icons/mob/clothing/suit/labcoat.dmi' + contained_sprite = TRUE + icon_state = "labcoat_long" + item_state = "labcoat_long" // used for inhands and onmobs. ESPECIALLY FOR CONTAINED SPRITES + blood_overlay_type = "coat" + body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS + allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper, /obj/item/device/breath_analyzer) + armor = list( + bio = ARMOR_BIO_RESISTANT + ) + /obj/item/clothing/suit/storage/toggle/labcoat/cmo name = "chief medical officer's labcoat" desc = "Bluer than the standard model." @@ -33,12 +47,16 @@ desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder." icon_state = "labcoat_sci" - //NanoTrasen /obj/item/clothing/suit/storage/toggle/labcoat/nt name = "nanotrasen labcoat" icon_state = "labcoat_nt" +/obj/item/clothing/suit/storage/longcoat/nt + name = "nanotrasen long labcoat" + icon_state = "labcoat_long_nt" + item_state = "labcoat_long_nt" + //Zeng-Hu /obj/item/clothing/suit/storage/toggle/labcoat/zeng name = "zeng-hu labcoat" @@ -59,6 +77,11 @@ /obj/item/clothing/suit/storage/toggle/labcoat/zeng/letterman/alt2 icon_state = "labcoat_letterman_zeng_alt2" +/obj/item/clothing/suit/storage/longcoat/zeng + name = "zeng-hu long labcoat" + icon_state = "labcoat_long_zeng" + item_state = "labcoat_long_zeng" + //Zavodskoi /obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi @@ -74,6 +97,11 @@ /obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi/letterman/alt icon_state = "labcoat_letterman_zav_alt" +/obj/item/clothing/suit/storage/longcoat/zavodskoi + name = "zavodskoi long labcoat" + icon_state = "labcoat_long_zav" + item_state = "labcoat_long_zav" + //Hephaestus /obj/item/clothing/suit/storage/toggle/labcoat/heph @@ -83,6 +111,11 @@ /obj/item/clothing/suit/storage/toggle/labcoat/heph/letterman icon_state = "labcoat_letterman_heph" +/obj/item/clothing/suit/storage/longcoat/heph + name = "hephaestus long labcoat" + icon_state = "labcoat_long_heph" + item_state = "labcoat_long_heph" + // PMGC / EPMC /obj/item/clothing/suit/storage/toggle/labcoat/pmc name = "PMCG labcoat" @@ -95,6 +128,11 @@ name = "EPMC labcoat" icon_state = "labcoat_epmc" +/obj/item/clothing/suit/storage/longcoat/pmc + name = "PMCG long labcoat" + icon_state = "labcoat_long_pmc" + item_state = "labcoat_long_pmc" + //Idris /obj/item/clothing/suit/storage/toggle/labcoat/idris name = "idris labcoat" @@ -110,6 +148,11 @@ /obj/item/clothing/suit/storage/toggle/labcoat/idris/letterman/alt icon_state = "labcoat_letterman_idris_alt" +/obj/item/clothing/suit/storage/longcoat/idris + name = "idris long labcoat" + icon_state = "labcoat_long_idris" + item_state = "labcoat_long_idris" + //IAC /obj/item/clothing/suit/storage/toggle/labcoat/iac diff --git a/html/changelogs/wezzy_longlabcoats.yml b/html/changelogs/wezzy_longlabcoats.yml new file mode 100644 index 00000000000..ef578ad574b --- /dev/null +++ b/html/changelogs/wezzy_longlabcoats.yml @@ -0,0 +1,41 @@ +################################ +# 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), retlaw34 + +# 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 long labcoats." diff --git a/icons/mob/clothing/suit/labcoat.dmi b/icons/mob/clothing/suit/labcoat.dmi index ac5f4ab6ec7..cf6c611d47d 100644 Binary files a/icons/mob/clothing/suit/labcoat.dmi and b/icons/mob/clothing/suit/labcoat.dmi differ