From 92d2f44603c475febe1ecf51596f16723b30dc76 Mon Sep 17 00:00:00 2001 From: "petethegoat@gmail.com" Date: Fri, 30 Nov 2012 22:51:46 +0000 Subject: [PATCH] As usual i'm retarded and am incapable of coding properly git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5235 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/janicart.dm | 2 +- code/game/objects/structures/stool_bed_chair_nest/chairs.dm | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/code/defines/janicart.dm b/code/defines/janicart.dm index ffa4840793d..c1924bb0693 100644 --- a/code/defines/janicart.dm +++ b/code/defines/janicart.dm @@ -29,7 +29,7 @@ if(reagents.total_volume < 1) user << "This pimpin' ride is out of water!" else if(istype(W, /obj/item/key)) - user << "Hold [I] in one of your hands while you drive this pimpin' ride." + user << "Hold [W] in one of your hands while you drive this pimpin' ride." return /obj/structure/stool/bed/chair/janicart/relaymove(mob/user, direction) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index d9cf83ed9bf..447913d225b 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -98,12 +98,6 @@ /obj/structure/stool/bed/chair/office anchored = 0 -/obj/structure/stool/bed/chair/office/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I, /obj/item/weapon/weldingtool)) - icon = 'icons/obj/joustchair.dmi' - pixel_x = -16 - pixel_y = -16 - /obj/structure/stool/bed/chair/comfy/black icon_state = "comfychair_black"