Fix for Bahama Lizard cocktail. (#4718)

I created some conflicting recipes accidentally with my lizard drinks.

This should fix the problem and allow Bahama Lizards to be made.
This commit is contained in:
Kaedwuff
2018-05-15 10:15:56 +03:00
committed by Erki
parent 83bc36afc0
commit c011b1d9b8
3 changed files with 39 additions and 2 deletions
@@ -3424,7 +3424,7 @@
description = "A tropical cocktail containing cactus juice from Moghes, but no actual alcohol."
color = "#FF7F3B"
strength = 15
taste_description = "lime and orange"
taste_description = "sweet lemons"
glass_icon_state = "bahamalizard"
glass_name = "glass of Bahama Lizard"
+1 -1
View File
@@ -2674,7 +2674,7 @@
name = "Bahama Lizard"
id = "bahamalizard"
result = "bahamalizard"
required_reagents = list("xuizijuice" = 2, "orangejuice" = 2, "limejuice" = 1, "ice" = 1)
required_reagents = list("xuizijuice" = 2, "lemonjuice" = 2, "cream" = 1, "ice" = 1)
result_amount = 6
/datum/chemical_reaction/cactuscreme
@@ -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:
- bugfix: "The bahama lizard recipe has been fixed to now actually be craftable. It now requires only lemon juice, ice, cream, and xuizi juice."