This commit is contained in:
Kaedwuff
2018-11-22 15:26:50 +01:00
committed by Werner
parent f47fa5dee0
commit 6b4b2ec05f
4 changed files with 56 additions and 0 deletions
@@ -1277,6 +1277,17 @@
glass_name = "glass of lemonade"
glass_desc = "Oh the nostalgia..."
/datum/reagent/drink/lemonade/pink
name = "Pink Lemonade"
description = "A fruity pink citrus drink."
id = "pinklemonade"
color = "#FFC0CB"
taste_description = "girly tartness"
glass_icon_state = "pinklemonade"
glass_name = "glass of pink lemonade"
glass_desc = "You feel girlier just looking at this."
/datum/reagent/drink/kiraspecial
name = "Kira Special"
description = "Long live the guy who everyone had mistaken for a girl. Baka!"
@@ -2343,6 +2343,14 @@
required_reagents = list("lemonjuice" = 1, "sugar" = 1, "water" = 1)
result_amount = 3
/datum/chemical_reaction/lemonade/pink
name = "Pink Lemonade"
id = "pinklemonade"
result = "pinklemonade"
required_reagents = list("lemonade" = 8, "grenadine" = 2)
result_amount = 10
/datum/chemical_reaction/kiraspecial
name = "Kira Special"
id = "kiraspecial"
@@ -0,0 +1,37 @@
################################
# 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
#################################
# Your name.
author: Kaedwuff
# 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: "Pink lemonade can now be made by mixing in grenadine to lemonade, if you want to make a girly fruit drink."
Binary file not shown.

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 110 KiB