From b2e676d2162c30feff4f1bd933f015d86db966eb Mon Sep 17 00:00:00 2001 From: Atermonera Date: Mon, 22 Oct 2018 17:54:02 -0700 Subject: [PATCH 1/2] Merge pull request #5692 from lbnesquik/Kates-Surgery-Fix Correctly fix surgery caps selection this time. --- .../preference_setup/loadout/loadout_head.dm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index f3ce3eae43..e051daf585 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -353,17 +353,20 @@ sols[initial(sol.name)] = sol gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sols))*/ // Vorestation removal. -/datum/gear/head/surgical +/datum/gear/head/surgery display_name = "surgical cap selection" + description = "Choose from a number of rings of different caps." path = /obj/item/clothing/head/surgery -/datum/gear/head/surgical/New() +/datum/gear/head/surgery/New() ..() - var/list/caps = list() - for(var/surgery in typesof(/obj/item/clothing/head/surgery)) - var/obj/item/clothing/head/surgery/cap_type = caps - caps[initial(cap_type.name)] = cap_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(caps)) + var/cap_type = list() + cap_type["Purple cap"] = /obj/item/clothing/head/surgery/purple + cap_type["Blue cap"] = /obj/item/clothing/head/surgery/blue + cap_type["Green cap"] = /obj/item/clothing/head/surgery/green + cap_type["Black cap"] = /obj/item/clothing/head/surgery/black + cap_type["Navy cap"] = /obj/item/clothing/head/surgery/navyblue + gear_tweaks += new/datum/gear_tweak/path(cap_type) /datum/gear/head/circuitry display_name = "headwear, circuitry (empty)"