From 376b3e890644df8e1ac662db785de8c274be5ada Mon Sep 17 00:00:00 2001 From: Razgriz Date: Tue, 24 Jan 2023 17:53:21 -0700 Subject: [PATCH] powder that makes you say yes --- .../objects/structures/crates_lockers/closets/misc_vr.dm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm index 3fb7de9b87..5b589c7b64 100644 --- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm @@ -215,11 +215,8 @@ /obj/item/weapon/cell/device, /obj/item/device/radio, /obj/item/device/gps/explorer, -<<<<<<< HEAD - /obj/item/device/cataloguer/compact) -======= - /obj/item/weapon/gun/energy/gun/protector/pilotgun/locked) ->>>>>>> 7fe4a72808... Merge pull request #14247 from BonniePandora/Pilot-holdout-mk2 + /obj/item/device/cataloguer/compact) //CHOMP edit +// /obj/item/weapon/gun/energy/gun/protector/pilotgun/locked) //CHOMP Remove /obj/structure/closet/secure_closet/pilot/Initialize() if(prob(50))