Merge branch 'master' into loadout-json

2020-12-06 17:24:24 +00:00
parent 5566c00a69 f2b9b574fe
commit 0f540884eb
245 changed files with 31194 additions and 1645 deletions
@@ -524,3 +524,17 @@
 	slot = SLOT_HEAD
 	path = 	/obj/item/clothing/head/halo
 	ckeywhitelist = list("hisakaki")
+
+/datum/gear/donator/vest
+	name = "vest and shirt"
+	slot = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/custom/vest
+	ckeywhitelist = list("maylowfox")
+
+/datum/gear/donator/exo
+	name = "exo frame"
+	slot = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/custom/exo
+	ckeywhitelist = list("jesterz7")
+
+
@@ -12,7 +12,7 @@

 /datum/gear/hands/dice
 	name = "Dice bag"
-	path = /obj/item/storage/box/dice
+	path = /obj/item/storage/dice

 /datum/gear/hands/eightball
 	name = "Magic eightball"
@@ -14,3 +14,9 @@
 	name = "Joy mask"
 	path = /obj/item/clothing/mask/joy
 	cost = 3
+
+/datum/gear/mask/gas
+	name = "Gas Mask"
+	path = /obj/item/clothing/mask/gas
+	cost = 2
+	restricted_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer") //*shrug
@@ -44,6 +44,10 @@
 	name = "Maid costume"
 	path = /obj/item/clothing/under/costume/maid

+/datum/gear/uniform/maidcostume/polychromic
+	name = "Polychromic maid costume"
+	path = /obj/item/clothing/under/rank/civilian/janitor/maid/polychromic
+
 /datum/gear/uniform/mailmanuniform
 	name = "Mailman's jumpsuit"
 	path = /obj/item/clothing/under/misc/mailman