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.

Sign up for GitHub

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

Jump to bottom

Functional bedrolls #4874

Merged
merged 6 commits into from
Nov 13, 2023
Merged

Functional bedrolls #4874

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
474afc8
eepytime
Releasethesea Nov 8, 2023
a783a1e
Merge branch 'cmss13-devs:master' into eepy
Releasethesea Nov 8, 2023
a73b6ba
Bedroll++
Releasethesea Nov 8, 2023
ddd1beb
maybethistime
Releasethesea Nov 8, 2023
78b9098
eeeeeemaybe
Releasethesea Nov 8, 2023
d92a4aa
hope
Releasethesea Nov 10, 2023
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
14 changes: 12 additions & 2 deletions code/game/objects/structures/stool_bed_chair_nest/bed.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,17 @@ var/global/list/activated_medevac_stretchers = list()

//bedroll
/obj/structure/bed/bedroll
name = "bedroll"
desc = "bedroll"
name = "unfolded bedroll"
desc = "A rolled up bedroll, not too comfortable rolled up, you should probably unroll it before you sleep on it."
Releasethesea marked this conversation as resolved.
Show resolved Hide resolved
icon = 'icons/monkey_icos.dmi'
icon_state = "bedroll_o"
buckling_y = 0
foldabletype = /obj/item/roller/bedroll
accepts_bodybag = FALSE

/obj/item/roller/bedroll
name = "folded bedroll"
desc = "Perfect or those long missions, when there's nowhere else to sleep, you remembered to bring at least one thing of comfort."
icon = 'icons/monkey_icos.dmi'
icon_state = "bedroll"
rollertype = /obj/structure/bed/bedroll