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 60dd955df4f..a16153e32e2 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -99,4 +99,44 @@ visible_message("[usr] collapses \the [src.name].") new/obj/item/roller(get_turf(src)) qdel(src) - return \ No newline at end of file + return + +/obj/item/roller/robo //ROLLER ROBO DA! + name = "roller bed dock" + var/loaded = null + +/obj/item/roller/robo/New() + loaded = new /obj/structure/stool/bed/roller(src) + desc = "A collapsed roller bed that can be ejected for emergency use. Must be collected or replaced after use." + ..() + +/obj/item/roller/robo/examine(mob/user) + ..() + user << "The dock is [loaded ? "loaded" : "empty"]" + +/obj/item/roller/robo/attack_self(mob/user) + if(loaded) + var/obj/structure/stool/bed/roller/R = loaded + R.loc = user.loc + user.visible_message("[user] deploys [loaded].") + loaded = null + else + user << "The dock is empty!" + +/obj/item/roller/robo/afterattack(obj/target, mob/user , proximity) + if(istype(target,/obj/structure/stool/bed/roller)) + if(!proximity) + return + if(loaded) + user << "You already have a roller bed docked!" + return + + var/obj/structure/stool/bed/roller/R = target + if(R.buckled_mob) + R.user_unbuckle_mob(user) + + loaded = target + target.loc = src + user.visible_message("[user] collects [loaded].") + ..() + diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index f5bb1b34008..1afc3eaea7f 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -95,6 +95,7 @@ modules += new /obj/item/weapon/scalpel(src) modules += new /obj/item/weapon/circular_saw(src) modules += new /obj/item/weapon/extinguisher/mini(src) + modules += new /obj/item/roller/robo(src) emag = new /obj/item/weapon/reagent_containers/spray(src) emag.reagents.add_reagent("facid", 250) diff --git a/html/changelogs/Incoming5643-rollingbedforborgs.yml b/html/changelogs/Incoming5643-rollingbedforborgs.yml new file mode 100644 index 00000000000..74c1ba7662c --- /dev/null +++ b/html/changelogs/Incoming5643-rollingbedforborgs.yml @@ -0,0 +1,6 @@ +author: Incoming5643 + +delete-after: True + +changes: + - rscadd: "Medical borgs now have access to a deployable onboard roller bed. Should the bed become lost, any roller bed may be used in its place." \ No newline at end of file