From ef4f86629a91514ea0b1452908708c4a50e3a3eb Mon Sep 17 00:00:00 2001 From: desven <45808369+desvenlafaxine@users.noreply.github.com> Date: Fri, 30 Jul 2021 04:55:08 -0500 Subject: [PATCH] Fixes some bugs with the Vaurcesian food (#12268) --- .../Chemistry-Reagents-Food-Drinks.dm | 6 ++- html/changelogs/desven_kois.yml | 41 ++++++++++++++++++ icons/obj/drinks.dmi | Bin 129095 -> 129096 bytes 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/desven_kois.yml diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index bf449e33123..4f0a96c7ada 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -57,12 +57,14 @@ /decl/reagent/kois/clean name = "Filtered K'ois" description = "A strange, ketchup-like substance, filled with K'ois nutrients." - color = "#ece9dd" + color = "#dce658" taste_description = "cabbage soup" kois_type = 0 fallback_specific_heat = 1 glass_icon_state = "glass_kois" + glass_name = "glass of filtered k'ois" + glass_desc = "A strange, ketchup-like substance, filled with K'ois nutrients." /decl/reagent/kois/black name = "Modified K'ois" @@ -4740,5 +4742,5 @@ taste_description = "minty coffee" glass_icon_state = "caprician_coffee" - glass_name = "glass of caprician coffee." + glass_name = "glass of caprician coffee" glass_desc = "A Vaurcesian take on liqueur coffee, quickly becoming a favorite of the Zo'ra hive." \ No newline at end of file diff --git a/html/changelogs/desven_kois.yml b/html/changelogs/desven_kois.yml new file mode 100644 index 00000000000..6e8e2238c9c --- /dev/null +++ b/html/changelogs/desven_kois.yml @@ -0,0 +1,41 @@ +################################ +# 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: Desven + +# 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: Fixes Caprician coffee not showing its sprite and the filtered k'ois glass not showing its name. diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index d46735cdd25ff4c0687af7aae033331af9e5a39e..400fabadcae2912f7aee3bac5f8b14ab836a415c 100644 GIT binary patch delta 58 zcmV-A0LA~u@CV572aqHIoUtW>3nES^qmP=FvHelyUZ+5i9m delta 57 zcmV-90LK5w@CV262aqHIo3SN=3n7ltCr!)H{-|