From 885415105449fdefcdf03b7042d8eaf3f775c3e2 Mon Sep 17 00:00:00 2001 From: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com> Date: Sun, 13 Jun 2021 18:51:17 -0400 Subject: [PATCH] Borgs Can Collapse Rollerbeds (#12009) --- code/game/objects/structures/stool_bed_chair_nest/bed.dm | 4 ++-- html/changelogs/Doxxmedearly - borg_rollerbeds.yml | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/Doxxmedearly - borg_rollerbeds.yml 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 a1dd361c3ca..36003eb2fda 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -12,7 +12,7 @@ desc = "This is used to lie in, sleep in or strap on." desc_info = "Click and drag yourself (or anyone) to this to buckle in. Click on this with an empty hand to undo the buckles.
\ Anyone with restraints, such as handcuffs, will not be able to unbuckle themselves. They must use the Resist button, or verb, to break free of \ - the buckles, instead." + the buckles, instead. \ To unbuckle people as a stationbound, click the bed with an empty gripper." icon = 'icons/obj/furniture.dmi' icon_state = "bed" anchored = TRUE @@ -342,7 +342,7 @@ ..() if(use_check(usr) || !Adjacent(usr)) return - if(!ishuman(usr)) + if(!ishuman(usr) && (!isrobot(usr) || isDrone(usr))) //Humans and borgs can collapse, but not drones return if(over_object == buckled && beaker) if(iv_attached) diff --git a/html/changelogs/Doxxmedearly - borg_rollerbeds.yml b/html/changelogs/Doxxmedearly - borg_rollerbeds.yml new file mode 100644 index 00000000000..aa54bd7f313 --- /dev/null +++ b/html/changelogs/Doxxmedearly - borg_rollerbeds.yml @@ -0,0 +1,7 @@ +author: Doxxmedearly + +delete-after: True + +changes: + - bugfix: "Stationbounds can now collapse rollerbeds, as well as attach bed-connected IVs to patients, remove IVs from beds, and remove vitals monitors from beds." + - rscadd: "Added a tip to the rollerbed description to indicate that stationbounds can unbuckle people by clicking the bed with an empty gripper (any kind)."