Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Syndicate Bomb (THE DRINK OBVIOUSLY) V2.0 the right way #18143

Merged
Bibby0110 merged 4 commits into from
Mar 5, 2023
Merged

Syndicate Bomb (THE DRINK OBVIOUSLY) V2.0 the right way #18143

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9a781b
Syndicate Bomb V2.0 the right way
Therandomhoboo Feb 28, 2023
83b5121
Update alcohol_reagents.dm
Therandomhoboo Feb 28, 2023
23c01b0
Update yogstation.dme
Therandomhoboo Mar 2, 2023
979c95e
Update alcohol_reagents.dm
Bibby0110 Mar 5, 2023
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
9 changes: 5 additions & 4 deletions code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
S.success_multiplier = max(0.1*power_multiplier, S.success_multiplier)
// +10% success propability on each step, useful while operating in less-than-perfect conditions
return ..()

/datum/reagent/consumable/ethanol/beer
name = "Beer"
description = "An alcoholic beverage brewed since ancient times on Old Earth. Still popular today."
Expand Down Expand Up @@ -117,7 +117,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
/datum/reagent/consumable/ethanol/beer/stout/espressomartini
name = "Espresso Martini"
description = "A wake-me-the-fuck-up cocktail mix, guaranteed strong."
color = "#652a05"
color = "#652a05"
taste_description = "bitterness, chocolate, and cream."
glass_icon_state = "espresso_martini"
glass_name = "glass of espresso martini"
Expand Down Expand Up @@ -1108,6 +1108,8 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "A syndicate bomb."

/datum/reagent/consumable/ethanol/syndicatebomb/on_mob_life(mob/living/carbon/M)
if(is_syndicate(M))
M.heal_overall_damage(0.5, 0.5)
if(prob(5))
playsound(get_turf(M), 'sound/effects/explosionfar.ogg', 100, 1)
return ..()
Expand Down Expand Up @@ -2418,7 +2420,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "glass of kortara"
glass_desc = "The fermented nectar of the Korta nut, as enjoyed by lizards galaxywide."


/datum/reagent/consumable/ethanol/sea_breeze
name = "Sea Breeze"
description = "Light and refreshing with a hint of mint and cocoa. Sweet, like a smoothie."
Expand Down Expand Up @@ -2455,7 +2456,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "drunken_espatier"
glass_name = "M'thalu"
glass_desc = "A drink that numbs the body, making it difficult to be aware of injury."

/datum/reagent/consumable/ethanol/drunken_espatier/on_mob_life(mob/living/carbon/C, delta_time, times_fired)
C.hal_screwyhud = SCREWYHUD_HEALTHY //almost makes you forget how much it hurts
SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "numb", name) //comfortably numb
Expand Down