cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

hypovial shit

Browse Source 
iddqd
This commit is contained in:
Sishen
2019-07-25 19:11:58 -04:00
parent 28ac38d800
commit a1a626ba29
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/reagents/chemistry/machinery/chem_master.dm
View File

@@ -348,10 +348,10 @@
return return
var/amount_full = 0 var/amount_full = 0
var/vol_part = min(reagents.total_volume, 30) var/vol_part = min(reagents.total_volume, 60)
if(text2num(many)) if(text2num(many))
amount_full = round(reagents.total_volume / 30) amount_full = round(reagents.total_volume / 60)
vol_part = reagents.total_volume % 30 vol_part = reagents.total_volume % 60
var/name = stripped_input(usr, "Name:","Name your hypovial!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN) var/name = stripped_input(usr, "Name:","Name your hypovial!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN)
if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr))) if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
return return
@@ -361,7 +361,7 @@
P = new/obj/item/reagent_containers/glass/bottle/vial/small(drop_location()) P = new/obj/item/reagent_containers/glass/bottle/vial/small(drop_location())
P.name = trim("[name] hypovial") P.name = trim("[name] hypovial")
adjust_item_drop_location(P) adjust_item_drop_location(P)
reagents.trans_to(P, 30) reagents.trans_to(P, 60)
if(vol_part) if(vol_part)
P = new/obj/item/reagent_containers/glass/bottle/vial/small(drop_location()) P = new/obj/item/reagent_containers/glass/bottle/vial/small(drop_location())
@@ -432,4 +432,4 @@
condi = TRUE condi = TRUE
#undef PILL_STYLE_COUNT #undef PILL_STYLE_COUNT
#undef RANDOM_PILL_STYLE #undef RANDOM_PILL_STYLE

4
tgui/assets/tgui.js
View File

File diff suppressed because one or more lines are too long

2
tgui/src/interfaces/chem_master.ract
View File

@@ -77,7 +77,7 @@
<ui-button action='createBottle' params='{"many": 1}' state='{{data.bufferContents ? null : "disabled"}}' >Dispense Buffer to Bottles</ui-button> <ui-button action='createBottle' params='{"many": 1}' state='{{data.bufferContents ? null : "disabled"}}' >Dispense Buffer to Bottles</ui-button>
<br/> <br/>
<br/> <br/>
<ui-button action='createVial' params='{"many": 0}' state='{{data.bufferContents ? null : "disabled"}}' >Create Hypo Vial (max 30µ)</ui-button> <ui-button action='createVial' params='{"many": 0}' state='{{data.bufferContents ? null : "disabled"}}' >Create Hypo Vial (max 60µ)</ui-button>
<br/> <br/>
<ui-button action='createVial' params='{"many": 1}' state='{{data.bufferContents ? null : "disabled"}}' >Dispense Buffer to Hypo vials </ui-button> <ui-button action='createVial' params='{"many": 1}' state='{{data.bufferContents ? null : "disabled"}}' >Dispense Buffer to Hypo vials </ui-button>
<br/> <br/>