From 15946be2250616377ea0d225fe22cb12578b8339 Mon Sep 17 00:00:00 2001 From: ProperPants Date: Tue, 29 Mar 2016 19:50:38 -0400 Subject: [PATCH 1/2] Operating tables can now be destroyed with a wrench. They give back as much plasteel as they cost to allow them to be moved. Trimmed dumb description for metal sheets. --- code/game/machinery/OpTable.dm | 6 ++++++ code/game/objects/items/stacks/sheets/sheet_types.dm | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 96849a2905d..62f6b27c755 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -126,6 +126,12 @@ take_victim(W:affecting,usr) qdel(W) return + if(istype(W, /obj/item/weapon/wrench)) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) + if(do_after(user, 20, target = src)) + user << "You deconstruct the table." + new /obj/item/stack/sheet/plasteel( loc, 5) + qdel(src) /obj/machinery/optable/proc/check_table(mob/living/carbon/patient as mob) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 84f95a70665..5f1f4ba8843 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -86,7 +86,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ /obj/item/stack/sheet/metal name = "metal" - desc = "Sheets made out off metal. It has been dubbed Metal Sheets." + desc = "Sheets made out of metal." singular_name = "metal sheet" icon_state = "sheet-metal" materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT) @@ -96,7 +96,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ /obj/item/stack/sheet/metal/cyborg name = "metal" - desc = "Sheets made out off metal. It has been dubbed Metal Sheets." + desc = "Sheets made out of metal." singular_name = "metal sheet" icon_state = "sheet-metal" materials = list() From 7e67a2bf34468636194f0ba03aa2e68e2f1e3e8e Mon Sep 17 00:00:00 2001 From: ProperPants Date: Tue, 29 Mar 2016 20:06:50 -0400 Subject: [PATCH 2/2] Fixed some spacing. --- code/game/machinery/OpTable.dm | 2 +- code/game/machinery/computer/ai_core.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 62f6b27c755..7b7aa831a46 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -130,7 +130,7 @@ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) user << "You deconstruct the table." - new /obj/item/stack/sheet/plasteel( loc, 5) + new /obj/item/stack/sheet/plasteel(loc, 5) qdel(src) diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 147901907bd..85e483bbfb9 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -36,7 +36,7 @@ if(do_after(user, 20, target = src)) if(!src || !WT.remove_fuel(0, user)) return user << "\blue You deconstruct the frame." - new /obj/item/stack/sheet/plasteel( loc, 4) + new /obj/item/stack/sheet/plasteel(loc, 4) qdel(src) if(1) if(istype(P, /obj/item/weapon/wrench))