cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

changelog and chemmaster fix

Browse Source
This commit is contained in:
SinTwo
2016-06-23 15:01:17 -04:00
parent ccb3853eb3
commit 2642bc1628
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/reagents/Chemistry-Machinery.dm
View File

@@ -89,7 +89,7 @@
data["condi"] = condi
if(loaded_pill_bottle)
data["pillBottle"] = list("total" = loaded_pill_bottle.contents.len, "max" = loaded_pill_bottle.storage_slots)
data["pillBottle"] = list("total" = loaded_pill_bottle.contents.len, "max" = loaded_pill_bottle.max_storage_space)
else
data["pillBottle"] = null
@@ -238,7 +238,7 @@
P.icon_state = "pill"+pillsprite
reagents.trans_to_obj(P,amount_per_pill)
if(src.loaded_pill_bottle)
if(loaded_pill_bottle.contents.len < loaded_pill_bottle.storage_slots)
if(loaded_pill_bottle.contents.len < loaded_pill_bottle.max_storage_space)
P.loc = loaded_pill_bottle
else if (href_list["createbottle"])