cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream PR

Browse Source
This commit is contained in:
Aronai Sieyes
2020-05-21 15:48:02 -04:00
parent 872bc17937
commit 1bd327ce1e
2 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/modules/client/preference_setup/loadout/loadout_head.dm
View File

@@ -125,21 +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"
<<<<<<< HEAD
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
>>>>>>> 8a2baa1... Updates Solgov/Sifguard uniforms (#7138)
/datum/gear/head/cowboy
display_name = "cowboy, rodeo"
@@ -341,11 +329,7 @@
display_name = "welding, engie (engineering/robotics)"
path = /obj/item/clothing/head/welding/engie
<<<<<<< HEAD
/*/datum/gear/head/beret/sol
=======
/datum/gear/head/beret/solgov
>>>>>>> 8a2baa1... Updates Solgov/Sifguard uniforms (#7138)
display_name = "beret sol, selection"
path = /obj/item/clothing/head/beret/solgov
@@ -355,7 +339,7 @@
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"