From 54a24d244ff7e2aa2fb26cefcfd16462de2eaf30 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sat, 13 Oct 2018 14:13:19 -0700 Subject: [PATCH] Merge pull request #5657 from lbnesquik/Kates-Cap-Fix Move surgery caps into their own selection. --- .../preference_setup/loadout/loadout_head.dm | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 80d596bcdc..f3ce3eae43 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -353,25 +353,17 @@ sols[initial(sol.name)] = sol gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sols))*/ // Vorestation removal. -/datum/gear/head/surgical/black - display_name = "surgical cap, black" - path = /obj/item/clothing/head/surgery/black +/datum/gear/head/surgical + display_name = "surgical cap selection" + path = /obj/item/clothing/head/surgery -/datum/gear/head/surgical/blue - display_name = "surgical cap, blue" - path = /obj/item/clothing/head/surgery/blue - -/datum/gear/head/surgical/green - display_name = "surgical cap, green" - path = /obj/item/clothing/head/surgery/green - -/datum/gear/head/surgical/navyblue - display_name = "surgical cap, navy blue" - path = /obj/item/clothing/head/surgery/navyblue - -/datum/gear/head/surgical/purple - display_name = "surgical cap, purple" - path = /obj/item/clothing/head/surgery/purple +/datum/gear/head/surgical/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)) /datum/gear/head/circuitry display_name = "headwear, circuitry (empty)"