From c8bcca5964877ee24a2ccd5db1326a24c9e01e9c Mon Sep 17 00:00:00 2001
From: Fermi <phasondragon@googlemail.com>
Date: Thu, 13 Jun 2019 01:45:48 +0100
Subject: [PATCH] Staged hypnoflash removal.

---
 code/modules/uplink/uplink_items.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 05e9c68c7d..b6a936953e 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -1580,11 +1580,14 @@ datum/uplink_item/stealthy_tools/taeclowndo_shoes
 	cost = 2
 
 //ported from tg as is along with functions, feel free to edit/remove
+//Commented out, will remove when fixing merge conflicts
+/*
 /datum/uplink_item/device_tools/hypnotic_flash
 	name = "Hypnotic Flash"
 	desc = "A modified flash able to hypnotize targets. If the target is not in a mentally vulnerable state, it will only confuse and pacify them temporarily."
 	item = /obj/item/assembly/flash/hypnotic
 	cost = 7
+*/
 
 /datum/uplink_item/badass/balloon
 	name = "Syndicate Balloon"