From d67bb58346d342ebe60284c761a22f5a0765e338 Mon Sep 17 00:00:00 2001
From: Cerebulon <tanhindmarsh@yahoo.com>
Date: Mon, 31 Jul 2023 14:53:52 +0100
Subject: [PATCH] A couple of loadout fixes (Mostly Cloaks)

---
 .../preference_setup/loadout/loadout_general.dm    |  2 +-
 .../preference_setup/loadout/loadout_suit.dm       | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm
index 0f900ad81a..f1142f634a 100644
--- a/code/modules/client/preference_setup/loadout/loadout_general.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_general.dm
@@ -70,7 +70,7 @@
 /datum/gear/toy
 	display_name = "toy selection"
 	description = "Choose from a number of toys."
-	path = /obj/item/toy/
+	path = /obj/item/toy/blink
 
 /datum/gear/toy/New()
 	..()
diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm
index f8f69c6436..a63053c17c 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm
@@ -235,20 +235,13 @@
 	)
 	gear_tweaks += new/datum/gear_tweak/path(coattype)
 
-//Half cloak
-/datum/gear/suit/cloak_half
-	display_name = "cloak, half, colorable"
-	path = /obj/item/clothing/accessory/storage/poncho/roles/cloak/half
-
-/datum/gear/suit/cloak_half/New()
-	gear_tweaks += gear_tweak_free_color_choice
-
 //Shoulder cloak
 /datum/gear/suit/cloak_shoulder
 	display_name = "cloak, left shoulder (colorable)"
 	path = /obj/item/clothing/accessory/storage/poncho/roles/cloak/shoulder
 
 /datum/gear/suit/cloak_shoulder/New()
+	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
 /datum/gear/suit/cloak_shoulder_right
@@ -256,6 +249,7 @@
 	path = /obj/item/clothing/accessory/storage/poncho/roles/cloak/shoulder/right
 
 /datum/gear/suit/cloak_shoulder_right/New()
+	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
 /datum/gear/suit/capelet
@@ -263,13 +257,15 @@
 	path = /obj/item/clothing/accessory/storage/poncho/roles/cloak/capelet
 
 /datum/gear/suit/capelet/New()
+	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
 /datum/gear/suit/roughcloak
-	display_name = "cloak, rough (colorable)"
+	display_name = "cloak, rough halfcloak (colorable)"
 	path = /obj/item/clothing/accessory/storage/poncho/roles/cloak/half
 
 /datum/gear/suit/roughcloak/New()
+	..()
 	gear_tweaks += gear_tweak_free_color_choice
 
 /datum/gear/suit/unathi_robe