From b120ca156e68c0dbe3d16c40f59116a5b95a44e0 Mon Sep 17 00:00:00 2001
From: Daylight <18598676+Daylight2@users.noreply.github.com>
Date: Tue, 9 Jan 2024 14:49:37 +0200
Subject: [PATCH] Borgs can now dispense stuff from the tank storage unit, as
 well as open/close morgue trays (#23531)

* Cyborg Morgue

* Cyborg TSU
---
 code/game/objects/structures/morgue.dm        | 20 ++++---------------
 .../game/objects/structures/tank_dispenser.dm |  4 ++++
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index 7174c642cf6..e7281879e28 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -152,6 +152,10 @@
 	update_state()
 	return
 
+/obj/structure/morgue/attack_ai(mob/user)
+	if(isrobot(user) && Adjacent(user)) //Robots can open/close it, but not the AI
+		attack_hand(user)
+
 /obj/structure/morgue/attack_animal(mob/living/user)
 	if(user.a_intent == INTENT_HARM)
 		return ..()
@@ -266,22 +270,6 @@
 		qdel(src)
 		return
 
-/obj/structure/m_tray/attack_animal(mob/living/user)
-	if(user.a_intent == INTENT_HARM)
-		return ..()
-	if(user.mob_size < MOB_SIZE_HUMAN)
-		return ..()
-	if(!user.mind) //Stops mindless mobs from doing weird stuff with them
-		return ..()
-	attack_hand(user)
-
-/obj/structure/m_tray/attack_alien(mob/user)
-	if(user.a_intent == INTENT_HARM)
-		return ..()
-	if(!user.mind)
-		return ..()
-	attack_hand(user)
-
 /obj/structure/m_tray/MouseDrop_T(atom/movable/O, mob/living/user)
 	if((!(istype(O, /atom/movable)) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src) || user.contents.Find(O)))
 		return
diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm
index 90c101b45b3..ab6b0c87305 100644
--- a/code/game/objects/structures/tank_dispenser.dm
+++ b/code/game/objects/structures/tank_dispenser.dm
@@ -59,6 +59,10 @@
 	add_fingerprint(user)
 	ui_interact(user)
 
+/obj/structure/dispenser/attack_ai(mob/user)
+	if(isrobot(user) && Adjacent(user)) //Robots can use it, but not the AI
+		attack_hand(user)
+
 /obj/structure/dispenser/attack_ghost(mob/user)
 	ui_interact(user)