From 6c5a64394434d7765873cc4423909eaeec2b4045 Mon Sep 17 00:00:00 2001
From: Crazylemon <tlrgue17@gmail.com>
Date: Wed, 30 Sep 2015 01:42:35 -0700
Subject: [PATCH 1/3] Fixes the roller_holder to work again

After the buckling rehaul, the roller holder couldn't unbuckle patients
nor collapse/collect beds. This should readd that functionality.
---
 .../structures/stool_bed_chair_nest/bed.dm     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

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 0ef6ea6f7d3..bc5c5042097 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -68,6 +68,16 @@
 	icon_state = "down"
 	anchored = 0
 
+/obj/structure/stool/bed/roller/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+	if(istype(W, /obj/item/roller_holder))
+		if(buckled_mob)
+			user_unbuckle_mob(user)
+		else
+			visible_message("[user] collapses \the [src.name].")
+			new/obj/item/roller(getturf(src))
+			qdel(src)
+	return
+
 /obj/structure/stool/bed/roller/post_buckle_mob(mob/living/M)
 	if(M == buckled_mob)
 		density = 1
@@ -93,6 +103,14 @@
 	R.add_fingerprint(user)
 	qdel(src)
 
+/obj/item/roller/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+	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
+			RH.held = src
+
 /obj/structure/stool/bed/roller/MouseDrop(over_object, src_location, over_location)
 	..()
 	if(over_object == usr && Adjacent(usr) && (in_range(src, usr) || usr.contents.Find(src)))

From d925ee8a10b42c199ffc83fc775c9d8da1268863 Mon Sep 17 00:00:00 2001
From: Crazylemon <tlrgue17@gmail.com>
Date: Wed, 30 Sep 2015 07:59:29 -0700
Subject: [PATCH 2/3] 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("<span class='notice'>[user] collapses \the [src.name]."</span>, "<span class='notice'>You collapse \the [src.name].</span>")
+			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("<span class='notice'>[user] collects \the [src.name].</span>", "<span class='notice'>You collect \the [src.name].</span>")
+			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].", "<span class='notice'>You collapse \the [src.name].</span>")
+		usr.visible_message("<span class='notice'>[usr] collapses \the [src.name].</span>", "<span class='notice'>You collapse \the [src.name].</span>")
 		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 << "<span class='info'> The rack is empty.</span>"
 		return
 
-	user << "\blue You deploy the roller bed."
+	user << "<span class='notice'>You deploy the roller bed.</span>"
 	var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc)
 	R.add_fingerprint(user)
 	qdel(held)

From aaaaa14ae87b90680687d6f9ee5cbaa6ab3dd5d4 Mon Sep 17 00:00:00 2001
From: Crazylemon <tlrgue17@gmail.com>
Date: Wed, 30 Sep 2015 08:05:34 -0700
Subject: [PATCH 3/3] Fixes the misplaced quote

Does not fix: How tired I am
---
 code/game/objects/structures/stool_bed_chair_nest/bed.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 c08852bfddd..39f545a3178 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -73,7 +73,7 @@
 		if(buckled_mob)
 			user_unbuckle_mob(user)
 		else
-			user.visible_message("<span class='notice'>[user] collapses \the [src.name]."</span>, "<span class='notice'>You collapse \the [src.name].</span>")
+			user.visible_message("<span class='notice'>[user] collapses \the [src.name].</span>", "<span class='notice'>You collapse \the [src.name].</span>")
 			new/obj/item/roller(get_turf(src))
 			qdel(src)
 	return