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

modular_citadel/code/datums/status_effects/chems.dm

@@ -221,7 +221,7 @@
 	var/mob/living/carbon/M = owner
 
 	//chem calculations
-	if(!owner.reagents.has_reagent(/datum/chemical_reaction/fermi/enthrall))
+	if(!owner.reagents.has_reagent(/datum/reagent/fermi/enthrall))
 		if (phase < 3 && phase != 0)
 			deltaResist += 3//If you've no chem, then you break out quickly
 			if(prob(5))

modular_citadel/code/modules/client/loadout/gloves.dm

@@ -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
-	
+

modular_citadel/code/modules/client/loadout/hands.dm

@@ -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"

modular_citadel/code/modules/client/loadout/head.dm

@@ -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