From cc5d9bc31ec4821200dbd975c4b1b09e48b978c6 Mon Sep 17 00:00:00 2001 From: shazbot194 Date: Tue, 6 Mar 2018 22:10:12 -0900 Subject: [PATCH 1/3] Adds in Desolate's dance machine button --- code/modules/customitems/item_defines.dm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 80e653a5492..42303a4ef04 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -276,7 +276,7 @@ to_chat(target, "You comb your tail with the [src].") used = 1 -/obj/item/device/fluff/desolate_coat_kit //DesolateG: Michael Smith +/obj/item/device/fluff/desolate_coat_kit //DesolateG: Micheal Smith name = "armored jacket conversion kit" desc = "Flaps of dark fabric, probably used to somehow modify some sort of an armored garment. Won't help with protection, though." icon_state = "modkit" @@ -335,7 +335,7 @@ to_chat(user, "You can't modify [target]!") -/obj/item/device/fluff/desolate_baton_kit //DesolateG: Michael Smith +/obj/item/device/fluff/desolate_baton_kit //DesolateG: Micheal Smith name = "stun baton conversion kit" desc = "Some sci-fi looking parts for a stun baton." icon = 'icons/obj/custom_items.dmi' @@ -564,6 +564,22 @@ else to_chat(user, "You can't modify [target]!") + + +/obj/item/weapon/fluff/dancebutton //DesolateG: Micheal Smith + name = "Big Red Button" + desc = "This button looks almost too tempting to press." + icon = 'icons/obj/assemblies.dmi' + icon_state = "bigred" + force = 2 + +/obj/item/weapon/fluff/dancebutton/attack_self(mob/user) + user.visible_message("[user] presses the button.", "You press the button.") + var/obj/machinery/disco/C = new /obj/machinery/disco(get_turf(user)) + C.visible_message("[C] suddenly winks into existence where [user]is standing!") + to_chat(user, "The [src] disapears from your hands!") + qdel(src) + ////////////////////////////////// //////////// Clothing //////////// ////////////////////////////////// From 79539cc0eaa1af0ed54455d951db79afb2e59bd8 Mon Sep 17 00:00:00 2001 From: shazbot194 Date: Tue, 6 Mar 2018 22:18:17 -0900 Subject: [PATCH 2/3] Name and Description change I forgot to ask Desolate what he wants, here is the fix for that --- code/modules/customitems/item_defines.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 42303a4ef04..4ab7583b3f9 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -567,14 +567,14 @@ /obj/item/weapon/fluff/dancebutton //DesolateG: Micheal Smith - name = "Big Red Button" - desc = "This button looks almost too tempting to press." + name = "Instant Party Button" + desc = "The instructions on the bottom seem to indicate that pressing the button will bring out the Dancing Machine in you." icon = 'icons/obj/assemblies.dmi' icon_state = "bigred" force = 2 /obj/item/weapon/fluff/dancebutton/attack_self(mob/user) - user.visible_message("[user] presses the button.", "You press the button.") + user.visible_message("[user] presses the [src].", "You press the [src].") var/obj/machinery/disco/C = new /obj/machinery/disco(get_turf(user)) C.visible_message("[C] suddenly winks into existence where [user]is standing!") to_chat(user, "The [src] disapears from your hands!") From 413118d1b49474b0ffbc9f437314fd330fb019dd Mon Sep 17 00:00:00 2001 From: shazbot194 Date: Wed, 7 Mar 2018 15:30:40 -0900 Subject: [PATCH 3/3] Removes the dance machine --- code/modules/customitems/item_defines.dm | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 4ab7583b3f9..ac76b0ffeae 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -564,22 +564,6 @@ else to_chat(user, "You can't modify [target]!") - - -/obj/item/weapon/fluff/dancebutton //DesolateG: Micheal Smith - name = "Instant Party Button" - desc = "The instructions on the bottom seem to indicate that pressing the button will bring out the Dancing Machine in you." - icon = 'icons/obj/assemblies.dmi' - icon_state = "bigred" - force = 2 - -/obj/item/weapon/fluff/dancebutton/attack_self(mob/user) - user.visible_message("[user] presses the [src].", "You press the [src].") - var/obj/machinery/disco/C = new /obj/machinery/disco(get_turf(user)) - C.visible_message("[C] suddenly winks into existence where [user]is standing!") - to_chat(user, "The [src] disapears from your hands!") - qdel(src) - ////////////////////////////////// //////////// Clothing //////////// //////////////////////////////////