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.

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

Boiler neuro purges stim, buffs neuro tailstab duration, reduce dizziness #8169

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion code/datums/effects/neurotoxin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
var/chat_cd = 0
/// Stamina damage per tick. Major balance number.
var/stam_dam = 7
/// Stimulant drain per tick.
var/stim_drain = 2

/datum/effects/neurotoxin/New(atom/thing, mob/from = null)
..(thing, from, effect_name)
Expand All @@ -44,7 +46,9 @@
// General effects
affected_mob.last_damage_data = cause_data
affected_mob.apply_stamina_damage(stam_dam)
affected_mob.make_dizzy(12)
affected_mob.make_dizzy(8)
for(var/datum/reagent/generated/stim in affected_mob.reagents.reagent_list)
affected_mob.reagents.remove_reagent(stim.id, stim_drain, TRUE)

// Effect levels (shit that doesn't stack)
switch(duration)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
var/datum/effects/neurotoxin/neuro_effect = locate() in carbon_target.effects_list
if(!neuro_effect)
neuro_effect = new(carbon_target, owner)
neuro_effect.duration += 16
neuro_effect.duration += 20
to_chat(carbon_target,SPAN_HIGHDANGER("You are injected with something from [stabbing_xeno]'s tailstab!"))
else
CRASH("Globber has unknown ammo [stabbing_xeno.ammo]! Oh no!")
Expand Down
Loading