cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 06:58:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates Solgov/Sifguard uniforms

Browse Source
This commit is contained in:
Novacat
2020-05-21 14:21:19 -04:00
committed by VirgoBot
parent 3237ae96d7
commit 872bc17937
22 changed files with 908 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_head.dm
+12 -4
View File
@@ -127,6 +127,7 @@
/*/datum/gear/head/cap/sol
display_name = "cap, sol"
<<<<<<< HEAD
path = /obj/item/clothing/head/soft/sol
/datum/gear/head/cap/expdition
@@ -136,6 +137,9 @@
/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"
@@ -337,15 +341,19 @@
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/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.