[MIRROR] Fixes hardsuit flash and pipe placing

SierraBay · Jan 7, 2024 · e37a714 · e37a714
1 parent a7b0e91
commit e37a714
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
@@ -41,7 +41,7 @@ Buildable meters
 
 //called when a turf is attacked with a pipe item
 /obj/item/pipe/use_after(atom/target, mob/living/user, click_parameters)
-	if (istype(target))
+	if (istype(target, /turf/simulated/floor))
 		user.unEquip(src, target)
 		return TRUE
 

diff --git a/code/modules/atmospherics/pipes.dm b/code/modules/atmospherics/pipes.dm
@@ -102,6 +102,10 @@
 	. = ..()
 
 /obj/machinery/atmospherics/pipe/use_tool(obj/item/W, mob/living/user, list/click_params)
+	if (istype(W, /obj/item/pipe))
+		user.unEquip(W, loc)
+		return TRUE
+
 	if (!isWrench(W))
 		return ..()
 

diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm
@@ -67,7 +67,7 @@
 	if(!target.Adjacent(holder.wearer) || !ismob(target))
 		return 0
 
-	var/resolved = target.attackby(device,holder.wearer)
+	var/resolved = device.resolve_attackby(target,holder.wearer)
 	if(resolved)
 		holder.cell.use(use_power_cost * CELLRATE)
 	return resolved