From e9a781bfdf51986d75def1e1341b6e06ab01519c Mon Sep 17 00:00:00 2001 From: Therandomhoboo <116853115+Therandomhoboo@users.noreply.github.com> Date: Tue, 28 Feb 2023 21:01:49 +0000 Subject: [PATCH 1/4] Syndicate Bomb V2.0 the right way --- .../reagents/chemistry/reagents/alcohol_reagents.dm | 8 +++++--- yogstation.dme | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 94bb4c503b3d..9c00b55b4674 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -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" @@ -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 ..() @@ -2418,7 +2420,7 @@ 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." @@ -2455,7 +2457,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 diff --git a/yogstation.dme b/yogstation.dme index d1bbe477ac93..93c535d603cf 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -1467,6 +1467,7 @@ #include "code\modules\admin\view_variables\topic_basic.dm" #include "code\modules\admin\view_variables\topic_list.dm" #include "code\modules\admin\view_variables\view_variables.dm" +#include "code\modules\antagonists\sentient_creature.dm" #include "code\modules\antagonists\_common\antag_datum.dm" #include "code\modules\antagonists\_common\antag_helpers.dm" #include "code\modules\antagonists\_common\antag_hud.dm" @@ -1739,7 +1740,6 @@ #include "code\modules\antagonists\zombie\abilities\spit.dm" #include "code\modules\antagonists\zombie\abilities\tank.dm" #include "code\modules\antagonists\zombie\abilities\uncuff.dm" -#include "code\modules\antagonists\sentient_creature.dm" #include "code\modules\assembly\assembly.dm" #include "code\modules\assembly\bomb.dm" #include "code\modules\assembly\doorcontrol.dm" From 83b5121b1e6492d44e4d2e97bbf8978f2e29d578 Mon Sep 17 00:00:00 2001 From: TheRandomHobo <116853115+Therandomhoboo@users.noreply.github.com> Date: Tue, 28 Feb 2023 21:55:34 +0000 Subject: [PATCH 2/4] Update alcohol_reagents.dm --- code/modules/reagents/chemistry/reagents/alcohol_reagents.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 9c00b55b4674..6e5228479754 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -2420,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." From 23c01b0556742bec2536983926e8371433464d57 Mon Sep 17 00:00:00 2001 From: TheRandomHobo <116853115+Therandomhoboo@users.noreply.github.com> Date: Thu, 2 Mar 2023 13:12:07 +0000 Subject: [PATCH 3/4] Update yogstation.dme --- yogstation.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yogstation.dme b/yogstation.dme index 93c535d603cf..d1bbe477ac93 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -1467,7 +1467,6 @@ #include "code\modules\admin\view_variables\topic_basic.dm" #include "code\modules\admin\view_variables\topic_list.dm" #include "code\modules\admin\view_variables\view_variables.dm" -#include "code\modules\antagonists\sentient_creature.dm" #include "code\modules\antagonists\_common\antag_datum.dm" #include "code\modules\antagonists\_common\antag_helpers.dm" #include "code\modules\antagonists\_common\antag_hud.dm" @@ -1740,6 +1739,7 @@ #include "code\modules\antagonists\zombie\abilities\spit.dm" #include "code\modules\antagonists\zombie\abilities\tank.dm" #include "code\modules\antagonists\zombie\abilities\uncuff.dm" +#include "code\modules\antagonists\sentient_creature.dm" #include "code\modules\assembly\assembly.dm" #include "code\modules\assembly\bomb.dm" #include "code\modules\assembly\doorcontrol.dm" From 979c95e27998c638ebd3619c85c0c7b1ca73e1c2 Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Sun, 5 Mar 2023 13:24:53 +0500 Subject: [PATCH 4/4] Update alcohol_reagents.dm --- code/modules/reagents/chemistry/reagents/alcohol_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 6e5228479754..b79376e81499 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -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."