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 512f1b15800..464a82696c6 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -3881,7 +3881,7 @@ description = "Zo'ra Soda, cherry edition. All good drinks come in cherry." color = "#102000" adj_sleepy = -2 - caffeine = 0.2 + caffeine = 0.4 taste_description = "electric cherry" /datum/reagent/drink/zorasoda/phoron @@ -3890,7 +3890,7 @@ description = "Reported to taste nothing like phoron, but everything like grapes." color = "#863333" adj_sleepy = -2 - caffeine = 0.2 + caffeine = 0.4 taste_description = "electric grape" /datum/reagent/drink/zorasoda/kois @@ -3899,7 +3899,7 @@ description = "Whoever approved this in marketing needs to be drawn and quartered." color = "#dcd9cd" adj_sleepy = -2 - caffeine = 0.2 + caffeine = 0.4 taste_description = "sugary cabbage" /datum/reagent/drink/zorasoda/kois/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) @@ -3913,7 +3913,7 @@ description = "It feels like someone is just driving a freezing cold spear through the bottom of your mouth." color = "#365000" adj_sleepy = -3 - caffeine = 0.3 + caffeine = 0.6 taste_description = "a full-body bite into an acidic lemon" /datum/reagent/drink/zorasoda/hozm/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) @@ -3929,7 +3929,7 @@ description = "The 'diet' version of High Energy Zorane Might, still tastes like a cloud of stinging polytrinic bees." color = "#100800" adj_sleepy = -3 - caffeine = 0.1 + caffeine = 0.4 taste_description = "fizzy nettles" /datum/reagent/drink/zorasoda/venomgrass/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) @@ -3943,7 +3943,7 @@ description = "An orange, cream soda. It's a wonder it got here." color = "#E78108" adj_sleepy = -3 - caffeine = 0.2 + caffeine = 0.4 unaffected_species = IS_MACHINE taste_description = "orange cream" @@ -3958,7 +3958,7 @@ description = "A raspberry concoction you're pretty sure is already on recall." color = "#0000CD" adj_sleepy = -3 - caffeine = 0.2 + caffeine = 0.4 taste_description = "flat raspberry" /datum/reagent/drink/zorasoda/cthur/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) @@ -3996,7 +3996,7 @@ description = "It looks of mucus, but tastes like Heaven." color = "#FFFF00" adj_sleepy = -3 - caffeine = 0.2 + caffeine = 0.3 taste_description = "a reassuring spectrum of color" /datum/reagent/drink/zorasoda/jelly/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 44a1f3e3699..dacd2a708ed 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1080,8 +1080,8 @@ description = "A mixture of several high-energy amino acids, based on the secretions and saliva of V'krexi larvae." reagent_state = LIQUID color = "#bcd827" - metabolism = 0.6 - overdose = 5 + metabolism = 0.4 * REM + overdose = 20 data = 0 taste_description = "bitterness" metabolism_min = 0.5 diff --git a/html/changelogs/paradoxspace-zoratwo.yml b/html/changelogs/paradoxspace-zoratwo.yml new file mode 100644 index 00000000000..9f2b4bb4080 --- /dev/null +++ b/html/changelogs/paradoxspace-zoratwo.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: ParadoxSpace + +# 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: "Zo'ra Soda drinks now have a higher overdose limit, allowing humans to drink them without great suffering. Sorry about that." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 1e073660534..e6a46ba4498 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ