From 3fa644b0d631be8c9678c76cc61c27ca9708427b Mon Sep 17 00:00:00 2001 From: Casey Date: Sat, 8 Jan 2022 12:52:24 -0500 Subject: [PATCH 1/2] Sword crate --- code/datums/supplypacks/misc_vr.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/datums/supplypacks/misc_vr.dm b/code/datums/supplypacks/misc_vr.dm index dbe2143e03..6a6d778b85 100644 --- a/code/datums/supplypacks/misc_vr.dm +++ b/code/datums/supplypacks/misc_vr.dm @@ -161,3 +161,17 @@ cost = 300 containertype = /obj/structure/closet/crate containername = "cordless jukebox speakers crate" +<<<<<<< HEAD +======= + +/datum/supply_pack/misc/sword + name = "sword" + contains = list( + /obj/item/weapon/material/sword =2 + ) + cost =100 + access = list(access_explorer, + access_security,) + + one_access = TRUE +>>>>>>> 3773f565937... Merge pull request #12042 from TheDavestDave/sword-crate From 02fa3eba30dfbfd21912ddb3139919aa9ccb8dd7 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sun, 9 Jan 2022 20:48:24 -0500 Subject: [PATCH 2/2] powder that makes you say yes --- code/datums/supplypacks/misc_vr.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/datums/supplypacks/misc_vr.dm b/code/datums/supplypacks/misc_vr.dm index 6a6d778b85..1f53add675 100644 --- a/code/datums/supplypacks/misc_vr.dm +++ b/code/datums/supplypacks/misc_vr.dm @@ -161,8 +161,6 @@ cost = 300 containertype = /obj/structure/closet/crate containername = "cordless jukebox speakers crate" -<<<<<<< HEAD -======= /datum/supply_pack/misc/sword name = "sword" @@ -174,4 +172,3 @@ access_security,) one_access = TRUE ->>>>>>> 3773f565937... Merge pull request #12042 from TheDavestDave/sword-crate