Merge branch 'master' into Kristopher-Uniform-Patreon

hyperstation/code/obj/rewards.dm

@@ -105,9 +105,9 @@
 	flags_inv = HIDEFACE|HIDEFACIALHAIR
 	w_class = WEIGHT_CLASS_SMALL
 
-/obj/item/clothing/suit/hooded/wintercoat/chloe
+/obj/item/clothing/suit/chloe
 	name = "Fleet Commander's Overcoat"
-	desc = "Custom tailored to warm the cold commanding hearts of the Syndicate's feared XIV'th battle group. Its armour plating has been removed, but its beret remains inside."
+	desc = "Custom tailored to warm the cold commanding hearts of the Syndicate's feared XIV'th battle group. Its armour plating has been removed."
 	icon_state = "commissar_greatcoat"
 	item_state = "commissar_greatcoat"
 	allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/melee/classic_baton/telescopic, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/screwdriver, /obj/item/crowbar, /obj/item/wrench, /obj/item/stack/cable_coil, /obj/item/weldingtool, /obj/item/multitool)
@@ -115,9 +115,8 @@
 	body_parts_covered = CHEST|GROIN|ARMS|LEGS
 	mutantrace_variation = MUTANTRACE_VARIATION
 	tauric = TRUE
-	hoodtype = /obj/item/clothing/head/hooded/winterhood/chloe
 
-/obj/item/clothing/head/hooded/winterhood/chloe
+/obj/item/clothing/head/chloe
 	name = "Fleet Commander's Beret"
 	desc = "A beret bearing a worn golden symbol that stikes fear in the hearts of many. It smells faintly of plasma and gunpowder."
 	icon = 'hyperstation/icons/obj/clothing/rewards.dmi'
@@ -131,4 +130,25 @@
 	icon_state = "touchinfuzzyuni"
 	item_state = "touchinfuzzyuni"
 	body_parts_covered = CHEST|GROIN|ARMS|LEGS
-	fitted = NO_FEMALE_UNIFORM
+	fitted = NO_FEMALE_UNIFORM
+
+/obj/item/toy/sword/chloesabre
+	name = "Fleet Commander's Sabre"
+	desc = "An elegant weapon, similar in design to the Captain's Sabre, but with a syndicate twist."
+	icon = 'icons/obj/custom.dmi'
+	alternate_worn_icon = 'icons/mob/custom_w.dmi'
+	icon_state = "darksabre"
+	item_state = "darksabre"
+	force = 5
+	throwforce = 5
+	hitsound = 'sound/weapons/rapierhit.ogg'
+	lefthand_file = 'modular_citadel/icons/mob/inhands/stunsword_left.dmi'
+	righthand_file = 'modular_citadel/icons/mob/inhands/stunsword_right.dmi'
+	obj_flags = UNIQUE_RENAME
+	attack_verb = list("slashed", "cut")
+
+/obj/item/toy/sword/chloesabre/get_belt_overlay()
+	return mutable_appearance('icons/obj/custom.dmi', "darksheath-darksabre")
+
+/obj/item/toy/sword/chloesabre/get_worn_belt_overlay(icon_file)
+	return mutable_appearance(icon_file, "darksheath-darksabre")