Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul

code/game/objects/items/dice.dm

@@ -17,6 +17,11 @@
 				/obj/item/dice/d100
 				)
 
+/obj/item/storage/dice/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.can_hold = single_path_typecache_immutable(/obj/item/dice)
+
 /obj/item/storage/dice/PopulateContents()
 	new /obj/item/dice/d4(src)
 	new /obj/item/dice/d6(src)

code/game/objects/obj_defense.dm

@@ -22,7 +22,7 @@
 
 //returns the damage value of the attack after processing the obj's various armor protections
 /obj/proc/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir, armour_penetration = 0)
-	if(damage_flag == MELEE && damage_amount < damage_deflection)
+	if(damage_flag == "melee" && damage_amount < damage_deflection)		// TODO: Refactor armor datums and types entirely jfc
 		return 0
 	switch(damage_type)
 		if(BRUTE)