From 2800eced970f6f6cf237c07b98348b6e4b05cd6d Mon Sep 17 00:00:00 2001
From: John Doe <gamingskeleton3@gmail.com>
Date: Tue, 26 Sep 2023 16:09:50 -0700
Subject: [PATCH] fixes combistick folding

---
 code/__DEFINES/keybinding.dm          |  1 +
 code/datums/keybinding/yautja.dm      | 18 ++++++++++++++++++
 code/modules/cm_preds/yaut_weapons.dm |  9 +++++----
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/code/__DEFINES/keybinding.dm b/code/__DEFINES/keybinding.dm
index 1878ca63f34e..b044e3426bc1 100644
--- a/code/__DEFINES/keybinding.dm
+++ b/code/__DEFINES/keybinding.dm
@@ -185,6 +185,7 @@
 //misc yautja
 
 #define COMSIG_KB_YAUTJA_TELE_LOC "keybinding_yautja_tele_loc"
+#define COMSIG_KB_YAUTJA_FOLD_COMBISTICK "keybinding_yautja_fold_combistick"
 
 #define COMSIG_KB_OBSERVER_JOIN_XENO "keybinding_observer_join_as_xeno"
 #define COMSIG_KB_OBSERVER_JOIN_ERT "keybinding_observer_join_ert"
diff --git a/code/datums/keybinding/yautja.dm b/code/datums/keybinding/yautja.dm
index 40ffbf8d16e7..405aa3b590e2 100644
--- a/code/datums/keybinding/yautja.dm
+++ b/code/datums/keybinding/yautja.dm
@@ -594,3 +594,21 @@
 	var/mob/living/carbon/human/H = user.mob
 	var/obj/item/device/yautja_teleporter/tele = locate(/obj/item/device/yautja_teleporter) in H.contents
 	tele.add_tele_loc()
+
+
+/datum/keybinding/yautja/fold_combi
+	hotkey_keys = list("Space")
+	classic_keys = list("Unbound")
+	name = "fold_combi"
+	full_name = "Fold Combistick"
+	keybind_signal = COMSIG_KB_YAUTJA_FOLD_COMBISTICK
+
+/datum/keybinding/yautja/fold_combi/down(client/user)
+	. = ..()
+	if(.)
+		return
+	var/mob/living/carbon/human/human = user.mob
+	var/obj/item/weapon/yautja/combistick/held_item = human.get_held_item()
+	if(istype(held_item))
+		held_item.fold_combistick()
+	return TRUE
diff --git a/code/modules/cm_preds/yaut_weapons.dm b/code/modules/cm_preds/yaut_weapons.dm
index 762ab9ecbb0f..970834c3eeba 100644
--- a/code/modules/cm_preds/yaut_weapons.dm
+++ b/code/modules/cm_preds/yaut_weapons.dm
@@ -337,11 +337,12 @@
 /obj/item/weapon/yautja/combistick/IsShield()
 	return on
 
-/obj/item/weapon/yautja/combistick/verb/use_unique_action()
+/obj/item/weapon/yautja/combistick/verb/fold_combistick()
 	set category = "Weapons"
-	set name = "Unique Action"
-	set desc = "Activate or deactivate the combistick."
-	set src in usr
+	set name = "Fold Combistick"
+	set desc = "Fold or unfold the combistick."
+	set src = usr.contents
+
 	unique_action(usr)
 
 /obj/item/weapon/yautja/combistick/attack_self(mob/user)