Merge pull request #8392 from Poojawa/donator-item-fixing

Fixes Kiara's sabre belt icons, fixes armor offsets for taurs

code/modules/clothing/suits/_suits.dm

@@ -41,12 +41,6 @@
 				if(tauric == TRUE)
 					center = TRUE
 					dimension_x = 64
-			/*
-			else if(H.dna.features["taur"] == "Horse" || "Cow")
-				taurmode = HOOF_TAURIC //tweak this for when the exotics get their own suits, if ever.
-				center = TRUE
-				dimension_x = 64
-			*/
 		else
 			taurmode = NOT_TAURIC
 			if(tauric == TRUE)

code/modules/clothing/suits/armor.dm

@@ -23,7 +23,6 @@
 	item_state = "armoralt"
 	blood_overlay_type = "armor"
 	dog_fashion = /datum/dog_fashion/back
-	tauric = TRUE		//Citadel Add for tauric hardsuits
 
 /obj/item/clothing/suit/armor/vest/alt
 	desc = "A Type I armored vest that provides decent protection against most types of damage."

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -49,6 +49,66 @@
 	item_color = "steele"
 	medaltype = "medal-silver"
 
+/obj/item/toy/sword/darksabre
+	name = "Kiara's Sabre"
+	desc = "This blade looks as dangerous as its owner."
+	icon = 'icons/obj/custom.dmi'
+	alternate_worn_icon = 'icons/mob/custom_w.dmi'
+	icon_state = "darksabre"
+	item_state = "darksabre"
+	lefthand_file = 'modular_citadel/icons/mob/inhands/stunsword_left.dmi'
+	righthand_file = 'modular_citadel/icons/mob/inhands/stunsword_right.dmi'
+	w_class = WEIGHT_CLASS_SMALL
+	attack_verb = list("attacked", "struck", "hit")
+
+
+/obj/item/storage/belt/sabre/darksabre
+	name = "Ornate Sheathe"
+	desc = "An ornate and rather sinister looking sabre sheathe."
+	icon = 'icons/obj/custom.dmi'
+	alternate_worn_icon = 'icons/mob/custom_w.dmi'
+	icon_state = "darksheath"
+	item_state = "darksheath"
+	w_class = WEIGHT_CLASS_BULKY
+
+/obj/item/storage/belt/sabre/darksabre/ComponentInitialize()
+	. = ..()
+	GET_COMPONENT(STR, /datum/component/storage)
+	STR.max_items = 1
+	STR.rustle_sound = FALSE
+	STR.max_w_class = WEIGHT_CLASS_BULKY
+	STR.can_hold = typecacheof(list(
+		/obj/item/toy/sword/darksabre
+		))
+
+/obj/item/storage/belt/sabre/darksabre/update_icon()
+	icon_state = "darksheath"
+	item_state = "darksheath"
+	if(contents.len)
+		icon_state += "-darksabre"
+		item_state += "-darksabre"
+	if(loc && isliving(loc))
+		var/mob/living/L = loc
+		L.regenerate_icons()
+	..()
+
+/obj/item/storage/belt/sabre/darksabre/PopulateContents()
+	new /obj/item/toy/sword/darksabre(src)
+	update_icon()
+
+/obj/item/clothing/suit/armor/vest/darkcarapace
+	name = "Dark Armor"
+	desc = "A dark, non-functional piece of armor sporting a red and black finish."
+	icon = 'icons/obj/custom.dmi'
+	alternate_worn_icon = 'icons/mob/custom_w.dmi'
+	icon_state = "darkcarapace"
+	item_state = "darkcarapace"
+	blood_overlay_type = "armor"
+	dog_fashion = /datum/dog_fashion/back
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+
+
 /obj/item/lighter/gold
 	name = "\improper Engraved Zippo"
 	desc = "A shiny and relatively expensive zippo lighter. There's a small etched in verse on the bottom that reads, 'No Gods, No Masters, Only Man.'"
@@ -307,51 +367,6 @@
 		if(prob(5) && H.hallucination < 15)
 			H.hallucination += 10
 
-/obj/item/toy/sword/darksabre
-	name = "Kiara's Sabre"
-	desc = "This blade looks as dangerous as its owner."
-	icon = 'icons/obj/custom.dmi'
-	alternate_worn_icon = 'icons/mob/custom_w.dmi'
-	icon_state = "darksabre"
-	item_state = "darksabre"
-	lefthand_file = 'modular_citadel/icons/mob/inhands/stunsword_left.dmi'
-	righthand_file = 'modular_citadel/icons/mob/inhands/stunsword_right.dmi'
-	w_class = WEIGHT_CLASS_SMALL
-	attack_verb = list("attacked", "struck", "hit")
-
-
-/obj/item/storage/belt/sabre/darksabre
-	name = "Ornate Sheathe"
-	desc = "An ornate and rather sinister looking sabre sheathe."
-	icon = 'icons/obj/custom.dmi'
-	alternate_worn_icon = 'icons/mob/custom_w.dmi'
-	icon_state = "darksheath"
-	item_state = "darksheath"
-	w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/storage/belt/sabre/darksabre/ComponentInitialize()
-	. = ..()
-	GET_COMPONENT(STR, /datum/component/storage)
-	STR.max_items = 1
-	STR.rustle_sound = FALSE
-	STR.max_w_class = WEIGHT_CLASS_BULKY
-	STR.can_hold = typecacheof(list(
-		/obj/item/toy/sword/darksabre
-		))
-
-/obj/item/clothing/suit/armor/vest/darkcarapace
-	name = "Dark Armor"
-	desc = "A dark, non-functional piece of armor sporting a red and black finish."
-	icon = 'icons/obj/custom.dmi'
-	alternate_worn_icon = 'icons/mob/custom_w.dmi'
-	icon_state = "darkcarapace"
-	item_state = "darkcarapace"
-	blood_overlay_type = "armor"
-	dog_fashion = /datum/dog_fashion/back
-	mutantrace_variation = NO_MUTANTRACE_VARIATION
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
-
-
 /obj/item/clothing/neck/cloak/green
 	name = "Generic Green Cloak"
 	desc = "This cloak doesn't seem too special."