From 1cbe9d0bb62e76bf66df9aa69c6cbb3aa7f3660c Mon Sep 17 00:00:00 2001 From: KasparoVy Date: Tue, 21 Mar 2017 16:45:55 -0400 Subject: [PATCH] Beds now return 2 metal when deconstructed. Removes unnecessary src. --- .../structures/stool_bed_chair_nest/bed.dm | 16 +++++++++++----- .../structures/stool_bed_chair_nest/stools.dm | 12 ++++++------ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 3b5c3c46e88..e07c3f62c89 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -20,6 +20,12 @@ /obj/structure/stool/bed/MouseDrop(atom/over_object) ..(over_object, skip_fucking_stool_shit = 1) +/obj/structure/stool/bed/attackby(obj/item/weapon/W as obj, mob/user, params) + if(iswrench(W)) + playsound(loc, W.usesound, 50, 1) + new /obj/item/stack/sheet/metal(loc, 2) + qdel(src) + /obj/structure/stool/psychbed name = "psych bed" desc = "For prime comfort during psychiatric evaluations." @@ -54,7 +60,7 @@ /obj/structure/stool/bed/attack_animal(var/mob/living/simple_animal/M)//No more buckling hostile mobs to chairs to render them immobile forever if(M.environment_smash) - new /obj/item/stack/sheet/metal(src.loc) + new /obj/item/stack/sheet/metal(loc) qdel(src) @@ -73,7 +79,7 @@ if(buckled_mob) user_unbuckle_mob(user) else - user.visible_message("[user] collapses \the [src.name].", "You collapse \the [src.name].") + user.visible_message("[user] collapses \the [name].", "You collapse \the [name].") new/obj/item/roller(get_turf(src)) qdel(src) return @@ -107,8 +113,8 @@ if(istype(W, /obj/item/roller_holder)) var/obj/item/roller_holder/RH = W if(!RH.held) - user.visible_message("[user] collects \the [src.name].", "You collect \the [src.name].") - src.forceMove(RH) + user.visible_message("[user] collects \the [name].", "You collect \the [name].") + forceMove(RH) RH.held = src /obj/structure/stool/bed/roller/MouseDrop(over_object, src_location, over_location) @@ -118,7 +124,7 @@ return if(buckled_mob) return 0 - usr.visible_message("[usr] collapses \the [src.name].", "You collapse \the [src.name].") + usr.visible_message("[usr] collapses \the [name].", "You collapse \the [name].") new/obj/item/roller(get_turf(src)) qdel(src) return diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index 09b92f00ac4..3bd36724886 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -12,25 +12,25 @@ return if(2.0) if(prob(70)) - new /obj/item/stack/sheet/metal(src.loc) + new /obj/item/stack/sheet/metal(loc) qdel(src) return if(3.0) if(prob(50)) - new /obj/item/stack/sheet/metal(src.loc) + new /obj/item/stack/sheet/metal(loc) qdel(src) return return /obj/structure/stool/blob_act() if(prob(75)) - new /obj/item/stack/sheet/metal(src.loc) + new /obj/item/stack/sheet/metal(loc) qdel(src) /obj/structure/stool/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/wrench)) - playsound(src.loc, W.usesound, 50, 1) - new /obj/item/stack/sheet/metal(src.loc) + playsound(loc, W.usesound, 50, 1) + new /obj/item/stack/sheet/metal(loc) qdel(src) /obj/structure/stool/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params, skip_fucking_stool_shit = 0) @@ -41,7 +41,7 @@ if(H==usr && !H.restrained() && !H.stat && in_range(src, over_object)) var/obj/item/weapon/stool/S = new/obj/item/weapon/stool() S.origin = src - src.loc = S + loc = S H.put_in_hands(S) H.visible_message("[H] grabs [src] from the floor!", "You grab [src] from the floor!")