Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Heavy-duty roller bed #8176

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions code/game/objects/objs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,12 @@
do_buckle(M, user)
return
if ((M.mob_size > MOB_SIZE_HUMAN))
to_chat(user, SPAN_WARNING("[M] is too big to buckle in."))
return
if (!istype(src, /obj/structure/bed/roller/heavy)) //super snowflake but whatever
to_chat(user, SPAN_WARNING("[M] is too big to buckle in."))
return
if (M.stat != DEAD)
to_chat(user, SPAN_WARNING("[M] resists your attempt to buckle!"))
return
do_buckle(M, user)

// the actual buckling proc
Expand Down
21 changes: 21 additions & 0 deletions code/game/objects/structures/stool_bed_chair_nest/bed.dm
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,27 @@

return

/obj/structure/bed/roller/heavy
name = "heavy-duty roller bed"
desc = "A reinforced plasteel board resting on a small but sturdy frame. Not very comfortable at all, but allows heavy cargo to rest lying down while moved to another location rapidly. Cannot be collapsed."
icon = 'icons/obj/structures/rollerbed.dmi'
icon_state = "heavy_roller_up"
anchored = FALSE
drag_delay = 0 //Pulling something on wheels is easy
buckling_y = 3
foldabletype = null
accepts_bodybag = TRUE
base_bed_icon = null
density = TRUE
buildstacktype = /obj/item/stack/sheet/plasteel

/obj/structure/bed/roller/heavy/attackby(obj/item/W, mob/user)
if(istype(W,/obj/item/roller_holder) && !buckled_bodybag)
if(buckled_mob || buckled_bodybag)
manual_unbuckle()
return
return ..()

/obj/item/roller
name = "roller bed"
desc = "A collapsed roller bed that can be carried around."
Expand Down
Binary file modified icons/obj/structures/rollerbed.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions maps/map_files/USS_Almayer/USS_Almayer.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -58844,6 +58844,7 @@
icon_state = "S"
},
/obj/structure/machinery/power/apc/almayer/south,
/obj/structure/bed/roller/heavy,
/turf/open/floor/almayer/sterile_green,
/area/almayer/medical/containment)
"uoj" = (
Expand Down
Loading