cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes stripper poles and other ERP equipment being constructable in boxes (#9825)

Browse Source 
* fuck

* God is dead and we have killed them

* missed it
This commit is contained in:
Zonespace
2021-12-02 17:23:44 +00:00
committed by GitHub
parent 23cf63cddb
commit c008da62cb
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm
+2
View File
@@ -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
modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm
+2 -2
View File
@@ -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."))
modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm
+1 -1
View File
@@ -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."))