From a249dc605e3a5d0f089d958abeb95e95ba408f38 Mon Sep 17 00:00:00 2001 From: RuinaRuiner Date: Sun, 10 Dec 2023 10:31:29 +0300 Subject: [PATCH] add: Original cola MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## What Does This PR Do Добавляет напиток Original cola, и рецепт 2 коки 1 кола, напиток создает наркоэкран на 10 сек и дает -1 сек к слабости и -1 сек к стану ## Why It's Good For The Game Ссылка на апвоут https://discord.com/channels/617003227182792704/755125334097133628/1182696718941290496 ## Changelog add: Original cola drink and sprite :cl: add: Added new things del: Removed old things tweak: tweaked a few things fix: fixed a few things wip: added a few works in progress soundadd: added a new sound thingy sounddel: removed an old sound thingy imageadd: added some icons and images imagedel: deleted some icons and images spellcheck: fixed a few typos experiment: added an experimental thingy /:cl: --- .../reagents/chemistry/reagents/drink_cold.dm | 24 +++++++++++++++++++ .../reagents/chemistry/recipes/drinks.dm | 8 +++++++ 2 files changed, 32 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/drink_cold.dm b/code/modules/reagents/chemistry/reagents/drink_cold.dm index fb40e7133ef..f04380ead96 100644 --- a/code/modules/reagents/chemistry/reagents/drink_cold.dm +++ b/code/modules/reagents/chemistry/reagents/drink_cold.dm @@ -177,3 +177,27 @@ /datum/reagent/consumable/drink/cold/rewriter/on_mob_life(mob/living/M) M.Jitter(5) return ..() + +/datum/reagent/consumable/drink/cold/cocacola + name = "Original Cola" + id = "cocacola" + description = "Cola, original cola never changes." + color = "#100800" // rgb: 16, 8, 0 + adj_sleepy = -4 SECONDS + drink_icon = "cocacola_bottle" + drink_name = "Coca Cola" + drink_desc = "Original Cola drink" + harmless = FALSE + taste_description = "Coca Cola" + +/datum/reagent/consumable/drink/cold/cocacola/on_mob_life(mob/living/M) + var/update_flags = STATUS_UPDATE_NONE + M.Druggy(10 SECONDS) + M.AdjustStunned(-1 SECONDS) + M.AdjustWeakened(-1 SECONDS) + if(isturf(M.loc) && !istype(M.loc,/turf/space)) + if(M.canmove && !M.restrained()) + step(M, pick(GLOB.cardinal)) + if(prob(7)) + M.emote(pick("laugh","giggle")) + return ..() | update_flags diff --git a/code/modules/reagents/chemistry/recipes/drinks.dm b/code/modules/reagents/chemistry/recipes/drinks.dm index 4bcc308b685..2b3ad7454d2 100644 --- a/code/modules/reagents/chemistry/recipes/drinks.dm +++ b/code/modules/reagents/chemistry/recipes/drinks.dm @@ -885,3 +885,11 @@ result_amount = 3 mix_message = "The ingredients mix into a dark brown godly substance" mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/cocacola + name = "Coca cola" + id = "cocacola" + result = "cocacola" + required_reagents = list("cocaine" = 2, "cola" = 1) + result_amount = 3 + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'