shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Travis man good

Browse Source
This commit is contained in:
Ghommie
2020-01-11 20:51:15 +01:00
parent c709a9e4a9
commit 16db38a08f
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/food/snacks_other.dm
+1 -1
View File
@@ -615,7 +615,7 @@
name = "marshmallow"
desc = "A marshmallow filled with fluffy marshmallow fluff."
icon_state = "marshmallow"
list_reagents = list("sugar" = 5, "nutriment" = 2)
list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/nutriment = 2)
filling_color = "#fafafa"
w_class = WEIGHT_CLASS_TINY
tastes = list("marshmallow" = 2)
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+8 -4
View File
@@ -92,10 +92,14 @@
/obj/machinery/chem_dispenser/Initialize()
. = ..()
emagged_reagents = sortList(emagged_reagents, /proc/cmp_reagents_asc)
upgrade_reagents = sortList(upgrade_reagents, /proc/cmp_reagents_asc)
upgrade_reagents2 = sortList(upgrade_reagents2, /proc/cmp_reagents_asc)
upgrade_reagents3 = sortList(upgrade_reagents3, /proc/cmp_reagents_asc)
if(emagged_reagents)
emagged_reagents = sortList(emagged_reagents, /proc/cmp_reagents_asc)
if(upgrade_reagents)
upgrade_reagents = sortList(upgrade_reagents, /proc/cmp_reagents_asc)
if(upgrade_reagents2)
upgrade_reagents2 = sortList(upgrade_reagents2, /proc/cmp_reagents_asc)
if(upgrade_reagents3)
upgrade_reagents3 = sortList(upgrade_reagents3, /proc/cmp_reagents_asc)
dispensable_reagents = sortList(dispensable_reagents, /proc/cmp_reagents_asc)
update_icon()