Merge pull request #1972 from VOREStation/solgov-lore-fixes

Return of the UNSC
This commit is contained in:
Spades
2017-08-10 19:55:33 -04:00
committed by GitHub
18 changed files with 797 additions and 65 deletions
@@ -121,7 +121,7 @@
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
@@ -131,7 +131,7 @@
/datum/gear/head/cap/fleet
display_name = "cap, fleet"
path = /obj/item/clothing/head/soft/sol/fleet
path = /obj/item/clothing/head/soft/sol/fleet*/ // Vorestation removal
/datum/gear/head/cowboy
display_name = "cowboy, rodeo"
@@ -338,7 +338,7 @@
path = /obj/item/clothing/head/welding/engie
allowed_roles = list("Chief Engineer","Station Engineer","Atmospheric Technician","Research Director","Roboticist")
/datum/gear/head/beret/sol
/*/datum/gear/head/beret/sol
display_name = "beret sol, selection"
path = /obj/item/clothing/head/beret/sol
@@ -348,7 +348,7 @@
for(var/sol_style in typesof(/obj/item/clothing/head/beret/sol))
var/obj/item/clothing/head/beret/sol/sol = sol_style
sols[initial(sol.name)] = sol
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sols))
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sols))*/ // Vorestation removal.
/datum/gear/head/surgical/black
display_name = "surgical cap, black"
@@ -0,0 +1,3 @@
/*/datum/gear/head/cap/sol
display_name = "cap, sol"
path = /obj/item/clothing/head/soft/sol*/
@@ -2,6 +2,11 @@
display_name = "nudity permit"
path = /obj/item/clothing/under/permit
//Polaris overrides
/datum/gear/uniform/pt/expeditionary
display_name = "pt uniform, planetside sec"
path = /obj/item/clothing/under/pt/expeditionary
//KHI Uniforms
/datum/gear/uniform/job_khi/cmd
display_name = "khi uniform, cmd"