From 390bca0ec1801702f04fee32ff31784c11744237 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Sun, 27 Mar 2022 00:18:25 -0700 Subject: [PATCH] powder that makes you say yes --- .../structures/crates_lockers/closets/secure/security.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 88274a7dc0..1c5c538ed8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -29,17 +29,9 @@ /obj/item/device/radio/headset/heads/hop, /obj/item/device/radio/headset/heads/hop/alt, /obj/item/weapon/storage/box/ids = 2, -<<<<<<< HEAD - ///obj/item/weapon/gun/energy/gun, //YW Edit, - /obj/item/weapon/gun/energy/gun/martin, //VOREStation Add, - /obj/item/weapon/storage/box/commandkeys, //VOREStation Add, - /obj/item/weapon/storage/box/servicekeys, //VOREStation Add, - ///obj/item/weapon/gun/projectile/sec/flash, //VOREStation Removal, -======= /obj/item/weapon/gun/energy/gun/compact, /obj/item/weapon/storage/box/commandkeys, /obj/item/weapon/storage/box/servicekeys, ->>>>>>> cce944d043... Merge pull request #12522 from GhostActual/Firearms1 /obj/item/device/flash) /obj/structure/closet/secure_closet/hop2