cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 20:43:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bring any drink in flasks (#12227)

Browse Source
This commit is contained in:
Sparky
2021-08-05 18:09:08 +02:00
committed by GitHub
parent d52e966c56
commit 837bc56064
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_general.dm
+3 -3
View File
@@ -45,7 +45,7 @@
/datum/gear/flask/New()
..()
gear_tweaks += new /datum/gear_tweak/reagents(lunchables_alcohol_reagents())
gear_tweaks += new /datum/gear_tweak/reagents(lunchables_all_drink_reagents())
/datum/gear/vacflask_cold
display_name = "cold vacuum-flask"
@@ -53,7 +53,7 @@
/datum/gear/vacflask_cold/New()
..()
gear_tweaks += new /datum/gear_tweak/reagents(lunchables_drink_reagents())
gear_tweaks += new /datum/gear_tweak/reagents(lunchables_all_drink_reagents())
/datum/gear/vacflask_cold/spawn_item(var/location, var/metadata)
. = ..()
@@ -67,7 +67,7 @@
/datum/gear/vacflask_hot/New()
..()
gear_tweaks += new /datum/gear_tweak/reagents(lunchables_drink_reagents())
gear_tweaks += new /datum/gear_tweak/reagents(lunchables_all_drink_reagents())
/datum/gear/vacflask_hot/spawn_item(var/location, var/metadata)
. = ..()
code/modules/reagents/reagent_containers/food/lunch.dm
+3
View File
@@ -141,6 +141,9 @@ var/list/lunchables_alcohol_reagents_ = list(
lunchables_alcohol_reagents_ = init_lunchable_reagent_list(lunchables_alcohol_reagents_, /decl/reagent/alcohol)
return lunchables_alcohol_reagents_
/proc/lunchables_all_drink_reagents()
return sortList(lunchables_drink_reagents() + lunchables_alcohol_reagents())
/proc/init_lunchable_list(var/list/lunches)
. = list()
for(var/lunch in lunches)