Merge pull request #8002 from VOREStation/upstream-merge-7138

[MIRROR] Updates Solgov/Sifguard uniforms
This commit is contained in:
Aronai Sieyes
2020-05-21 16:03:58 -04:00
committed by GitHub
23 changed files with 903 additions and 312 deletions
@@ -125,17 +125,9 @@
display_name = "cap, bill"
path = /obj/item/clothing/head/soft/mbill
/*/datum/gear/head/cap/sol
/datum/gear/head/cap/sol
display_name = "cap, sol"
path = /obj/item/clothing/head/soft/sol
/datum/gear/head/cap/expdition
display_name = "cap, expedition"
path = /obj/item/clothing/head/soft/sol/expedition
/datum/gear/head/cap/fleet
display_name = "cap, fleet"
path = /obj/item/clothing/head/soft/sol/fleet*/ // Vorestation removal
path = /obj/item/clothing/head/soft/solgov
/datum/gear/head/cowboy
display_name = "cowboy, rodeo"
@@ -337,17 +329,17 @@
display_name = "welding, engie (engineering/robotics)"
path = /obj/item/clothing/head/welding/engie
/*/datum/gear/head/beret/sol
/datum/gear/head/beret/solgov
display_name = "beret sol, selection"
path = /obj/item/clothing/head/beret/sol
path = /obj/item/clothing/head/beret/solgov
/datum/gear/head/beret/sol/New()
/datum/gear/head/beret/solgov/New()
..()
var/list/sols = list()
for(var/sol_style in typesof(/obj/item/clothing/head/beret/sol))
var/obj/item/clothing/head/beret/sol/sol = sol_style
for(var/sol_style in typesof(/obj/item/clothing/head/beret/solgov))
var/obj/item/clothing/head/beret/solgov/sol = sol_style
sols[initial(sol.name)] = sol
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sols))*/ // Vorestation removal.
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sols))
/datum/gear/head/surgery
display_name = "surgical cap selection"