cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-30 07:26:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow cancelling in chem master modals for pills

Browse Source 
Suggested in https://github.com/VOREStation/VOREStation/issues/3604, this adds cancel buttons when creating pills so you can abort the process rather than getting forced to create pills you might have just accidentally clicked the button for and then breaking them back into beakers.

Resolves https://github.com/VOREStation/VOREStation/issues/3604 (Just in case GitHub knows how to cross-repo close issues)
This commit is contained in:
Arokha Sieyes
2018-04-30 11:42:09 -04:00
parent 4df02c9160
commit f0be908e39
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Machinery.dm
+6 -2
View File
@@ -220,7 +220,9 @@
return
if (href_list["createpill_multiple"])
count = input("Select the number of pills to make.", "Max [max_pill_count]", pillamount) as num
count = input("Select the number of pills to make.", "Max [max_pill_count]", pillamount) as null|num
if(!count) //Covers 0 and cancel
return
count = Clamp(count, 1, max_pill_count)
if(reagents.total_volume/count < 1) //Sanity checking.
@@ -229,7 +231,9 @@
var/amount_per_pill = reagents.total_volume/count
if (amount_per_pill > 60) amount_per_pill = 60
var/name = sanitizeSafe(input(usr,"Name:","Name your pill!","[reagents.get_master_reagent_name()] ([amount_per_pill] units)"), MAX_NAME_LEN)
var/name = sanitizeSafe(input(usr,"Name:","Name your pill!","[reagents.get_master_reagent_name()] ([amount_per_pill] units)") as null|text, MAX_NAME_LEN)
if(!name) //Blank name (sanitized to nothing, or left empty) or cancel
return
if(reagents.total_volume/count < 1) //Sanity checking.
return