diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 91dac4e85ae..5f262de2de4 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -324,8 +324,6 @@ new /obj/item/clothing/under/rank/geneticist(src) new /obj/item/clothing/shoes/white(src) new /obj/item/clothing/shoes/white(src) - new /obj/item/clothing/suit/storage/toggle/labcoat/genetics(src) - new /obj/item/clothing/suit/storage/toggle/labcoat/genetics(src) return @@ -340,8 +338,6 @@ new /obj/item/clothing/under/rank/virologist(src) new /obj/item/clothing/shoes/biochem(src) new /obj/item/clothing/shoes/biochem(src) - new /obj/item/clothing/suit/storage/toggle/labcoat/biochemist(src) - new /obj/item/clothing/suit/storage/toggle/labcoat/biochemist(src) new /obj/item/clothing/mask/surgical(src) new /obj/item/clothing/mask/surgical(src) return diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 5d8e3e77469..3b177ec43ed 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -1,6 +1,8 @@ /obj/item/clothing/suit/storage/toggle/labcoat name = "labcoat" desc = "A suit that protects against minor chemical spills." + icon = 'icons/mob/clothing/suit/labcoat.dmi' + contained_sprite = TRUE icon_state = "labcoat" item_state = "labcoat" // used for inhands and onmobs. ESPECIALLY FOR CONTAINED SPRITES blood_overlay_type = "coat" @@ -27,11 +29,6 @@ desc = "A labcoat with command gold highlights." icon_state = "labcoat_cmoalt2" -/obj/item/clothing/suit/storage/toggle/labcoat/genetics - name = "geneticist labcoat" - desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder." - icon_state = "labcoat_gen" - /obj/item/clothing/suit/storage/toggle/labcoat/medical name = "medical labcoat" desc = "A suit that protects against minor chemical spills. Has a green stripe on the shoulder." @@ -42,11 +39,6 @@ desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder." icon_state = "labcoat_chem" -/obj/item/clothing/suit/storage/toggle/labcoat/biochemist - name = "protective labcoat" - desc = "A suit that protects against minor chemical spills. Has a red stripe on the shoulder." - icon_state = "labcoat_vir" - /obj/item/clothing/suit/storage/toggle/labcoat/psych name = "psychiatrist labcoat" desc = "A suit that protects against minor chemical spills. Has a teal stripe on the shoulder." @@ -65,7 +57,7 @@ /obj/item/clothing/suit/storage/toggle/labcoat/science name = "scientist labcoat" desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder." - icon_state = "labcoat_tox" + icon_state = "labcoat_sci" /obj/item/clothing/suit/storage/iacvest desc = "It's a lightweight vest. Made of a dark, navy mesh with highly-reflective white material, designed to be worn by the Interstellar Aid Corps as a high-visibility vest, over any other clothing. The I.A.C. logo is prominently displayed on the back of the vest, between the shoulders." diff --git a/code/modules/clothing/suits/xeno/tajara.dm b/code/modules/clothing/suits/xeno/tajara.dm index 185ecb8a580..63cdd9a12bb 100644 --- a/code/modules/clothing/suits/xeno/tajara.dm +++ b/code/modules/clothing/suits/xeno/tajara.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/tajara_items.dmi' icon_state = "medcoat" item_state = "medcoat" - contained_sprite = TRUE desc_fluff = "Today the fashion that dominates Adhomai shares few similarities to the clothing of old Furs, linen, hemp, silk and other such fabrics were traded for \ synthetic versions, creating a massive boom in the nylon industry and textile industry in the cities. Jeans, overcoats, army uniforms, parade uniforms, flags, pants, shirts, ties, \ suspenders, overalls are now the fashion of every Tajara from Nal'Tor to Kaltir. The protests of \"Old fashion\" supporters can't stand against how undeniably effective and cheap \ diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 92f29b830a9..64776793da4 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -875,7 +875,6 @@ All custom items with worn sprites must follow the contained sprite system: http icon_override = 'icons/obj/custom_items/mira_clothing.dmi' icon_state = "mira_robes" item_state = "mira_robes" - contained_sprite = TRUE /obj/item/clothing/shoes/fluff/mira_boots //Mira Boots - Mira Akhandi - ladyfowl name = "dark boots" @@ -1206,7 +1205,6 @@ All custom items with worn sprites must follow the contained sprite system: http icon_override = 'icons/obj/custom_items/likho_labcoat.dmi' icon_state = "likho_labcoat" item_state = "likho_labcoat" - contained_sprite = TRUE /obj/item/clothing/suit/storage/toggle/fr_jacket/fluff/ramit_jacket //Winter Paramedic Jacket - Ra'mit Ma'zaira - simontheminer @@ -1606,7 +1604,6 @@ All custom items with worn sprites must follow the contained sprite system: http icon_override = 'icons/obj/custom_items/mekesatis_holocoat.dmi' icon_state = "mekesatis_labcoat" item_state = "mekesatis_labcoat" - contained_sprite = TRUE var/changed = FALSE var/changing = FALSE diff --git a/html/changelogs/wezzy_labcoat_2ndpass.yml b/html/changelogs/wezzy_labcoat_2ndpass.yml new file mode 100644 index 00000000000..ae5d006b9bf --- /dev/null +++ b/html/changelogs/wezzy_labcoat_2ndpass.yml @@ -0,0 +1,42 @@ +################################ +# 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: "Does a second pass on labcoat sprites. Non-contractor labcoat users rejoyce." + diff --git a/icons/mob/clothing/suit/labcoat.dmi b/icons/mob/clothing/suit/labcoat.dmi new file mode 100644 index 00000000000..e193ab99094 Binary files /dev/null and b/icons/mob/clothing/suit/labcoat.dmi differ diff --git a/icons/mob/human_races/human/human_preview.dmi b/icons/mob/human_races/human/human_preview.dmi index 1d5051bcfa7..8c4944613ce 100644 Binary files a/icons/mob/human_races/human/human_preview.dmi and b/icons/mob/human_races/human/human_preview.dmi differ diff --git a/icons/mob/species/bulwark/suit.dmi b/icons/mob/species/bulwark/suit.dmi index b24ac97c590..b40c66394f9 100644 Binary files a/icons/mob/species/bulwark/suit.dmi and b/icons/mob/species/bulwark/suit.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index e7e02089e25..d7ead7aa9c0 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 9d9fec54057..de9e5bb6665 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/coatrack.dmi b/icons/obj/coatrack.dmi index ac295fb3cc7..28dab25666c 100644 Binary files a/icons/obj/coatrack.dmi and b/icons/obj/coatrack.dmi differ