From 4c8dfcf17e87e583de839a78641bd343df636ac1 Mon Sep 17 00:00:00 2001
From: Kelenius <kelenius@ya.ru>
Date: Wed, 15 Jul 2015 16:49:22 +0300
Subject: [PATCH] Fixes #10127, fixes #10139

Removes phoron requirement from shield circuit, adds a return to sheet
adding so ..() is not called when attacked with a sheet.
---
 code/modules/research/circuitprinter.dm | 1 +
 code/modules/research/designs.dm        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm
index d0cfe226f6..f5191fb37f 100644
--- a/code/modules/research/circuitprinter.dm
+++ b/code/modules/research/circuitprinter.dm
@@ -147,6 +147,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 			new stacktype(loc, amount)
 		busy = 0
 		updateUsrDialog()
+		return
 
 	..()
 
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 9d0d547f94..3ddb262453 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -314,7 +314,7 @@ datum/design/circuit/aifixer
 ///////////////////////////////////
 datum/design/circuit/shield
 	req_tech = list("bluespace" = 4, "phorontech" = 3)
-	materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 10000, "$diamond" = 5000, "$gold" = 10000)
+	materials = list("$glass" = 2000, "sacid" = 20, "$diamond" = 5000, "$gold" = 10000)
 
 datum/design/circuit/shield/AssembleDesignName()
 	name = "Shield generator circuit design ([name])"