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

Functional bedrolls #4874

Merged
merged 6 commits into from
Nov 13, 2023
Merged
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
3 changes: 3 additions & 0 deletions code/game/machinery/vending/vendor_types/requisitions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,9 @@
list("MASKS", -1, null, null, null),
list("Gas Mask", 20, /obj/item/clothing/mask/gas, VENDOR_ITEM_REGULAR),
list("Heat Absorbent Coif", 10, /obj/item/clothing/mask/rebreather/scarf, VENDOR_ITEM_REGULAR),

list("MISCELLANEOUS", -1, null, null),
list("Bedroll", 30, /obj/item/roller/bedroll, VENDOR_ITEM_REGULAR),
)

/obj/structure/machinery/cm_vending/sorted/uniform_supply/ui_state(mob/user)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@
list("USCM Flair", round(scale * 15), /obj/item/prop/helmetgarb/flair_uscm, VENDOR_ITEM_REGULAR),
list("Falling Falcons Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch/falcon, VENDOR_ITEM_REGULAR),
list("USCM Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch, VENDOR_ITEM_REGULAR),
list("Bedroll", round(scale * 20), /obj/item/roller/bedroll, VENDOR_ITEM_REGULAR),
)

//--------------SQUAD SPECIFIC VERSIONS--------------
Expand Down
14 changes: 12 additions & 2 deletions code/game/objects/structures/stool_bed_chair_nest/bed.dm
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 = "Perfect for 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_o"
buckling_y = 0
foldabletype = /obj/item/roller/bedroll
accepts_bodybag = FALSE

/obj/item/roller/bedroll
name = "folded bedroll"
desc = "A standard issue USCMC bedroll, They've been in service for as long as you can remember. The tag on it states to unfold it before rest, but who needs rules anyway, right?"
icon = 'icons/monkey_icos.dmi'
icon_state = "bedroll"
rollertype = /obj/structure/bed/bedroll
Binary file added icons/obj/items/bedrolls.dmi
Binary file not shown.