cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-28 23:59:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2018-10-24 22:07:16 +01:00
parent 9517ba8877 1ce67ab74d
commit eac48b5283
11 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_head.dm
+10 -7
View File
@@ -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)"
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+2
View File
@@ -10,6 +10,7 @@
path = /obj/item/clothing/under/blazer/skirt
/datum/gear/uniform/cheongsam
description = "Various color variations of an old earth dress style. They are pretty close fitting around the waist."
display_name = "cheongsam selection"
/datum/gear/uniform/cheongsam/New()
@@ -21,6 +22,7 @@
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cheongasms))
/datum/gear/uniform/croptop
description = "Light shirts which shows the midsection of the wearer."
display_name = "croptop selection"
/datum/gear/uniform/croptop/New()