From 6d0058a31ec7d047af3afcce7fdc91864aeefd70 Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Sat, 4 Aug 2012 20:58:53 +1000 Subject: [PATCH] fix for contraband >.>, also simple_animals can't buckle themselves in now Signed-off-by: Cael_Aislinn --- code/game/objects/contraband.dm | 4 ++-- code/game/objects/stool.dm | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/contraband.dm b/code/game/objects/contraband.dm index 1404777b8ed..4497ec4d5a8 100644 --- a/code/game/objects/contraband.dm +++ b/code/game/objects/contraband.dm @@ -242,9 +242,9 @@ obj/effect/decal/poster/attackby(obj/item/weapon/W as obj, mob/user as mob) user << "You start placing the poster on the wall..." //Looks like it's uncluttered enough. Place the poster. //declaring D because otherwise if P gets 'deconstructed' we lose our reference to P.resulting_poster - if(P.resulting_poster != src.serial_number) + if(P.resulting_poster.serial_number != P.serial_number) del P.resulting_poster - P.resulting_poster = new(src.serial_number) + P.resulting_poster = new /obj/effect/decal/poster(P, P.serial_number) var/obj/effect/decal/poster/D = P.resulting_poster var/temp_loc = user.loc diff --git a/code/game/objects/stool.dm b/code/game/objects/stool.dm index 35d63e4ad2f..72c9e428cdc 100644 --- a/code/game/objects/stool.dm +++ b/code/game/objects/stool.dm @@ -106,6 +106,9 @@ /obj/structure/stool/bed/MouseDrop_T(mob/M as mob, mob/user as mob) if(!istype(M)) return + if(issimpleanimal(user)) + user << "\red You are unable to work the complex mechanisms of a buckle!" + return buckle_mob(M, user) M.lying = 1 return