From ea9302e21346a3585e4daad0c2dc7693510ae411 Mon Sep 17 00:00:00 2001 From: "petethegoat@gmail.com" Date: Sun, 4 Dec 2011 03:14:07 +0000 Subject: [PATCH] My side of the Christmas update. Removed the RCD's ability to take down r-walls. Updated the changelog. Slight update to stack construction in preparation for buildable light fixtures. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2602 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/items/weapons/RCD.dm | 13 +------------ code/game/objects/stacks/stack.dm | 3 ++- html/changelog.html | 7 +++++++ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 131cd9b0993..7958372d6a3 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -130,18 +130,7 @@ RCD user << "The RCD now holds [matter]/30 matter-units." desc = "A RCD. It currently holds [matter]/30 matter-units." return - if(istype(A, /turf/simulated/wall/r_wall) && matter >= 8) - user << "Deconstructing RWall (8)..." - playsound(src.loc, 'click.ogg', 50, 1) - if(do_after(user, 60)) - if(!disabled && matter >= 8) - spark_system.set_up(5, 0, src) - src.spark_system.start() - A:ReplaceWithWall() - playsound(src.loc, 'Deconstruct.ogg', 50, 1) - matter -= 8 - user << "The RCD now holds [matter]/30 matter-units." - desc = "A RCD. It currently holds [matter]/30 matter-units." + if(istype(A, /turf/simulated/wall/r_wall)) return if(istype(A, /turf/simulated/floor) && matter >= 5) user << "Deconstructing Floor (5)..." diff --git a/code/game/objects/stacks/stack.dm b/code/game/objects/stacks/stack.dm index 8fdf69357f6..3ca6fc7dce3 100644 --- a/code/game/objects/stacks/stack.dm +++ b/code/game/objects/stacks/stack.dm @@ -191,7 +191,8 @@ return if (src.amount < R.req_amount*multiplier) return - var/O = new R.result_type( usr.loc ) + var/atom/O = new R.result_type( usr.loc ) + O.dir = usr.dir if (R.max_res_amount>1) var/obj/item/stack/new_item = O new_item.amount = R.res_amount*multiplier diff --git a/html/changelog.html b/html/changelog.html index 164dab42961..283be81b7f4 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,13 @@ should be listed in the changelog upon commit tho. Thanks. --> 3 December 2011
    +
  • Pete & Erro Christmas update: +
      +
    • It is no longer possible to make reinforced metal from metal.
      • +
    • To make reinforced metal yoy can now use the mining smelting unit and smelt iron and plasma ore.
      • +
    • The RCD can no longer take down reinforced walls.
      • +
    +
  • Petethegoat updated:
    • Fixed all known vending machine issues.