From 97b734d13928a09c296d503b465bf189e409ce99 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue, 25 Jun 2024 12:54:06 +0200
Subject: [PATCH] [MIRROR] Makes interacting with an assembly bomb interact
 with the assembly instead of opening the tank UI (#28379)

* Makes interacting with an assembly bomb interact with the assembly instead of opening the tank UI (#84075)

## About The Pull Request
Changes it so that interacting in hand with an assembly bomb will
interact with the assemble instead of opening the tank UI.
## Why It's Good For The Game
Currently when you interact with an assembly bomb in hand it opens the
tank UI instead of interacting with the assembly, which makes them
awkward to use as you have to configure the assembly before attaching it
to the tank and welding the tank.

Fixes #84073
## Changelog
:cl:
fix: Interacting with an assembly bomb in hand will now allow you to
interact with the attached assembly instead of opening the gas tank UI.
Right-clicking will display the gas tank UI instead.
/:cl:

* Makes interacting with an assembly bomb interact with the assembly instead of opening the tank UI

---------

Co-authored-by: GoblinBackwards <22856555+GoblinBackwards@users.noreply.github.com>
---
 code/game/objects/items/tanks/tanks.dm | 10 ++++++++++
 code/modules/assembly/mousetrap.dm     |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm
index b4d35efdda1..bdbfa79001d 100644
--- a/code/game/objects/items/tanks/tanks.dm
+++ b/code/game/objects/items/tanks/tanks.dm
@@ -415,6 +415,16 @@
 	if(tank_assembly)
 		tank_assembly.attack_hand()
 
+/obj/item/tank/attack_self(mob/user, modifiers)
+	if (tank_assembly)
+		tank_assembly.attack_self(user)
+		return TRUE
+	return ..()
+
+/obj/item/tank/attack_self_secondary(mob/user, modifiers)
+	. = ..()
+	ui_interact(user)
+
 /obj/item/tank/Move()
 	. = ..()
 	if(tank_assembly)
diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm
index 1d8936e6068..5c7f5208254 100644
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -153,7 +153,7 @@
  * * user: The mob handling the trap
  */
 /obj/item/assembly/mousetrap/proc/clumsy_check(mob/living/carbon/human/user)
-	if(!armed)
+	if(!armed || !user)
 		return FALSE
 	if((HAS_TRAIT(user, TRAIT_DUMB) || HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50))
 		var/which_hand = BODY_ZONE_PRECISE_L_HAND