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

Make stack amount var private

Browse Source
This commit is contained in:
Chompstation Bot
2021-08-26 15:39:04 +00:00
parent 145f8172f4
commit af0d7a0f6b
72 changed files with 935 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/machinery/partslathe_vr.dm
View File

@@ -125,12 +125,12 @@
if(!(S.material.name in materials))
to_chat(user, "<span class='warning'>The [src] doesn't accept [S.material]!</span>")
return 1
if(S.amount < 1)
if(S.get_amount() < 1)
return 1 // Does this even happen? Sanity check I guess.
var/max_res_amount = storage_capacity[S.material.name]
if(materials[S.material.name] + S.perunit <= max_res_amount)
var/count = 0
while(materials[S.material.name] + S.perunit <= max_res_amount && S.amount >= 1)
while(materials[S.material.name] + S.perunit <= max_res_amount && S.get_amount() >= 1)
materials[S.material.name] += S.perunit
S.use(1)
count++
@@ -205,7 +205,7 @@
// 0 amount = 0 means ejecting a full stack; -1 means eject everything
/obj/machinery/partslathe/proc/eject_materials(var/material, var/amount)
var/recursive = amount == -1 ? 1 : 0
var/recursive = amount == -1 ? TRUE : FALSE
material = lowertext(material)
var/mattype
switch(material)
@@ -219,9 +219,7 @@
if(amount <= 0)
amount = S.max_amount
var/ejected = min(round(materials[material] / S.perunit), amount)
S.amount = min(ejected, amount)
if(S.amount <= 0)
qdel(S)
if(!S.set_amount(min(ejected, amount)))
return
materials[material] -= ejected * S.perunit
if(recursive && materials[material] >= S.perunit)