Skip to content

Commit

Permalink
Functional bedrolls (#4874)
Browse files Browse the repository at this point in the history
# About the pull request

When playing on an event in a seperate server the event runner had
bedrolls we could lay out which made me wonder why we dont have them in
CM! So much like pill packets, with a bit of help here they are
functional bedrolls!

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game

Roleplay is good, i can see many situations where this could be used,
bedrolls around a campfire on sorokyne, making a more comfortable FOB,
pretending to go camping using the new tents, the opportunities are
endless
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>

https://imgur.com/a/O8m9gpc

# Changelog
:cl:
add: Adds functional bedrolls to the game.
/:cl:
  • Loading branch information
Releasethesea authored Nov 13, 2023
1 parent feba0a8 commit 22c3480
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 2 deletions.
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.

0 comments on commit 22c3480

Please sign in to comment.