cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #10127, fixes #10139

Browse Source 
Removes phoron requirement from shield circuit, adds a return to sheet
adding so ..() is not called when attacked with a sheet.
This commit is contained in:
Kelenius
2015-07-15 16:49:22 +03:00
parent 03927918c6
commit 4c8dfcf17e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/research/circuitprinter.dm
View File

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

2
code/modules/research/designs.dm
View File

@@ -314,7 +314,7 @@ datum/design/circuit/aifixer
/////////////////////////////////// ///////////////////////////////////
datum/design/circuit/shield datum/design/circuit/shield
req_tech = list("bluespace" = 4, "phorontech" = 3) 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() datum/design/circuit/shield/AssembleDesignName()
name = "Shield generator circuit design ([name])" name = "Shield generator circuit design ([name])"