From be042f1d5e7ae435d9ab5c076303e8cbcdeea707 Mon Sep 17 00:00:00 2001
From: Beagle <56142455+BeagleGaming1@users.noreply.github.com>
Date: Mon, 2 Oct 2023 13:02:26 -0400
Subject: [PATCH] initial (to test later)

---
 code/__DEFINES/keybinding.dm              |  28 ++-
 code/datums/keybinding/human.dm           | 118 +----------
 code/datums/keybinding/human_combat.dm    |   1 -
 code/datums/keybinding/human_inventory.dm | 244 ++++++++++++++++++++++
 colonialmarines.dme                       |   1 +
 5 files changed, 271 insertions(+), 121 deletions(-)
 create mode 100644 code/datums/keybinding/human_inventory.dm

diff --git a/code/__DEFINES/keybinding.dm b/code/__DEFINES/keybinding.dm
index b044e3426bc1..437c1e74f81f 100644
--- a/code/__DEFINES/keybinding.dm
+++ b/code/__DEFINES/keybinding.dm
@@ -43,12 +43,6 @@
 #define COMSIG_KG_CLIENT_RADIO_DOWN "keybinding_client_radio_down"
 
 //Human
-#define COMSIG_KB_HUMAN_QUICKEQUIP_DOWN "keybinding_human_quickequip_down"
-#define COMSIG_KB_HUMAN_SECONDARY_DOWN "keybinding_human_secondary_down"
-#define COMSIG_KB_HUMAN_TERTIARY_DOWN "keybinding_human_tertiary_down"
-#define COMSIG_KB_HUMAN_QUATERNARY_DOWN "keybinding_human_quaternary_down"
-#define COMSIG_KB_HUMAN_QUICK_EQUIP_DOWN "keybinding_human_quick_equip_down"
-
 #define COMSIG_KB_HUMAN_ISSUE_ORDER "keybinding_human_issue_order"
 #define COMSIG_KB_HUMAN_ISSUE_ORDER_MOVE "keybinding_human_issue_order_move"
 #define COMSIG_KB_HUMAN_ISSUE_ORDER_HOLD "keybinding_human_issue_order_hold"
@@ -57,12 +51,29 @@
 #define COMSIG_KB_HUMAN_SPECIALIST_ACTIVATION_ONE "keybinding_human_specialist_activation_one"
 #define COMSIG_KB_HUMAN_SPECIALIST_ACTIVATION_TWO "keybinding_human_specialist_activation_two"
 
-#define COMSIG_KB_HUMAN_PICK_UP "keybinding_human_pick_up"
-
 #define COMSIG_KB_HUMAN_ROTATE_CHAIR "keybinding_human_rotate_chair"
 
 #define COMSIG_KB_HUMAN_SHOW_HELD_ITEM "keybinding_human_show_held_item"
 
+// Human Inventory Navigation
+#define COMSIG_KB_HUMAN_INTERACT_OTHER_HAND "keybinding_human_interact_other_hand"
+#define COMSIG_KB_HUMAN_INTERACT_SLOT_BACK "keybinding_human_interact_slot_back"
+#define COMSIG_KB_HUMAN_INTERACT_SLOT_BELT "keybinding_human_interact_slot_belt"
+#define COMSIG_KB_HUMAN_INTERACT_SLOT_UNIFORM "keybinding_human_interact_slot_uniform"
+#define COMSIG_KB_HUMAN_INTERACT_SLOT_SUIT "keybinding_human_interact_slot_suit"
+#define COMSIG_KB_HUMAN_INTERACT_SLOT_HELMET "keybinding_human_interact_slot_helmet"
+#define COMSIG_KB_HUMAN_INTERACT_SLOT_LEFT_POUCH "keybinding_human_interact_slot_left_pouch"
+#define COMSIG_KB_HUMAN_INTERACT_SLOT_RIGHT_POUCH "keybinding_human_interact_slot_right_pouch"
+#define COMSIG_KB_HUMAN_INTERACT_SUIT_S_STORE "keybinding_human_interact_slot_suit_storage"
+
+#define COMSIG_KB_HUMAN_INTERACT_QUICKEQUIP_DOWN "keybinding_human_interact_quickequip_down"
+#define COMSIG_KB_HUMAN_INTERACT_SECONDARY_DOWN "keybinding_human_interact_secondary_down"
+#define COMSIG_KB_HUMAN_INTERACT_TERTIARY_DOWN "keybinding_human_interact_tertiary_down"
+#define COMSIG_KB_HUMAN_INTERACT_QUATERNARY_DOWN "keybinding_human_interact_quaternary_down"
+#define COMSIG_KB_HUMAN_INTERACT_QUICK_EQUIP_DOWN "keybinding_human_interact_quick_equip_down"
+
+#define COMSIG_KB_HUMAN_INTERACT_PICK_UP "keybinding_human_interact_pick_up"
+
 // Human Combat
 #define COMSIG_KB_HUMAN_WEAPON_FIELDSTRIP "keybinding_human_weapon_fieldstrip"
 #define COMSIG_KB_HUMAN_WEAPON_BURSTFIRE "keybinding_human_weapon_burstfire"
@@ -199,6 +210,7 @@
 #define CATEGORY_CARBON "CARBON"
 #define CATEGORY_HUMAN "HUMAN"
 #define CATEGORY_HUMAN_COMBAT "HUMAN COMBAT"
+#define CATEGORY_HUMAN_INVENTORY "HUMAN INVENTORY"
 #define CATEGORY_ROBOT "ROBOT"
 #define CATEGORY_YAUTJA "YAUTJA"
 #define CATEGORY_MISC "MISC"
diff --git a/code/datums/keybinding/human.dm b/code/datums/keybinding/human.dm
index 6580c38083ea..42cb17ed1059 100644
--- a/code/datums/keybinding/human.dm
+++ b/code/datums/keybinding/human.dm
@@ -1,8 +1,3 @@
-#define QUICK_EQUIP_PRIMARY 1
-#define QUICK_EQUIP_SECONDARY 2
-#define QUICK_EQUIP_TERTIARY 3
-#define QUICK_EQUIP_QUATERNARY 4
-
 /datum/keybinding/human
 	category = CATEGORY_HUMAN
 	weight = WEIGHT_MOB
@@ -10,86 +5,6 @@
 /datum/keybinding/human/can_use(client/user)
 	return ishuman(user.mob)
 
-/datum/keybinding/human/quick_equip
-	hotkey_keys = list("E")
-	classic_keys = list("E")
-	name = "quick_equip"
-	full_name = "Unholster"
-	description = "Take out an available weapon"
-	keybind_signal = COMSIG_KB_HUMAN_QUICKEQUIP_DOWN
-
-/datum/keybinding/human/quick_equip/down(client/user)
-	. = ..()
-	if(.)
-		return
-	var/mob/living/carbon/human/H = user.mob
-	H.holster_verb(QUICK_EQUIP_PRIMARY)
-	return TRUE
-
-/datum/keybinding/human/quick_equip_secondary
-	hotkey_keys = list("Shift+E")
-	classic_keys = list("Shift+E")
-	name = "quick_equip_secondary"
-	full_name = "Unholster secondary"
-	description = "Take out your secondary weapon"
-	keybind_signal = COMSIG_KB_HUMAN_SECONDARY_DOWN
-
-/datum/keybinding/human/quick_equip_secondary/down(client/user)
-	. = ..()
-	if(.)
-		return
-	var/mob/living/carbon/human/H = user.mob
-	H.holster_verb(QUICK_EQUIP_SECONDARY)
-	return TRUE
-
-/datum/keybinding/human/quick_equip_tertiary
-	hotkey_keys = list("Ctrl+E", "Alt+E")
-	classic_keys = list("Ctrl+E", "Alt+E")
-	name = "quick_equip_tertiary"
-	full_name = "Unholster tertiary"
-	description = "Take out your tertiary item."
-	keybind_signal = COMSIG_KB_HUMAN_TERTIARY_DOWN
-
-/datum/keybinding/human/quick_equip_tertiary/down(client/user)
-	. = ..()
-	if(.)
-		return
-	var/mob/living/carbon/human/H = user.mob
-	H.holster_verb(QUICK_EQUIP_TERTIARY)
-	return TRUE
-
-/datum/keybinding/human/quick_equip_quaternary
-	hotkey_keys = list("Unbound")
-	classic_keys = list("Unbound")
-	name = "quick_equip_quaternary"
-	full_name = "Unholster quaternary"
-	description = "Take out your quaternary item."
-	keybind_signal = COMSIG_KB_HUMAN_QUATERNARY_DOWN
-
-/datum/keybinding/human/quick_equip_quaternary/down(client/user)
-	. = ..()
-	if(.)
-		return
-	var/mob/living/carbon/human/H = user.mob
-	H.holster_verb(QUICK_EQUIP_QUATERNARY)
-	return TRUE
-
-/datum/keybinding/human/quick_equip_inventory
-	hotkey_keys = list("Unbound")
-	classic_keys = list("Unbound")
-	name = "quick_equip_inventory"
-	full_name = "Quick equip inventory"
-	description = "Quickly puts an item in the best slot available"
-	keybind_signal = COMSIG_KB_HUMAN_QUICK_EQUIP_DOWN
-
-/datum/keybinding/human/quick_equip_inventory/down(client/user)
-	. = ..()
-	if(.)
-		return
-	var/mob/living/carbon/human/H = user.mob
-	H.quick_equip()
-	return TRUE
-
 /datum/keybinding/human/issue_order
 	hotkey_keys = list("Unbound")
 	classic_keys = list("Unbound")
@@ -103,8 +18,8 @@
 	. = ..()
 	if(.)
 		return
-	var/mob/living/carbon/human/H = user.mob
-	H.issue_order(order)
+	var/mob/living/carbon/human/human_mob = user.mob
+	human_mob.issue_order(order)
 	return TRUE
 
 /datum/keybinding/human/issue_order/move
@@ -139,8 +54,8 @@
 	. = ..()
 	if(.)
 		return
-	var/mob/living/carbon/human/H = user.mob
-	H.spec_activation_one()
+	var/mob/living/carbon/human/human_mob = user.mob
+	human_mob.spec_activation_one()
 	return TRUE
 
 /datum/keybinding/human/specialist_two
@@ -154,24 +69,8 @@
 	. = ..()
 	if(.)
 		return
-	var/mob/living/carbon/human/H = user.mob
-	H.spec_activation_two()
-	return TRUE
-
-/datum/keybinding/human/pick_up
-	hotkey_keys = list("F")
-	classic_keys = list("Unbound")
-	name = "pick_up"
-	full_name = "Pick Up Dropped Items"
-	keybind_signal = COMSIG_KB_HUMAN_PICK_UP
-
-/datum/keybinding/human/pick_up/down(client/user)
-	. = ..()
-	if(.)
-		return
-
-	var/mob/living/carbon/human/human_user = user.mob
-	human_user.pickup_recent()
+	var/mob/living/carbon/human/human_mob = user.mob
+	human_mob.spec_activation_two()
 	return TRUE
 
 /datum/keybinding/human/rotate_chair
@@ -208,8 +107,3 @@
 	if(shown_item && !(shown_item.flags_item & ITEM_ABSTRACT))
 		shown_item.showoff(human_user)
 	return TRUE
-
-#undef QUICK_EQUIP_PRIMARY
-#undef QUICK_EQUIP_SECONDARY
-#undef QUICK_EQUIP_TERTIARY
-#undef QUICK_EQUIP_QUATERNARY
diff --git a/code/datums/keybinding/human_combat.dm b/code/datums/keybinding/human_combat.dm
index 003fba3b00bd..2f37efc61438 100644
--- a/code/datums/keybinding/human_combat.dm
+++ b/code/datums/keybinding/human_combat.dm
@@ -1,6 +1,5 @@
 /datum/keybinding/human/combat
 	category = CATEGORY_HUMAN_COMBAT
-	weight = WEIGHT_MOB
 
 /datum/keybinding/human/combat/can_use(client/user)
 	. = ..()
diff --git a/code/datums/keybinding/human_inventory.dm b/code/datums/keybinding/human_inventory.dm
new file mode 100644
index 000000000000..163cbccdd5c0
--- /dev/null
+++ b/code/datums/keybinding/human_inventory.dm
@@ -0,0 +1,244 @@
+/datum/keybinding/human/inventory
+	category = CATEGORY_HUMAN_INVENTORY
+
+#define QUICK_EQUIP_PRIMARY 1
+#define QUICK_EQUIP_SECONDARY 2
+#define QUICK_EQUIP_TERTIARY 3
+#define QUICK_EQUIP_QUATERNARY 4
+
+/datum/keybinding/human/inventory/quick_equip
+	hotkey_keys = list("E")
+	classic_keys = list("E")
+	name = "quick_equip"
+	full_name = "Unholster"
+	description = "Take out an available weapon"
+	keybind_signal = COMSIG_KB_HUMAN_INTERACT_QUICKEQUIP_DOWN
+
+/datum/keybinding/human/inventory/quick_equip/down(client/user)
+	. = ..()
+	if(.)
+		return
+	var/mob/living/carbon/human/human_mob = user.mob
+	human_mob.holster_verb(QUICK_EQUIP_PRIMARY)
+	return TRUE
+
+/datum/keybinding/human/inventory/quick_equip_secondary
+	hotkey_keys = list("Shift+E")
+	classic_keys = list("Shift+E")
+	name = "quick_equip_secondary"
+	full_name = "Unholster secondary"
+	description = "Take out your secondary weapon"
+	keybind_signal = COMSIG_KB_HUMAN_INTERACT_SECONDARY_DOWN
+
+/datum/keybinding/human/inventory/quick_equip_secondary/down(client/user)
+	. = ..()
+	if(.)
+		return
+	var/mob/living/carbon/human/human_mob = user.mob
+	human_mob.holster_verb(QUICK_EQUIP_SECONDARY)
+	return TRUE
+
+/datum/keybinding/human/inventory/quick_equip_tertiary
+	hotkey_keys = list("Ctrl+E", "Alt+E")
+	classic_keys = list("Ctrl+E", "Alt+E")
+	name = "quick_equip_tertiary"
+	full_name = "Unholster tertiary"
+	description = "Take out your tertiary item."
+	keybind_signal = COMSIG_KB_HUMAN_INTERACT_TERTIARY_DOWN
+
+/datum/keybinding/human/inventory/quick_equip_tertiary/down(client/user)
+	. = ..()
+	if(.)
+		return
+	var/mob/living/carbon/human/human_mob = user.mob
+	human_mob.holster_verb(QUICK_EQUIP_TERTIARY)
+	return TRUE
+
+/datum/keybinding/human/inventory/quick_equip_quaternary
+	hotkey_keys = list("Unbound")
+	classic_keys = list("Unbound")
+	name = "quick_equip_quaternary"
+	full_name = "Unholster quaternary"
+	description = "Take out your quaternary item."
+	keybind_signal = COMSIG_KB_HUMAN_INTERACT_QUATERNARY_DOWN
+
+/datum/keybinding/human/inventory/quick_equip_quaternary/down(client/user)
+	. = ..()
+	if(.)
+		return
+	var/mob/living/carbon/human/human_mob = user.mob
+	human_mob.holster_verb(QUICK_EQUIP_QUATERNARY)
+	return TRUE
+
+#undef QUICK_EQUIP_PRIMARY
+#undef QUICK_EQUIP_SECONDARY
+#undef QUICK_EQUIP_TERTIARY
+#undef QUICK_EQUIP_QUATERNARY
+
+/datum/keybinding/human/inventory/quick_equip_inventory
+	hotkey_keys = list("Unbound")
+	classic_keys = list("Unbound")
+	name = "quick_equip_inventory"
+	full_name = "Quick equip inventory"
+	description = "Quickly puts an item in the best slot available"
+	keybind_signal = COMSIG_KB_HUMAN_INTERACT_QUICK_EQUIP_DOWN
+
+/datum/keybinding/human/inventory/quick_equip_inventory/down(client/user)
+	. = ..()
+	if(.)
+		return
+	var/mob/living/carbon/human/human_mob = user.mob
+	human_mob.quick_equip()
+	return TRUE
+
+/datum/keybinding/human/inventory/pick_up
+	hotkey_keys = list("F")
+	classic_keys = list("Unbound")
+	name = "pick_up"
+	full_name = "Pick Up Dropped Items"
+	keybind_signal = COMSIG_KB_HUMAN_INTERACT_PICK_UP
+
+/datum/keybinding/human/inventory/pick_up/down(client/user)
+	. = ..()
+	if(.)
+		return
+
+	var/mob/living/carbon/human/human_user = user.mob
+	human_user.pickup_recent()
+	return TRUE
+
+/datum/keybinding/human/inventory/interact_other_hand
+	hotkey_keys = list("Unbound")
+	classic_keys = list("Unbound")
+	name = "interact_other_hand"
+	full_name = "Interact With Other Hand"
+	keybind_signal = COMSIG_KB_HUMAN_INTERACT_OTHER_HAND
+
+/datum/keybinding/human/inventory/interact_other_hand/down(client/user)
+	. = ..()
+	if(.)
+		return
+
+	var/mob/living/carbon/human/human_user = user.mob
+
+	var/active_hand = human_user.get_active_hand()
+	var/inactive_hand = human_user.get_inactive_hand()
+
+	if(!inactive_hand)
+		return
+	human_user.click_adjacent(inactive_hand, active_hand)
+	return TRUE
+
+#define INTERACT_KEYBIND_COOLDOWN_TIME (0.2 SECONDS)
+#define COOLDOWN_SLOT_INTERACT_KEYBIND "slot_interact_keybind_cooldown"
+
+/datum/keybinding/human/inventory/interact_slot
+	hotkey_keys = list("Unbound")
+	classic_keys = list("Unbound")
+	var/storage_slot
+
+/datum/keybinding/human/inventory/interact_slot/proc/check_slot(mob/living/carbon/human/user)
+	return
+
+/datum/keybinding/human/inventory/interact_slot/down(client/user)
+	. = ..()
+	if(.)
+		return
+	if(!storage_slot)
+		return
+	if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_SLOT_INTERACT_KEYBIND))
+		return
+
+	TIMER_COOLDOWN_START(src, COOLDOWN_SLOT_INTERACT_KEYBIND, INTERACT_KEYBIND_COOLDOWN_TIME)
+	var/mob/living/carbon/human/human_user = user.mob
+	var/obj/item/current_item = check_slot(human_user)
+	var/obj/item/in_hand_item = human_user.get_active_hand()
+
+	if(in_hand_item)
+		if(!current_item)
+			if(!human_user.equip_to_slot_if_possible(in_hand_item, storage_slot, FALSE, FALSE))
+				return
+			return TRUE
+
+		current_item.attackby(in_hand_item, human_user)
+		return TRUE
+
+	if(!current_item)
+		return
+	current_item.attack_hand(human_user)
+	return TRUE
+
+/datum/keybinding/human/inventory/interact_slot/back
+	name = "interact_storage_back"
+	full_name = "Interact With Back Slot"
+	keybind_signal = COMSIG_KB_HUMAN_INTERACT_SLOT_BACK
+	storage_slot = WEAR_BACK
+
+/datum/keybinding/human/inventory/interact_slot/back/check_slot(mob/living/carbon/human/user)
+	return user.back
+
+/datum/keybinding/human/inventory/interact_slot/belt
+	name = "interact_storage_belt"
+	full_name = "Interact With Belt Slot"
+	keybind_signal = COMSIG_KB_HUMAN_INTERACT_SLOT_BELT
+	storage_slot = WEAR_WAIST
+
+/datum/keybinding/human/inventory/interact_slot/belt/check_slot(mob/living/carbon/human/user)
+	return user.belt
+
+/datum/keybinding/human/inventory/interact_slot/pouch_left
+	name = "interact_storage_pouch_left"
+	full_name = "Interact With Left Pouch Slot"
+	keybind_signal = COMSIG_KB_HUMAN_INTERACT_SLOT_LEFT_POUCH
+	storage_slot = WEAR_L_STORE
+
+/datum/keybinding/human/inventory/interact_slot/pouch_left/check_slot(mob/living/carbon/human/user)
+	return user.l_store
+
+/datum/keybinding/human/inventory/interact_slot/pouch_right
+	name = "interact_storage_pouch_right"
+	full_name = "Interact With Right Pouch Slot"
+	keybind_signal = COMSIG_KB_HUMAN_INTERACT_SLOT_RIGHT_POUCH
+	storage_slot = WEAR_R_STORE
+
+/datum/keybinding/human/inventory/interact_slot/pouch_right/check_slot(mob/living/carbon/human/user)
+	return user.r_store
+
+/datum/keybinding/human/inventory/interact_slot/uniform
+	name = "interact_storage_uniform"
+	full_name = "Interact With Uniform Slot"
+	keybind_signal = COMSIG_KB_HUMAN_INTERACT_SLOT_UNIFORM
+	storage_slot = WEAR_BODY
+
+/datum/keybinding/human/inventory/interact_slot/uniform/check_slot(mob/living/carbon/human/user)
+	return user.w_uniform
+
+/datum/keybinding/human/inventory/interact_slot/suit
+	name = "interact_storage_suit"
+	full_name = "Interact With Suit Slot"
+	keybind_signal = COMSIG_KB_HUMAN_INTERACT_SLOT_SUIT
+	storage_slot = WEAR_JACKET
+
+/datum/keybinding/human/inventory/interact_slot/suit/check_slot(mob/living/carbon/human/user)
+	return user.wear_suit
+
+/datum/keybinding/human/inventory/interact_slot/helmet
+	name = "interact_storage_helmet"
+	full_name = "Interact With Head Slot"
+	keybind_signal = COMSIG_KB_HUMAN_INTERACT_SLOT_HELMET
+	storage_slot = WEAR_HEAD
+
+/datum/keybinding/human/inventory/interact_slot/helmet/check_slot(mob/living/carbon/human/user)
+	return user.head
+
+/datum/keybinding/human/inventory/interact_slot/suit_storage
+	name = "interact_storage_suit_store"
+	full_name = "Interact With Suit Storage Slot"
+	keybind_signal = COMSIG_KB_HUMAN_INTERACT_SUIT_S_STORE
+	storage_slot = WEAR_J_STORE
+
+/datum/keybinding/human/inventory/interact_slot/suit_storage/check_slot(mob/living/carbon/human/user)
+	return user.s_store
+
+#undef INTERACT_KEYBIND_COOLDOWN_TIME
+#undef COOLDOWN_SLOT_INTERACT_KEYBIND
diff --git a/colonialmarines.dme b/colonialmarines.dme
index f8f1ca101c9a..6b53d0fc8df6 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -529,6 +529,7 @@ s// DM Environment file for colonialmarines.dme.
 #include "code\datums\keybinding\emote.dm"
 #include "code\datums\keybinding\human.dm"
 #include "code\datums\keybinding\human_combat.dm"
+#include "code\datums\keybinding\human_inventory.dm"
 #include "code\datums\keybinding\living.dm"
 #include "code\datums\keybinding\mob.dm"
 #include "code\datums\keybinding\movement.dm"