Skip to content

Commit

Permalink
some fixes (#5736)
Browse files Browse the repository at this point in the history
  • Loading branch information
silicons committed Jul 20, 2023
1 parent ec6e684 commit 79fc9b2
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
2 changes: 2 additions & 0 deletions code/datums/material_container.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@
* @return sheets dumped
*/
/datum/material_container/proc/dump(atom/where, datum/material/material, amount = INFINITY)
if(amount < 0)
CRASH("negative amount?")
if(!istype(material))
material = SSmaterials.get_material(material)
var/can_dump = round(stored[material.id] / SHEET_MATERIAL_AMOUNT)
Expand Down
14 changes: 9 additions & 5 deletions code/modules/tgui/modules/specific/lathe_control.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
if("enqueue")
var/id = params["id"]
var/amount = text2num(params["amount"])
if(amount <= 0)
return FALSE
var/immediate = text2num(params["start"])
var/list/material_parts = params["materials"]
var/list/item_parts = params["items"]
Expand Down Expand Up @@ -78,9 +80,9 @@
var/datum/lathe_queue_entry/entry = SAFEINDEXACCESS(lathe.queue, index)
var/datum/design/D = SSresearch.fetch_design(entry.design_id)
if(isnull(entry))
return
if(isnull(new_amount))
return
return FALSE
if(isnull(new_amount) || (new_amount <= 0))
return FALSE
entry.amount = clamp(new_amount, 0, length(D.ingredients)? 1 : (D.is_stack? lathe.queue_max_entry_stack : lathe.queue_max_entry))
ui_queue_update()
return TRUE
Expand All @@ -93,13 +95,15 @@
if("ejectMaterial")
var/id = params["id"]
var/amt = params["amount"]
if(!amt || isnull(id))
return
if((amt <= 0) || isnull(id))
return FALSE
lathe.eject_sheets(id, amt)
ui_materials_update()
return TRUE
if("disposeReagent")
var/amount = text2num(params["amount"]) || INFINITY
if(amount <= 0)
return FALSE
lathe.reagents.remove_reagent(params["id"], amount)
ui_reagents_update()
return TRUE
Expand Down

0 comments on commit 79fc9b2

Please sign in to comment.