From af73323477fe10c929ea6b67a3bc2108bef32094 Mon Sep 17 00:00:00 2001 From: Dax Dupont Date: Fri, 12 Jan 2018 04:36:00 +0100 Subject: [PATCH] Adds an indestructible disco/dance machine for admemes and disco inferno shuttle (#34260) * Dance machine fix * I have no ass and i must blast --- _maps/shuttles/emergency_discoinferno.dmm | 5 +---- code/game/machinery/dance_machine.dm | 12 ++++++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/_maps/shuttles/emergency_discoinferno.dmm b/_maps/shuttles/emergency_discoinferno.dmm index ec42f163f1..eb3a27359b 100644 --- a/_maps/shuttles/emergency_discoinferno.dmm +++ b/_maps/shuttles/emergency_discoinferno.dmm @@ -114,10 +114,7 @@ /turf/open/floor/mineral/plasma, /area/shuttle/escape) "v" = ( -/obj/machinery/disco{ - anchored = 1; - req_access = null - }, +/obj/machinery/disco/indestructible, /turf/open/floor/light/colour_cycle, /area/shuttle/escape) "w" = ( diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 79ec733303..62d203464c 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -1,4 +1,4 @@ -// DISCO DANCE MACHINE - For engineering power optimization incentive nurturing test system (POINTS) +// DISCO DANCE MACHINE - For admin, engineering and shuttle memes/abuse. /obj/machinery/disco name = "radiant dance machine mark IV" @@ -23,6 +23,14 @@ ) var/datum/track/selection = null +/obj/machinery/disco/indestructible + name = "radiant dance machine mark V" + desc = "Now redesigned with data gathered from the extensive disco and plasma research." + req_access = null + anchored = TRUE + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + flags_1 = NODECONSTRUCT_1 + /datum/track var/song_name = "generic" var/song_path = null @@ -59,7 +67,7 @@ return ..() /obj/machinery/disco/attackby(obj/item/O, mob/user, params) - if(!active) + if(!active && !(flags_1 & NODECONSTRUCT_1)) if(istype(O, /obj/item/wrench)) if(!anchored && !isinspace()) to_chat(user,"You secure [src] to the floor.")