Merge remote-tracking branch 'citadel/master' into clickcd_experimental

2020-07-23 10:26:03 -07:00
parent 4373e2b452 678a1d0a49
commit ffd44b78ba
291 changed files with 5170 additions and 1010 deletions
@@ -3,6 +3,11 @@
 	category = SLOT_GLOVES
 	path = /obj/item/clothing/gloves/fingerless

+/datum/gear/evening
+	name = "Evening gloves"
+	category = SLOT_GLOVES
+	path = /obj/item/clothing/gloves/evening
+
 /datum/gear/goldring
 	name = "A gold ring"
 	category = SLOT_GLOVES
@@ -20,4 +25,4 @@
 	category = SLOT_GLOVES
 	path = /obj/item/clothing/gloves/ring/diamond
 	cost = 4
-	
+
@@ -11,7 +11,7 @@
 /datum/gear/dice
 	name = "Dice bag"
 	category = SLOT_HANDS
-	path = /obj/item/storage/pill_bottle/dice
+	path = /obj/item/storage/box/dice

 /datum/gear/eightball
 	name = "Magic eightball"
@@ -48,6 +48,11 @@
 	category = SLOT_HEAD
 	path = /obj/item/clothing/head/that

+/datum/gear/maidband
+	name = "Maid headband"
+	category = SLOT_HEAD
+	path= /obj/item/clothing/head/maid
+
 /datum/gear/flakhelm
 	name = "Flak Helmet"
 	category = SLOT_HEAD