From 22c3480dff8930c29f652d7630af341f7533ceaf Mon Sep 17 00:00:00 2001 From: Releasethesea <135743398+Releasethesea@users.noreply.github.com> Date: Mon, 13 Nov 2023 02:49:17 -0600 Subject: [PATCH] Functional bedrolls (#4874) # 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! # 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
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
https://imgur.com/a/O8m9gpc # Changelog :cl: add: Adds functional bedrolls to the game. /:cl: --- .../vending/vendor_types/requisitions.dm | 3 +++ .../vending/vendor_types/squad_prep/squad_prep.dm | 1 + .../structures/stool_bed_chair_nest/bed.dm | 14 ++++++++++++-- icons/obj/items/bedrolls.dmi | Bin 0 -> 809 bytes 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 icons/obj/items/bedrolls.dmi diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index 1dbd31c63de4..93680fb93d2c 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -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) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index 222cd4693cd2..94325b09e9eb 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -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-------------- 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 7979994915f4..bc3b4ad7f4d0 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -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 diff --git a/icons/obj/items/bedrolls.dmi b/icons/obj/items/bedrolls.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c36e07002a3daa55878524165220013d77e192b9 GIT binary patch literal 809 zcmV+^1J?YBP)00DGTPE!Ct=GbNc004D*R9JLG zWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TB zGg33tGfE(w;*!LYR3K9+DK(`iKPM+XUx|w|C9|j)C}zRMnO2mTn+jqZVyHx@Gel9R ztl;YB0(JrbFp?)mSHFn*0006wNkld(x5QeFca;{TlljFu!B#wa9@CRIJ zITjVExn;K!oU2vqUKgnnduOHi-|mbJ#O5Q}T=r7lgT-Jy8XL^KjN?q2bVccPGa6!q zuz-MW@XCxs&TkzDM|0ktrzzc}poFIB+Bf12=MTQS;5;$r9T#sua?m|a`RC#Z`2PUB zEQr(eUjf3{+;`WE5epbU8n=`NzI#JyXdMk=9zNn5@s^P9zWarcXJg)(F~+iI7}z$0 zVQHB_02 zrK~z-M;@BGMCn69L7N4o$q|q?Am!op3~*S)7Xq(U)dFziJG1m2|yRQDGF@50FTixKE?sqB|OGvNxP$8^a1_m;cS$He$hV~+8=(cR?9)Z z=ow1m4^b2i`o*Xph+Mo){xIp&X{73ptJ@z8$PMtLtmk_DLAL<`1snYAVNL-}@oj!X zJ4Hb);t?xPvbBNM5A3pI0KxtUNUWu+*Z_*+JWv;34S3}#U{?duSW-Vj=(oV{9#9PI zp$mL7mgJQM0G