diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index e8d3a368f3b..f822eac3a84 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -39,7 +39,7 @@ jobtype = /datum/job/rd uniform = /obj/item/clothing/under/rank/research_director - suit = /obj/item/clothing/suit/storage/toggle/labcoat/science + suit = /obj/item/clothing/suit/storage/toggle/labcoat shoes = /obj/item/clothing/shoes/sneakers/brown id = /obj/item/card/id/scc/silver l_hand = /obj/item/clipboard diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm index bb03ee30b03..3cd10af4ee9 100644 --- a/code/modules/client/preference_setup/loadout/items/factions.dm +++ b/code/modules/client/preference_setup/loadout/items/factions.dm @@ -96,8 +96,6 @@ var/list/idris_labcoats = list() 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 idris_labcoats["idris labcoat, long"] = /obj/item/clothing/suit/storage/toggle/longcoat/idris idris_labcoats["idris windbreaker"] = /obj/item/clothing/suit/storage/toggle/idris idris_labcoats["idris corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/idris @@ -176,8 +174,6 @@ 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 zavodskoi_labcoats["zavodskoi labcoat, long"] = /obj/item/clothing/suit/storage/toggle/longcoat/zavodskoi zavodskoi_labcoats["zavodskoi corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/zavod zavodskoi_labcoats["zavodskoi corporate jacket, alt"] = /obj/item/clothing/suit/storage/toggle/corp/zavod/alt @@ -673,9 +669,6 @@ GLOBAL_DATUM_INIT(gear_tweak_modsuit_configuration, /datum/gear_tweak/modsuit_co 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 labcoat, long"] = /obj/item/clothing/suit/storage/toggle/longcoat/zeng zenghu_labcoats["zeng-hu paramedic jacket"] = /obj/item/clothing/suit/storage/toggle/para_jacket/zeng zenghu_labcoats["zeng-hu corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/zeng @@ -729,7 +722,6 @@ GLOBAL_DATUM_INIT(gear_tweak_modsuit_configuration, /datum/gear_tweak/modsuit_co ..() 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/toggle/longcoat/heph heph_labcoats["hephaestus corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/heph heph_labcoats["hephaestus winter coat"] = /obj/item/clothing/suit/storage/hooded/wintercoat/heph @@ -768,7 +760,6 @@ GLOBAL_DATUM_INIT(gear_tweak_modsuit_configuration, /datum/gear_tweak/modsuit_co ..() var/list/nt_labcoats = list() nt_labcoats["nanotrasen labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/nt - nt_labcoats["nanotrasen letterman labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/nt/letterman nt_labcoats["nanotrasen labcoat, long"] = /obj/item/clothing/suit/storage/toggle/longcoat/nt nt_labcoats["nanotrasen corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/nt nt_labcoats["nanotrasen winter coat"] = /obj/item/clothing/suit/storage/hooded/wintercoat/nt @@ -823,7 +814,6 @@ GLOBAL_DATUM_INIT(gear_tweak_modsuit_configuration, /datum/gear_tweak/modsuit_co ..() var/list/orion_labcoats = list() orion_labcoats["orion labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/orion - orion_labcoats["orion letterman labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/orion/letterman orion_labcoats["orion labcoat, long"] = /obj/item/clothing/suit/storage/toggle/longcoat/orion orion_labcoats["orion corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/orion orion_labcoats["orion corporate jacket, alt"] = /obj/item/clothing/suit/storage/toggle/corp/orion/alt diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 5c7e88a263d..87be2051502 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -42,19 +42,11 @@ desc = "A labcoat with command gold highlights." icon_state = "labcoat_cmoalt2" -/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_sci" - //NanoTrasen /obj/item/clothing/suit/storage/toggle/labcoat/nt name = "nanotrasen labcoat" icon_state = "labcoat_nt" -/obj/item/clothing/suit/storage/toggle/labcoat/nt/letterman - icon_state = "labcoat_letterman_nt" - /obj/item/clothing/suit/storage/toggle/longcoat/nt name = "nanotrasen long labcoat" icon_state = "labcoat_long_nt" @@ -71,15 +63,6 @@ /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" - /obj/item/clothing/suit/storage/toggle/longcoat/zeng name = "zeng-hu long labcoat" icon_state = "labcoat_long_zeng" @@ -93,12 +76,6 @@ /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" - /obj/item/clothing/suit/storage/toggle/longcoat/zavodskoi name = "zavodskoi long labcoat" icon_state = "labcoat_long_zav" @@ -109,9 +86,6 @@ name = "hephaestus labcoat" icon_state = "labcoat_heph" -/obj/item/clothing/suit/storage/toggle/labcoat/heph/letterman - icon_state = "labcoat_letterman_heph" - /obj/item/clothing/suit/storage/toggle/longcoat/heph name = "hephaestus long labcoat" icon_state = "labcoat_long_heph" @@ -148,13 +122,6 @@ /obj/item/clothing/suit/storage/toggle/labcoat/idris/alt icon_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" - /obj/item/clothing/suit/storage/toggle/longcoat/idris name = "idris long labcoat" icon_state = "labcoat_long_idris" @@ -165,9 +132,6 @@ name = "orion labcoat" icon_state = "labcoat_orion" -/obj/item/clothing/suit/storage/toggle/labcoat/orion/letterman - icon_state = "labcoat_letterman_orion" - /obj/item/clothing/suit/storage/toggle/longcoat/orion name = "orion long labcoat" icon_state = "labcoat_long_orion" diff --git a/html/changelogs/ElorgRHG-labcoat-purge.yml b/html/changelogs/ElorgRHG-labcoat-purge.yml new file mode 100644 index 00000000000..4f154acaa86 --- /dev/null +++ b/html/changelogs/ElorgRHG-labcoat-purge.yml @@ -0,0 +1,16 @@ +# Your name. +author: ElorgRHG + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Standardised the sprite of most if not all standard/corporate labcoats." + - imageadd: "Colorable labcoats now use the new, standard colorable palette." + - imageadd: "Uplifted the sprite of long labcoats." + - rscdel: "Removed all letterman labcoats and the science labcoat." diff --git a/icons/obj/item/clothing/suit/storage/toggle/labcoat.dmi b/icons/obj/item/clothing/suit/storage/toggle/labcoat.dmi index f0df4b72f3d..7e73e91da45 100644 Binary files a/icons/obj/item/clothing/suit/storage/toggle/labcoat.dmi and b/icons/obj/item/clothing/suit/storage/toggle/labcoat.dmi differ diff --git a/maps/away/away_site/cult_base/cult_base.dmm b/maps/away/away_site/cult_base/cult_base.dmm index 7da219197c3..33ba6188b74 100644 --- a/maps/away/away_site/cult_base/cult_base.dmm +++ b/maps/away/away_site/cult_base/cult_base.dmm @@ -5497,7 +5497,7 @@ /obj/random/suit, /obj/item/clothing/under/suit_jacket/tan, /obj/item/clothing/suit/storage/toggle/labcoat, -/obj/item/clothing/suit/storage/toggle/labcoat/science, +/obj/item/clothing/suit/storage/toggle/labcoat, /obj/machinery/power/apc/north{ req_access = null }, diff --git a/maps/away/ships/scc/scc_scout_ship.dmm b/maps/away/ships/scc/scc_scout_ship.dmm index 78e3b47ed1f..a8f5c664fa8 100644 --- a/maps/away/ships/scc/scc_scout_ship.dmm +++ b/maps/away/ships/scc/scc_scout_ship.dmm @@ -943,7 +943,7 @@ }, /obj/item/clothing/head/beret/corporate/zavod, /obj/item/clothing/head/softcap/zavod/alt, -/obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi/alt, +/obj/item/clothing/suit/storage/toggle/labcoat/alt, /obj/item/clothing/under/rank/engineer/zavod, /obj/item/clothing/under/rank/medical/surgeon/zavod, /obj/random/gloves, @@ -953,7 +953,7 @@ dir = 10 }, /obj/item/clothing/suit/storage/toggle/corp/zavod, -/obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi/letterman/alt, +/obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi/alt, /obj/item/clothing/head/sidecap/zavod, /obj/structure/closet, /obj/item/storage/backpack/messenger/zavod, @@ -3101,7 +3101,7 @@ pixel_x = 32 }, /obj/item/clothing/suit/storage/toggle/corp/orion, -/obj/item/clothing/suit/storage/toggle/labcoat/orion/letterman, +/obj/item/clothing/suit/storage/toggle/labcoat/orion, /obj/item/clothing/under/librarian/orion, /obj/item/clothing/under/rank/chef/orion, /obj/random/gloves,