From c5e5a83a088f79bca60ed17711f7f7aac73a5568 Mon Sep 17 00:00:00 2001 From: "ericgfwong@hotmail.com" Date: Mon, 14 May 2012 23:11:26 +0000 Subject: [PATCH] -r-table parts are now made by using four metal rods on regular table parts. -Removed r-table parts from the plasteel build menu. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3594 316c924e-a436-60f5-8080-3fe189b3f50e --- .../game/objects/items/weapons/table_rack_parts.dm | 14 ++++++++++---- code/game/objects/stacks/metal.dm | 1 - html/changelog.html | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/table_rack_parts.dm b/code/game/objects/items/weapons/table_rack_parts.dm index 20f302dad4e..faaa26bcbd8 100644 --- a/code/game/objects/items/weapons/table_rack_parts.dm +++ b/code/game/objects/items/weapons/table_rack_parts.dm @@ -16,6 +16,14 @@ RACK PARTS new /obj/item/stack/sheet/metal( src.loc ) //SN src = null del(src) + if (istype(W, /obj/item/stack/rods)) + if (W:amount >= 4) + new /obj/item/weapon/table_parts/reinforced( user.loc ) + user << "\blue You reinforce the [name]." + W:use(4) + del(src) + else if (W:amount < 4) + user << "\red You need at least four rods to do this." /obj/item/weapon/table_parts/attack_self(mob/user as mob) var/obj/structure/table/T = new /obj/structure/table( user.loc ) @@ -29,8 +37,6 @@ RACK PARTS new /obj/item/stack/sheet/wood( src.loc ) //SN src = null del(src) - else - ..() /obj/item/weapon/table_parts/wood/attack_self(mob/user as mob) new /obj/structure/table/woodentable( user.loc ) @@ -40,9 +46,9 @@ RACK PARTS // REINFORCED TABLE PARTS /obj/item/weapon/table_parts/reinforced/attackby(obj/item/weapon/W as obj, mob/user as mob) - ..() if (istype(W, /obj/item/weapon/wrench)) - new /obj/item/stack/sheet/plasteel( src.loc ) + new /obj/item/stack/sheet/metal( src.loc ) + new /obj/item/stack/rods( src.loc ) //SN src = null del(src) diff --git a/code/game/objects/stacks/metal.dm b/code/game/objects/stacks/metal.dm index 6fbdcfd0cb5..330cb6245ed 100644 --- a/code/game/objects/stacks/metal.dm +++ b/code/game/objects/stacks/metal.dm @@ -98,7 +98,6 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ // /datum/stack_recipe/New(title, result_type, req_amount, res_amount, max_res_amount, time, one_per_turf, on_floor = 0) var/global/list/datum/stack_recipe/plasteel_recipes = list ( \ - new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts/reinforced, 2), \ new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, one_per_turf = 1), \ ) diff --git a/html/changelog.html b/html/changelog.html index e4f60e57fb1..af067d90e69 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,7 @@ should be listed in the changelog upon commit tho. Thanks. -->

Monday, May 14th

Icarus updated: