From 7b4e1b2e6b805fdb12b6026b10385e3abad3164d Mon Sep 17 00:00:00 2001 From: deathride58 Date: Thu, 14 Dec 2017 14:38:10 -0500 Subject: [PATCH] Update designs.dm --- code/modules/research/designs.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index d546d3739a..e16aadb7cd 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -42,13 +42,7 @@ other types of metals and chemistry for reagents). var/maxstack = 1 var/lathe_time_factor = 1 //How many times faster than normal is this to build on the protolathe var/dangerous_construction = FALSE //notify and log for admin investigations if this is printed. -<<<<<<< HEAD - var/departmental_flags = NONE //bitflags for deplathes. -======= var/departmental_flags = ALL //bitflags for deplathes. - var/list/datum/techweb_node/unlocked_by = list() - var/icon_cache ->>>>>>> e01d746... Merge pull request #33468 from kevinz000/patch-405 /datum/design/Destroy() CRASH("DESIGN DATUMS SHOULD NOT EVER BE DESTROYED AS THEY ARE ONLY MEANT TO BE IN A GLOBAL LIST AND REFERENCED FOR US.")