cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-22 19:46:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Synthesiser Insertion Fixes Pt.1

Browse Source 
Prevent inserting more than what you have as a drone/borg.
This commit is contained in:
TheFurryFeline
2019-05-02 22:18:18 -04:00
committed by GitHub
parent 367eb1f448
commit 0415d1eae7
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/circuitprinter.dm
+3 -2
View File
@@ -142,13 +142,14 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
for(var/mat in materials)
max_res_amount -= materials[mat]
//TFF 2/5/19: Polaris fix for Synthesisers inserting more than what is present
if(materials[S.material.name] + amnt <= max_res_amount)
if(S && S.amount >= 1)
if(S && S.get_amount() >= 1)
var/count = 0
overlays += "fab-load-metal"
spawn(10)
overlays -= "fab-load-metal"
while(materials[S.material.name] + amnt <= max_res_amount && S.amount >= 1)
while(materials[S.material.name] + amnt <= max_res_amount && S.get_amount() >= 1)
materials[S.material.name] += amnt
S.use(1)
count++
code/modules/research/protolathe.dm
+3 -2
View File
@@ -130,13 +130,14 @@
for(var/mat in materials)
max_res_amount -= materials[mat]
//TFF 2/5/19: Polaris fix for Synthesisers inserting more than what is present
if(materials[S.material.name] + amnt <= max_res_amount)
if(S && S.amount >= 1)
if(S && S.get_amount() >= 1)
var/count = 0
overlays += "fab-load-metal"
spawn(10)
overlays -= "fab-load-metal"
while(materials[S.material.name] + amnt <= max_res_amount && S.amount >= 1)
while(materials[S.material.name] + amnt <= max_res_amount && S.get_amount() >= 1)
materials[S.material.name] += amnt
S.use(1)
count++