Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad

2020-01-15 15:57:32 -08:00
parent 48fadffbfb b21b3fee3c
commit d29603ad77
1186 changed files with 197837 additions and 199067 deletions
@@ -1,7 +1,7 @@
 /datum/gear/greytidestationwide
-	name = "Grey jumpsuit"
+	name = "Staff Assistant's jumpsuit"
 	category = SLOT_W_UNIFORM
-	path = /obj/item/clothing/under/color/grey
+	path = /obj/item/clothing/under/staffassistant
 	restricted_roles = list("Assistant")

 /datum/gear/neetsuit
@@ -93,6 +93,7 @@
 	restricted_desc = "Engineering, Security, and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")

+/*Commenting out Until next Christmas or made automatic
 /datum/gear/santahatr
 	name = "Red Santa Hat"
 	category = SLOT_HEAD
@@ -102,6 +103,7 @@
 	name = "Green Santa Hat"
 	category = SLOT_HEAD
 	path = /obj/item/clothing/head/christmashatg
+*/

 /datum/gear/cowboyhat
 	name = "Cowboy Hat, Brown"
@@ -129,6 +131,3 @@
 	path = /obj/item/clothing/head/cowboyhat/sec
 	restricted_desc = "Security"
 	restricted_roles = list("Warden","Detective","Security Officer","Head of Security")
-
-
-
@@ -390,6 +390,7 @@
 	path = /obj/item/clothing/under/gear_harness

 //Christmas
+/*Commenting out Until next Christmas or made automatic
 /datum/gear/christmasmaler
 	name = "Red Masculine Christmas Suit"
 	category = SLOT_W_UNIFORM
@@ -415,6 +416,7 @@
 	category = SLOT_W_UNIFORM
 	path = /obj/item/clothing/under/stripper_pink
 	cost = 3
+*/

 /datum/gear/greenstripper
 	name = "Green stripper outfit"