cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 09:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hot Coffee Fixes (#5696)

Browse Source 
* Makes coffee hot
This commit is contained in:
BurgerLUA
2018-12-07 13:28:27 -08:00
committed by Werner
parent d831553e65
commit 625daa1ca2
4 changed files with 59 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/reagents/dispenser/cartridge.dm
View File

@@ -14,12 +14,20 @@
var/spawn_reagent = null
var/label = ""
/obj/item/weapon/reagent_containers/chem_disp_cartridge/Initialize()
var/temperature_override = 0 //A non-zero value with set the temperature of the reagents inside to this value, in kelvin.
/obj/item/weapon/reagent_containers/chem_disp_cartridge/Initialize(mapload,temperature_override)
. = ..()
if(temperature_override)
src.temperature_override = temperature_override
if(spawn_reagent)
reagents.add_reagent(spawn_reagent, volume)
reagents.add_reagent(spawn_reagent, volume, temperature = src.temperature_override)
var/datum/reagent/R = SSchemistry.chemical_reagents[spawn_reagent]
setLabel(R.name)
if(label)
setLabel(label)
else
setLabel(R.name)
/obj/item/weapon/reagent_containers/chem_disp_cartridge/examine(mob/user)
..()

13
code/modules/reagents/dispenser/dispenser_presets.dm
View File

@@ -68,9 +68,9 @@
spawn_cartridges = list(
/obj/item/weapon/reagent_containers/chem_disp_cartridge/water,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/ice,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee{temperature_override = 369},
/obj/item/weapon/reagent_containers/chem_disp_cartridge/cream,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/tea,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/tea{temperature_override = 349},
/obj/item/weapon/reagent_containers/chem_disp_cartridge/icetea,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/cola,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/smw,
@@ -128,12 +128,13 @@
/obj/machinery/chemical_dispenser/coffeemaster/full
spawn_cartridges = list(
/obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/espresso,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee{temperature_override = 369},
/obj/item/weapon/reagent_containers/chem_disp_cartridge/espresso{temperature_override = 369},
/obj/item/weapon/reagent_containers/chem_disp_cartridge/cream,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/milk,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/soymilk
/obj/item/weapon/reagent_containers/chem_disp_cartridge/soymilk,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/water{temperature_override = 373}
)
/obj/machinery/chemical_dispenser/coffee
@@ -145,5 +146,5 @@
/obj/machinery/chemical_dispenser/coffee/full
spawn_cartridges = list(
/obj/item/weapon/reagent_containers/chem_disp_cartridge/espresso
/obj/item/weapon/reagent_containers/chem_disp_cartridge/espresso{temperature_override = 369.15}
)