Merge pull request #10192 from Kelenius/ofImprinterAndProhon

Of imprinter and prohon
This commit is contained in:
PsiOmegaDelta
2015-07-16 08:36:17 +02:00
2 changed files with 2 additions and 1 deletions

View File

@@ -147,6 +147,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
new stacktype(loc, amount)
busy = 0
updateUsrDialog()
return
..()

View File

@@ -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])"