Skip to content

Commit

Permalink
add: Original cola
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull request process. -->

## What Does This PR Do
Добавляет напиток Original cola, и рецепт 2 коки 1 кола, напиток создает наркоэкран на 10 сек и дает -1 сек к слабости и -1 сек к стану
<!-- Include a small to medium description of what your PR changes. Document every changes or this may delay review or even discourage maintainers from merging your PR! -->

## Why It's Good For The Game
Ссылка на апвоут
https://discord.com/channels/617003227182792704/755125334097133628/1182696718941290496
<!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->

## 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:

<!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
  • Loading branch information
RuinaRuiner committed Dec 10, 2023
1 parent 8954d31 commit a249dc6
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 0 deletions.
24 changes: 24 additions & 0 deletions code/modules/reagents/chemistry/reagents/drink_cold.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 8 additions & 0 deletions code/modules/reagents/chemistry/recipes/drinks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'

0 comments on commit a249dc6

Please sign in to comment.