From a6ce064280b012cf6b986dffe2abbf351480656f Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Mon, 7 Jun 2021 04:49:25 +0000 Subject: [PATCH] Put the music speakers in crates! --- code/datums/supplypacks/misc_vr.dm | 44 +++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/code/datums/supplypacks/misc_vr.dm b/code/datums/supplypacks/misc_vr.dm index 94f23fb61c..1fc957716b 100644 --- a/code/datums/supplypacks/misc_vr.dm +++ b/code/datums/supplypacks/misc_vr.dm @@ -110,4 +110,46 @@ access = list(access_explorer, access_eva, access_pilot) - one_access = TRUE \ No newline at end of file +<<<<<<< HEAD + one_access = TRUE +||||||| parent of e28f7b423a... Merge pull request #10578 from Very-Soft/fixy + one_access = TRUE + +/datum/supply_pack/misc/music_players + name = "music players (3)" + contains = list( + /obj/item/device/walkpod = 3 + ) + cost = 150 + containername = "portable music players crate" + +/datum/supply_pack/misc/juke_remotes + name = "jukebox remote speakers (2)" + contains = list( + /obj/item/device/juke_remote = 2 + ) + cost = 300 + containername = "cordless jukebox speakers crate" + +======= + one_access = TRUE + +/datum/supply_pack/misc/music_players + name = "music players (3)" + contains = list( + /obj/item/device/walkpod = 3 + ) + cost = 150 + containertype = /obj/structure/closet/crate + containername = "portable music players crate" + +/datum/supply_pack/misc/juke_remotes + name = "jukebox remote speakers (2)" + contains = list( + /obj/item/device/juke_remote = 2 + ) + cost = 300 + containertype = /obj/structure/closet/crate + containername = "cordless jukebox speakers crate" + +>>>>>>> e28f7b423a... Merge pull request #10578 from Very-Soft/fixy