From 4e4a904a3b920ede9612dfdfffc234487fb73e5b Mon Sep 17 00:00:00 2001
From: Ben10Omintrix <138636438+Ben10Omintrix@users.noreply.github.com>
Date: Mon, 16 Sep 2024 09:42:34 +0300
Subject: [PATCH] [no gbp] reverts some unintended duplicate checks (#86674)

## About The Pull Request
when working on #86031 , i added some checks that were already being
handled earlier in the chain, serving nothing. thanks to melbert for
catching these

## Why It's Good For The Game
removes some duplicated checks
---
 code/datums/storage/storage.dm                         | 4 ----
 code/game/machinery/pipe/pipe_dispenser.dm             | 3 ---
 code/game/objects/items/devices/radio/headset.dm       | 4 +---
 code/game/objects/items/storage/bags.dm                | 2 --
 code/game/objects/structures/crates_lockers/closets.dm | 2 --
 5 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/code/datums/storage/storage.dm b/code/datums/storage/storage.dm
index aedb28a74e9..465a93a4c06 100644
--- a/code/datums/storage/storage.dm
+++ b/code/datums/storage/storage.dm
@@ -826,10 +826,6 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 		return
 	if(!iscarbon(user) && !isdrone(user))
 		return
-	var/mob/living/user_living = user
-	if(user_living.incapacitated)
-		return
-
 	attempt_insert(dropping, user)
 	return COMPONENT_CANCEL_MOUSEDROPPED_ONTO
 
diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm
index 1e90b270c8c..de7c6351e38 100644
--- a/code/game/machinery/pipe/pipe_dispenser.dm
+++ b/code/game/machinery/pipe/pipe_dispenser.dm
@@ -187,9 +187,6 @@
 
 //Allow you to drag-drop disposal pipes and transit tubes into it
 /obj/machinery/pipedispenser/disposal/mouse_drop_receive(obj/structure/pipe, mob/user, params)
-	if(user.incapacitated)
-		return
-
 	if (!istype(pipe, /obj/structure/disposalconstruct) && !istype(pipe, /obj/structure/c_transit_tube) && !istype(pipe, /obj/structure/c_transit_tube_pod))
 		return
 
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 5673afc678a..6ce325034e3 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -462,9 +462,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 		grant_headset_languages(mob_loc)
 
 /obj/item/radio/headset/click_alt(mob/living/user)
-	if(!istype(user) || !Adjacent(user) || user.incapacitated)
-		return CLICK_ACTION_BLOCKING
-	if (!command)
+	if(!istype(user) || !command)
 		return CLICK_ACTION_BLOCKING
 	use_command = !use_command
 	to_chat(user, span_notice("You toggle high-volume mode [use_command ? "on" : "off"]."))
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 2a2affef2cb..11013fe7ad5 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -274,8 +274,6 @@
 	. += span_notice("Ctrl-click to activate seed extraction.")
 
 /obj/item/storage/bag/plants/portaseeder/item_ctrl_click(mob/user)
-	if(user.incapacitated)
-		return
 	for(var/obj/item/plant in contents)
 		seedify(plant, 1)
 	return CLICK_ACTION_SUCCESS
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 3bfac213ba5..7370c69da30 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -915,8 +915,6 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
 /obj/structure/closet/mouse_drop_receive(atom/movable/O, mob/living/user, params)
 	if(!istype(O) || O.anchored || istype(O, /atom/movable/screen))
 		return
-	if(!istype(user) || user.incapacitated || user.body_position == LYING_DOWN)
-		return
 	if(user == O) //try to climb onto it
 		return ..()
 	if(!opened)