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 3e2c06a66f7..182d1c64050 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -78,7 +78,9 @@
 					"You hear metal clanking")
 			unbuckle()
 			src.add_fingerprint(user)
-	return
+			return 1
+
+	return 0
 
 /obj/structure/stool/bed/proc/buckle_mob(mob/M as mob, mob/user as mob)
 	if (!ticker)
@@ -119,6 +121,18 @@
 	icon_state = "down"
 	anchored = 0
 
+/obj/structure/stool/bed/roller/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W,/obj/item/roller_holder))
+		if(buckled_mob)
+			manual_unbuckle()
+		else
+			visible_message("[user] collapses \the [src.name].")
+			new/obj/item/roller(get_turf(src))
+			spawn(0)
+				del(src)
+		return
+	..()
+
 /obj/item/roller
 	name = "roller bed"
 	desc = "A collapsed roller bed that can be carried around."
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 8beec1fc435..7916652d22c 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -180,8 +180,7 @@
 /mob/living/silicon/robot/proc/pick_module()
 	if(module)
 		return
-
-	var/list/modules = list("Standard", "Engineering", "Surgeon", "Crisis", "Miner", "Janitor", "Service", "Security")
+	var/list/modules = list("Standard", "Engineering", "Construction", "Surgeon", "Crisis", "Miner", "Janitor", "Service", "Clerical", "Security")
 	if(security_level == (SEC_LEVEL_GAMMA || SEC_LEVEL_EPSILON) || crisis)
 		src << "\red Crisis mode active. Combat module available."
 		modules+="Combat"
@@ -210,6 +209,14 @@
 			module_sprites["Rich"] = "maximillion"
 			module_sprites["Default"] = "Service2"
 
+		if("Clerical")
+			module = new /obj/item/weapon/robot_module/clerical(src)
+			module_sprites["Waitress"] = "Service"
+			module_sprites["Kent"] = "toiletbot"
+			module_sprites["Bro"] = "Brobot"
+			module_sprites["Rich"] = "maximillion"
+			module_sprites["Default"] = "Service2"
+
 		if("Miner")
 			module = new /obj/item/weapon/robot_module/miner(src)
 			channels = list("Supply" = 1)
@@ -258,7 +265,7 @@
 			module_sprites["Landmate"] = "landmate"
 
 		if("Construction")
-			module = new /obj/item/weapon/robot_module/engineering(src)
+			module = new /obj/item/weapon/robot_module/construction(src)
 			channels = list("Engineering" = 1)
 			if(camera && "Robots" in camera.network)
 				camera.network.Add("Engineering")
diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm
index 0536b07fd44..931cb0556be 100644
--- a/code/modules/mob/living/silicon/robot/robot_items.dm
+++ b/code/modules/mob/living/silicon/robot/robot_items.dm
@@ -105,7 +105,7 @@
 
 		if("Colour")
 			var/newcolour = input("Which colour would you like to use?") as null|anything in list("black","blue","red","green","yellow")
-			if(newcolour) color = newcolour
+			if(newcolour) colour = newcolour
 
 		if("Mode")
 			if (mode == 1)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 9db59db57e1..51ff5c565bb 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -132,6 +132,8 @@
 		src.modules += new /obj/item/weapon/reagent_containers/syringe(src)
 		src.modules += new /obj/item/weapon/extinguisher/mini(src)
 
+		src.emag = new /obj/item/weapon/reagent_containers/spray(src)
+
 		src.emag.reagents.add_reagent("pacid", 250)
 		src.emag.name = "Polyacid spray"
 		return