mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-22 20:43:10 +01:00
Re-adds the Seasonal Pumpkin Spice Lattes to the Coffee vendors. (#7086)
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
# balance
|
||||
# admin
|
||||
# backend
|
||||
# security
|
||||
# refactor
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: Ferner
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- rscadd: "Re-added Seasonal Pumpkin Spice Latttes to the coffee vendors. Get them while they're in season!"
|
||||
- bugfix: "Fixed coffee having no inhand icon."
|
||||
Reference in New Issue
Block a user