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..39f545a3178 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 + user.visible_message("[user] collapses \the [src.name].", "You collapse \the [src.name].") + new/obj/item/roller(get_turf(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.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) ..() if(over_object == usr && Adjacent(usr) && (in_range(src, usr) || usr.contents.Find(src))) @@ -100,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 @@ -120,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)