cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-21 04:48:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Re-adds the Seasonal Pumpkin Spice Lattes to the Coffee vendors. (#7086)

Browse Source
This commit is contained in:
fernerr
2019-10-02 14:19:32 +02:00
committed by Werner
parent a7222727ba
commit 17bf65a7bb
3 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/vending_types.dm
+4 -2
View File
@@ -138,7 +138,8 @@
/obj/item/weapon/reagent_containers/food/drinks/coffee = 25,
/obj/item/weapon/reagent_containers/food/drinks/tea = 25,
/obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 25,
/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 20
/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 20,
/obj/item/weapon/reagent_containers/food/drinks/coffee/pslatte = 10
)
contraband = list(
/obj/item/weapon/reagent_containers/food/drinks/ice = 10
@@ -147,7 +148,8 @@
/obj/item/weapon/reagent_containers/food/drinks/coffee = 20,
/obj/item/weapon/reagent_containers/food/drinks/tea = 20,
/obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 22,
/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 6
/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 6,
/obj/item/weapon/reagent_containers/food/drinks/coffee/pslatte = 25
)
vending_sound = "machines/vending/vending_coffee.ogg"
cooling_temperature = T0C + 57 //Optimal coffee temperature
code/modules/reagents/reagent_containers/food/drinks.dm
+1 -1
View File
@@ -131,7 +131,7 @@
name = "Robust coffee"
desc = "Careful, the beverage you're about to enjoy is extremely hot."
icon_state = "coffee"
item_state = "cont_vapour"
item_state = "contvapour"
drop_sound = 'sound/items/drop/box.ogg'
center_of_mass = list("x"=16, "y"=11)
Initialize()