From c008da62cb24f7717beb030dbe25f8ad844f6515 Mon Sep 17 00:00:00 2001
From: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Date: Thu, 2 Dec 2021 09:23:44 -0800
Subject: [PATCH] Fixes stripper poles and other ERP equipment being
 constructable in boxes (#9825)

* fuck

* God is dead and we have killed them

* missed it
---
 .../lewd_items/code/lewd_machinery/milking_machine.dm         | 2 ++
 .../lewd_items/code/lewd_structures/bdsm_furniture.dm         | 4 ++--
 .../lewd_items/code/lewd_structures/dancing_pole.dm           | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm
index 0ef603813b4..804772f21f1 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm
@@ -1035,6 +1035,8 @@
 // Processor of the process of assembling a kit into a machine
 /obj/item/milking_machine/constructionkit/attackby(obj/item/I, mob/living/carbon/user, params)
 	var/M = /obj/structure/chair/milking_machine
+	if((item_flags & IN_INVENTORY) || (item_flags & IN_STORAGE))
+		return
 	if(I.tool_behaviour == TOOL_WRENCH)
 		if(user.get_held_items_for_side(LEFT_HANDS) == src || user.get_held_items_for_side(RIGHT_HANDS) == src)
 			return
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm
index b93432271d9..5f541e32452 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm
@@ -17,7 +17,7 @@
 /obj/item/bdsm_bed_kit/attackby(obj/item/P, mob/user, params) //constructing a bed here.
 	add_fingerprint(user)
 	if(istype(P, /obj/item/wrench))
-		if (!(item_flags & IN_INVENTORY))
+		if (!(item_flags & IN_INVENTORY) && !(item_flags & IN_STORAGE))
 			to_chat(user, span_notice("You fasten the frame to the floor and begin to inflate the latex pillows..."))
 			if(P.use_tool(src, user, 8 SECONDS, volume=50))
 				to_chat(user, span_notice("You assemble the bdsm bed."))
@@ -271,7 +271,7 @@
 /obj/item/x_stand_kit/attackby(obj/item/P, mob/user, params) //constructing a bed here.
 	add_fingerprint(user)
 	if(istype(P, /obj/item/wrench))
-		if (!(item_flags & IN_INVENTORY))
+		if (!(item_flags & IN_INVENTORY) && !(item_flags & IN_STORAGE))
 			to_chat(user, span_notice("You begin fastening the frame to the floor."))
 			if(P.use_tool(src, user, 8 SECONDS, volume=50))
 				to_chat(user, span_notice("You assemble the x-stand."))
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm
index c40e2c01e35..210e7e5aebe 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm
@@ -159,7 +159,7 @@
 /obj/item/polepack/attackby(obj/item/P, mob/user, params) //erecting a pole here.
 	add_fingerprint(user)
 	if(istype(P, /obj/item/wrench))
-		if (!(item_flags & IN_INVENTORY))
+		if (!(item_flags & IN_INVENTORY) && !(item_flags & IN_STORAGE))
 			to_chat(user, span_notice("You begin fastening the frame to the floor and ceiling..."))
 			if(P.use_tool(src, user, 8 SECONDS, volume=50))
 				to_chat(user, span_notice("You assemble the stripper pole."))