From 4fae5b2714c8b44194be7c3df8137a6960408b0c Mon Sep 17 00:00:00 2001 From: Heroman Date: Fri, 5 Mar 2021 04:43:06 +1000 Subject: [PATCH] Makes dance poles (de)constructible --- code/game/objects/structures/dancepole_vr.dm | 25 +++++++++++++++++++ code/modules/materials/material_recipes_vr.dm | 2 +- maps/tether/tether_things.dm | 18 ------------- vorestation.dme | 1 + 4 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 code/game/objects/structures/dancepole_vr.dm diff --git a/code/game/objects/structures/dancepole_vr.dm b/code/game/objects/structures/dancepole_vr.dm new file mode 100644 index 00000000000..0c9397142d2 --- /dev/null +++ b/code/game/objects/structures/dancepole_vr.dm @@ -0,0 +1,25 @@ +//Dance pole +/obj/structure/dancepole + name = "dance pole" + desc = "Engineered for your entertainment" + icon = 'icons/obj/objects_vr.dmi' + icon_state = "dancepole" + density = 0 + anchored = 1 + +/obj/structure/dancepole/attackby(var/obj/item/O as obj, var/mob/user as mob) + if(O.is_screwdriver()) + anchored = !anchored + playsound(src, O.usesound, 50, 1) + if(anchored) + to_chat(user, "You secure \the [src].") + else + to_chat(user, "You unsecure \the [src].") + if(O.is_wrench()) + playsound(src, O.usesound, 50, 1) + to_chat(user, "Now disassembling \the [src]...") + if(do_after(user, 30 * O.toolspeed)) + if(!src) return + to_chat(user, "You dissasembled \the [src]!") + new /obj/item/stack/material/steel(src.loc, 1) + qdel(src) \ No newline at end of file diff --git a/code/modules/materials/material_recipes_vr.dm b/code/modules/materials/material_recipes_vr.dm index 3dc6975a04e..bf5b54d8535 100644 --- a/code/modules/materials/material_recipes_vr.dm +++ b/code/modules/materials/material_recipes_vr.dm @@ -31,7 +31,7 @@ recipes += new/datum/stack_recipe("dropship seat", /obj/structure/bed/chair/bay/shuttle, 4, one_per_turf = 1, on_floor = 1, time = 20) recipes += new/datum/stack_recipe("small teshari nest", /obj/structure/bed/chair/bay/chair/padded/red/smallnest, 2, one_per_turf = 1, on_floor = 1, time = 10) recipes += new/datum/stack_recipe("large teshari nest", /obj/structure/bed/chair/bay/chair/padded/red/bignest, 4, one_per_turf = 1, on_floor = 1, time = 20) - + recipes += new/datum/stack_recipe("dance pole", /obj/structure/dancepole, 2, one_per_turf = 1, on_floor = 1, time = 20) recipes += new/datum/stack_recipe("light switch frame", /obj/item/frame/lightswitch, 2) recipes += new/datum/stack_recipe_list("sofas", list( new/datum/stack_recipe("red sofa middle", /obj/structure/bed/chair/sofa, 1, one_per_turf = 1, on_floor = 1), \ diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index 5b87b94ab0c..52f999249ed 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -404,24 +404,6 @@ var/global/list/latejoin_tram = list() build_path = /obj/machinery/computer/security/xenobio network = list(NETWORK_XENOBIO) req_access = list() - -//Dance pole -/obj/structure/dancepole - name = "dance pole" - desc = "Engineered for your entertainment" - icon = 'icons/obj/objects_vr.dmi' - icon_state = "dancepole" - density = 0 - anchored = 1 - -/obj/structure/dancepole/attackby(var/obj/item/O as obj, var/mob/user as mob) - if(O.is_wrench()) - anchored = !anchored - playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) - if(anchored) - to_chat(user, "You secure \the [src].") - else - to_chat(user, "You unsecure \the [src].") // // ### Wall Machines On Full Windows ### // To make sure wall-mounted machines placed on full-tile windows are clickable they must be above the window diff --git a/vorestation.dme b/vorestation.dme index 7397f343385..f865ce480d3 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1403,6 +1403,7 @@ #include "code\game\objects\structures\cliff.dm" #include "code\game\objects\structures\coathanger.dm" #include "code\game\objects\structures\curtains.dm" +#include "code\game\objects\structures\dancepole_vr.dm" #include "code\game\objects\structures\displaycase.dm" #include "code\game\objects\structures\dogbed.dm" #include "code\game\objects\structures\door_assembly.dm"