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

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2020-05-27 20:10:55 +02:00
parent 9aa2fe7d0a c41156173d
commit e807b80281
159 changed files with 28268 additions and 25848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_head.dm
+8 -16
View File
@@ -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"
code/modules/client/preference_setup/loadout/loadout_xeno.dm
+20
View File
@@ -393,3 +393,23 @@
/datum/gear/suit/labcoat_tesh/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/suit/teshcoat
display_name = "small black coat, recolorable stripes (Teshari)"
path = /obj/item/clothing/suit/storage/toggle/tesharicoat
whitelisted = SPECIES_TESHARI
sort_category = "Xenowear"
/datum/gear/suit/teshcoat/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/suit/teshcoatwhite
display_name = "smallcoat, recolorable (Teshari)"
path = /obj/item/clothing/suit/storage/toggle/tesharicoatwhite
whitelisted = SPECIES_TESHARI
sort_category = "Xenowear"
/datum/gear/suit/teshcoatwhite/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)