Skip to content

Potion-changes #5375

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

Open
Teoti4001 wants to merge 3 commits into
base: main
Choose a base branch
from
+14 −8
Open

Potion-changes #5375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
959c392
Essence guantlet divine order fixes
Teoti4001 Feb 11, 2026
970393b
Herbal teas buff
Teoti4001 Feb 23, 2026
0935e63
Minor coding fix, Space bar my beloved
Teoti4001 Feb 23, 2026
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
2 changes: 2 additions & 0 deletions code/modules/crafting/alchemy/essence_machines/essence_gauntlet/essence_gauntlet.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,8 @@
return /datum/thaumaturgical_essence/light
if(/datum/attunement/life)
return /datum/thaumaturgical_essence/life
if(/datum/attunement/polymorph)
return /datum/thaumaturgical_essence/chaos
return null

/obj/item/clothing/gloves/essence_gauntlet/proc/get_available_essence_types()
Expand Down
16 changes: 8 additions & 8 deletions code/modules/crafting/alchemy/herbal_recipes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
if(volume > 0.99)
M.add_nausea(1)
if(!HAS_TRAIT(M,TRAIT_NOSTAMINA))
M.adjust_stamina(-0.5) // Very mild stamina drain
M.adjust_stamina(0.5) // Very mild stamina drain
if(M.has_status_effect(/datum/status_effect/buff/alch/perceptionpot/weak))
return ..()
if(volume > 2)
Expand Down Expand Up @@ -294,8 +294,8 @@
taste_description = "bitter numbness"

/datum/reagent/medicine/herbal/paris_poultice/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-1)
M.adjustFireLoss(-0.5)
M.adjustBruteLoss(-1*REM)
M.adjustFireLoss(-0.5*REM)

for(var/obj/item/bodypart/BP in M.bodyparts)
if(BP.status == BODYPART_ROBOTIC)
Expand Down Expand Up @@ -327,11 +327,11 @@
M.add_stress(/datum/stress_event/herbal_wellness)

/datum/reagent/medicine/herbal/herbalist_panacea/on_mob_life(mob/living/carbon/M)
M.adjustBruteLoss(-1.5)
M.adjustFireLoss(-1.5)
M.adjustToxLoss(-1)
M.adjustBruteLoss(-1.5*REM)
M.adjustFireLoss(-1.5*REM)
M.adjustToxLoss(-1*REM)
M.adjustOxyLoss(-1)
M.adjust_stamina(2)
M.adjust_stamina(2*REM)
if(prob(15))
M.heal_bodypart_damage(1, 1, 0)
. = ..()
Expand Down Expand Up @@ -494,7 +494,7 @@
M.add_stress(/datum/stress_event/battle_stim)

/datum/reagent/buff/herbal/battle_stim/on_mob_life(mob/living/carbon/M)
M.adjust_stamina(2)
M.adjust_stamina(-2)
// Slight combat bonuses
if(prob(10))
M.heal_bodypart_damage(0.5, 0, 0)
Expand Down
4 changes: 4 additions & 0 deletions code/modules/crafting/alchemy/reagents.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,10 @@ If you want to expand on poisons theres tons of fun effects TG chemistry has tha
M.adjustToxLoss(3)
else
M.adjustToxLoss(6)
if(HAS_TRAIT(M, TRAIT_POISON_RESILIENCE))
M.adjustOxyLoss(1)
else
M.adjustOxyLoss(2)
return ..()

/datum/reagent/killersice
Expand Down
Loading