From f858ca2a4287f794394c462fa7aaf68e09f8b9be Mon Sep 17 00:00:00 2001 From: Runa Dacino Date: Wed, 8 Dec 2021 18:24:52 +0100 Subject: [PATCH] Bugfixing, style changes Tried to make the loadout versions follow convention. Fixed path issue with vendor, changing "/chemist" to "/chem" --- .../preference_setup/loadout/loadout_suit_vr.dm | 12 +++++++++--- code/modules/clothing/suits/labcoat_vr.dm | 3 +++ code/modules/economy/vending_machines.dm | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) 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 68d2755927..3fcc18e04a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -14,11 +14,17 @@ path = /obj/item/clothing/suit/storage/toggle/labcoat/old /datum/gear/suit/labcoat_cmo_old - display_name = "CMO's labcoat, oldschool" + display_name = "labcoat, CMO, oldschool" path = /obj/item/clothing/suit/storage/toggle/labcoat/old/cmo - allowed_roles = list("Chief Medical officer") + allowed_roles = list("Chief Medical Officer") -/datum/gear/suit/roles/labcoat_old/new() +/datum/gear/suit/roles/labcoat_old + display_name = "labcoat selection, department, oldschool" + path = /obj/item/clothing/suit/storage/toggle/labcoat/old/tox + cost = 2 + + +/datum/gear/suit/roles/labcoat_old/New() ..() var/list/labcoats = list( "Oldschool Scientist's Labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/old/tox, diff --git a/code/modules/clothing/suits/labcoat_vr.dm b/code/modules/clothing/suits/labcoat_vr.dm index e7da9f426a..1e3f13a411 100644 --- a/code/modules/clothing/suits/labcoat_vr.dm +++ b/code/modules/clothing/suits/labcoat_vr.dm @@ -26,6 +26,9 @@ default_worn_icon = 'icons/inventory/head/mob_vr.dmi' icon_state = "bio_mod" +// Labcoat icons from before the fulpstation labcoats became default +// denoted "old" to avoid conflict + /obj/item/clothing/suit/storage/toggle/labcoat/old name = "old-school labcoat" diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index c4e3e0e8e4..5027691a9a 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -1245,7 +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/toggle/labcoat/old/chem = 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,