From 6cecc1762a26d162efaf2ed28b64421d2e70cc67 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 20 Mar 2022 18:52:03 -0400
Subject: [PATCH] powder that makes you say yes

---
 .../structures/crates_lockers/closets/secure/security.dm    | 6 ------
 1 file changed, 6 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 cc34f0cd41..19477d1090 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -242,15 +242,9 @@
 
 	starts_with = list(
 		/obj/item/clothing/accessory/badge/holo/detective,
-<<<<<<< HEAD
 		/obj/item/clothing/gloves/forensic, //CHOMP Edit replaces black gloves
 		/obj/item/gunbox, //CHOMP Edit undoes vorestation removal and adds back gunbox
-		/obj/item/weapon/gun/energy/stunrevolver/vintage,
-=======
-		/obj/item/clothing/gloves/black,
-		///obj/item/gunbox, // VOREStation Removal
 		/obj/item/gunbox/stun,
->>>>>>> e45c901f7c... Merge pull request #12443 from GhostActual/detective_guns
 		/obj/item/weapon/storage/belt/detective,
 		/obj/item/weapon/storage/box/evidence,
 		/obj/item/device/radio/headset/headset_sec,