From f4be7d0f5b87c8981ba765b81445ff88e02613fb Mon Sep 17 00:00:00 2001
From: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
Date: Sat, 17 Feb 2018 12:33:22 +0100
Subject: [PATCH] fixes flametrowers not being buildiable in the autolathe

---
 code/modules/research/designs/autolathe_designs.dm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 4c8db5d715..e3fc8d2513 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -590,7 +590,11 @@
 	build_type = AUTOLATHE
 	materials = list(MAT_METAL = 500)
 	build_path = /obj/item/flamethrower/full
+<<<<<<< HEAD
 	category = list("hacked", "Weapons and ammo")
+=======
+	category = list("hacked", "Security")
+>>>>>>> 9f7e379... bad copypaste
 
 /datum/design/rcd
 	name = "Rapid Construction Device (RCD)"