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 36003eb2fda..a20ab92e79a 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -428,9 +428,16 @@ bedpath = /obj/structure/bed/roller/hover /obj/item/roller/attack_self(mob/user) - var/obj/structure/bed/roller/R = new bedpath(user.loc) - R.add_fingerprint(user) - qdel(src) + ..() + deploy_roller(user, user.loc) + +/obj/item/roller/afterattack(obj/target, mob/user, proximity) + if(!proximity) + return + if(isturf(target)) + var/turf/T = target + if(!T.density) + deploy_roller(user, target) /obj/item/roller/attackby(obj/item/W as obj, mob/user as mob) @@ -444,6 +451,11 @@ ..() +/obj/item/roller/proc/deploy_roller(mob/user, atom/location) + var/obj/structure/bed/roller/R = new bedpath(location) + R.add_fingerprint(user) + qdel(src) + /obj/item/roller_holder name = "roller bed rack" desc = "A rack for carrying a collapsed roller bed." diff --git a/html/changelogs/nerocavalier-rollerbed.yml b/html/changelogs/nerocavalier-rollerbed.yml new file mode 100644 index 00000000000..4d2157555d5 --- /dev/null +++ b/html/changelogs/nerocavalier-rollerbed.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: NeroCavalier +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Roller beds can be deployed on adjacent tiles by clicking on them with the roller bed in hand." +