From d925ee8a10b42c199ffc83fc775c9d8da1268863 Mon Sep 17 00:00:00 2001 From: Crazylemon Date: Wed, 30 Sep 2015 07:59:29 -0700 Subject: [PATCH] Fixes the syntax errors and is more consistent with messages now --- .../objects/structures/stool_bed_chair_nest/bed.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 bc5c5042097..c08852bfddd 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -73,8 +73,8 @@ if(buckled_mob) user_unbuckle_mob(user) else - visible_message("[user] collapses \the [src.name].") - new/obj/item/roller(getturf(src)) + user.visible_message("[user] collapses \the [src.name].", "You collapse \the [src.name].") + new/obj/item/roller(get_turf(src)) qdel(src) return @@ -107,8 +107,8 @@ if(istype(W, /obj/item/roller_holder)) var/obj/item/roller_holder/RH = W if(!RH.held) - user << "\blue You collect the roller bed." - src.loc = RH + user.visible_message("[user] collects \the [src.name].", "You collect \the [src.name].") + src.forceMove(RH) RH.held = src /obj/structure/stool/bed/roller/MouseDrop(over_object, src_location, over_location) @@ -118,7 +118,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 [src.name].", "You collapse \the [src.name].") new/obj/item/roller(get_turf(src)) qdel(src) return @@ -138,10 +138,10 @@ /obj/item/roller_holder/attack_self(mob/user as mob) if(!held) - user << "\blue The rack is empty." + user << " The rack is empty." return - user << "\blue You deploy the roller bed." + user << "You deploy the roller bed." var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc) R.add_fingerprint(user) qdel(held)