diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm index 0383f58f0a..68d2755927 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -9,6 +9,24 @@ ..() gear_tweaks += gear_tweak_free_color_choice +/datum/gear/suit/labcoat_old + display_name = "labcoat, old-school" + path = /obj/item/clothing/suit/storage/toggle/labcoat/old + +/datum/gear/suit/labcoat_cmo_old + display_name = "CMO's labcoat, oldschool" + path = /obj/item/clothing/suit/storage/toggle/labcoat/old/cmo + allowed_roles = list("Chief Medical officer") + +/datum/gear/suit/roles/labcoat_old/new() + ..() + var/list/labcoats = list( + "Oldschool Scientist's Labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/old/tox, + "Oldschool Virologist's Labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/old/vir, + "Oldschool Chemist's Labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/old/chem + ) + gear_tweaks += new/datum/gear_tweak/path(labcoats) + /datum/gear/suit/jacket_modular display_name = "jacket, modular" path = /obj/item/clothing/suit/storage/fluff/jacket @@ -83,4 +101,6 @@ Talon winter coat */ /datum/gear/suit/wintercoat/talon display_name = "winter coat, Talon" - path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon \ No newline at end of file + path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon + + diff --git a/code/modules/clothing/suits/labcoat_vr.dm b/code/modules/clothing/suits/labcoat_vr.dm index 4f82afd2e3..e7da9f426a 100644 --- a/code/modules/clothing/suits/labcoat_vr.dm +++ b/code/modules/clothing/suits/labcoat_vr.dm @@ -1,7 +1,7 @@ // 'Modern' labcoats /obj/item/clothing/suit/storage/toggle/labcoat/modern name = "modern labcoat" - + icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' icon_state = "labcoat_mod" @@ -25,3 +25,38 @@ icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' icon_state = "bio_mod" + +/obj/item/clothing/suit/storage/toggle/labcoat/old + name = "old-school labcoat" + + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "labcoat_old" + +/obj/item/clothing/suit/storage/toggle/labcoat/old/tox + name = "old-school scientist's labcoat" + + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "labcoat_old_tox" + +/obj/item/clothing/suit/storage/toggle/labcoat/old/chem + name = "old-school chemist's labcoat" + + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "labcoat_old_chem" + +/obj/item/clothing/suit/storage/toggle/labcoat/old/vir + name = "old-school virologist's labcoat" + + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "labcoat_old_vir" + +/obj/item/clothing/suit/storage/toggle/labcoat/old/cmo + name = "old-school CMO's labcoat" + + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "labcoat_old_cmo" \ No newline at end of file diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index 146134b53b..c4e3e0e8e4 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -1224,6 +1224,7 @@ /obj/item/clothing/shoes/white = 5, /obj/item/clothing/suit/storage/toggle/labcoat = 5, /obj/item/clothing/suit/storage/toggle/labcoat/modern = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/old = 5, //VoreStation edit, pre-fulp labcoat. /obj/item/clothing/mask/surgical = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/medical = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt = 5, @@ -1244,6 +1245,7 @@ /obj/item/clothing/under/rank/chemist/skirt = 5, /obj/item/clothing/shoes/white = 5, /obj/item/clothing/suit/storage/toggle/labcoat/chemist = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/old/chemist = 5, //VoreStation edit, pre-fulp labcoat. /obj/item/clothing/suit/storage/hooded/wintercoat/medical/chemist = 5, /obj/item/clothing/head/beret/medical/chem = 5, /obj/item/weapon/storage/backpack/chemistry = 5, @@ -1281,7 +1283,8 @@ /obj/item/clothing/under/rank/virologist/skirt = 5, /obj/item/clothing/shoes/white = 5, /obj/item/clothing/suit/storage/toggle/labcoat/virologist = 5, - /obj/item/clothing/suit/storage/hooded/wintercoat/medical/viro = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/old/vir = 5, + /obj/item/clothing/suit/storage/hooded/wintercoat/medical/viro = 5, //VoreStation edit, pre-fulp labcoat. /obj/item/clothing/head/beret/medical/viro = 5, /obj/item/clothing/mask/surgical = 5, /obj/item/weapon/storage/backpack/virology = 5, @@ -1301,6 +1304,7 @@ /obj/item/clothing/under/rank/scientist/skirt = 5, /obj/item/clothing/under/rank/scientist/turtleneck = 5, /obj/item/clothing/suit/storage/toggle/labcoat = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/old = 5, //VoreStation edit, pre-fulp labcoat. /obj/item/clothing/suit/storage/toggle/labcoat/modern = 5, /obj/item/clothing/shoes/white = 5, /obj/item/clothing/shoes/slippers = 5, diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index 441c06803d..d087423497 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -1139,7 +1139,8 @@ product_ads = "Dress your best! It's what big D would want.;Overwear for all occasions!;Big D has what you need if what you need is some form of jacket!;Need a new hoodie? Bid D has you covered.;Big D says you need a new suit!;Big D smiles when he sees you in one of his coats!" icon_state = "suit" vend_delay = 16 - products = list(/obj/item/clothing/suit/storage/apron = 5, + products = list(/obj/item/clothing/suit/storage/toggle/labcoat/old = 100, + /obj/item/clothing/suit/storage/apron = 5, /obj/item/clothing/suit/storage/flannel/aqua = 5, /obj/item/clothing/suit/storage/toggle/bomber = 5, /obj/item/clothing/suit/storage/bomber/alt = 5, diff --git a/icons/inventory/suit/item_vr.dmi b/icons/inventory/suit/item_vr.dmi index 30fc466955..0261f8b6a3 100644 Binary files a/icons/inventory/suit/item_vr.dmi and b/icons/inventory/suit/item_vr.dmi differ diff --git a/icons/inventory/suit/mob_vr.dmi b/icons/inventory/suit/mob_vr.dmi index 4288fd0326..d5e2082d0e 100644 Binary files a/icons/inventory/suit/mob_vr.dmi and b/icons/inventory/suit/mob_vr.dmi differ