Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Фумаджин реже; Деньги бармену - чаще! #491

Merged
merged 2 commits into from
Aug 28, 2024
Merged

Fix: Фумаджин реже; Деньги бармену - чаще! #491

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f099928
Fix: Фумаджин реже; Деньги бармену - чаще!
VentelR Aug 27, 2024
4949668
Чёрная кровь стоимостью в 35
VentelR Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion modular_bandastation/objects/code/consumables/drinks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
taste_description = "потеря кокетливости"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
quality = DRINK_NICE
glass_price = DRINK_PRICE_EASY

/datum/glass_style/drinking_glass/innocent_erp
required_drink_type = /datum/reagent/consumable/ethanol/innocent_erp
Expand All @@ -85,6 +86,7 @@
taste_description = "дребезжащие в ритме металлические струны."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
quality = DRINK_GOOD
glass_price = DRINK_PRICE_MEDIUM

/datum/reagent/consumable/ethanol/soundhand/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
. = ..()
Expand Down Expand Up @@ -145,10 +147,11 @@
taste_description = "кровавая тьма"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
quality = DRINK_NICE
glass_price = DRINK_PRICE_EASY

/datum/reagent/consumable/ethanol/black_blood/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
. = ..()
if(SPT_PROB(25, seconds_per_tick))
if(SPT_PROB(5, seconds_per_tick))
drinker.say(pick("Fuu ma'jin!", "Sas'so c'arta forbici!", "Ta'gh fara'qha fel d'amar det!", "Kla'atu barada nikt'o!", "Fel'th Dol Ab'orod!", "In'totum Lig'abis!", "Ethra p'ni dedol!", "Ditans Gut'ura Inpulsa!", "O bidai nabora se'sma!"))

/datum/glass_style/drinking_glass/black_blood
Expand All @@ -175,6 +178,7 @@
taste_description = "грузовой канал"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
quality = DRINK_GOOD
glass_price = DRINK_PRICE_EASY

/datum/glass_style/drinking_glass/pegu_club
required_drink_type = /datum/reagent/consumable/ethanol/pegu_club
Expand Down Expand Up @@ -223,6 +227,7 @@
taste_description = "увядание суперзвезды"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
quality = DRINK_GOOD
glass_price = DRINK_PRICE_EASY

/datum/glass_style/drinking_glass/silverhand
required_drink_type = /datum/reagent/consumable/ethanol/silverhand
Expand All @@ -248,6 +253,7 @@
taste_description = "старые времена"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
quality = DRINK_VERYGOOD
glass_price = DRINK_PRICE_MEDIUM

/datum/glass_style/drinking_glass/oldfashion
required_drink_type = /datum/reagent/consumable/ethanol/oldfashion
Expand All @@ -273,6 +279,7 @@
taste_description = "солено-сладкий"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
quality = DRINK_GOOD
glass_price = DRINK_PRICE_EASY

/datum/glass_style/drinking_glass/brandy_crusta
required_drink_type = /datum/reagent/consumable/ethanol/brandy_crusta
Expand Down Expand Up @@ -351,6 +358,7 @@
taste_description = "истощение"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
quality = DRINK_GOOD
glass_price = DRINK_PRICE_EASY

/datum/reagent/consumable/ethanol/vampiro/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
. = ..()
Expand Down Expand Up @@ -458,6 +466,7 @@
taste_description = "радуга"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
quality = DRINK_FANTASTIC
glass_price = DRINK_PRICE_HIGH

/datum/reagent/consumable/ethanol/rainbow_sky/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
. = ..()
Expand Down
Loading