cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-04 14:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5490 from Anewbe/drug_effects_redux

Browse Source 
The speed-related chem effects are no longer a one-or-none affair, oxy causes slowdown
This commit is contained in:
Atermonera
2018-08-15 21:04:50 -07:00
committed by GitHub
parent 2eafa13c96 02084177fb
commit a2e5894655
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/living/carbon/human/human_movement.dm
View File

@@ -110,14 +110,14 @@
if(CE_SLOWDOWN in chem_effects)
if (tally >= 0 )
tally = (tally + tally/4) //Add a quarter of penalties on top.
tally += 1
tally += chem_effects[CE_SLOWDOWN]
if(CE_SPEEDBOOST in chem_effects)
if (tally >= 0) // cut any penalties in half
tally = tally/2
tally -= 1 // give 'em a buff on top.
tally -= chem_effects[CE_SPEEDBOOST] // give 'em a buff on top.
return (tally+config.human_delay)
return max(-3, tally+config.human_delay) // Minimum return should be the same as force_max_speed
/mob/living/carbon/human/Process_Spacemove(var/check_drift = 0)
//Can we act?

3
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
View File

@@ -315,10 +315,9 @@
if(alien == IS_SLIME)
chem_effective = 0.75
M.stuttering = min(50, max(0, M.stuttering + 5)) //If you can't feel yourself, and your main mode of speech is resonation, there's a problem.
M.add_chemical_effect(CE_SLOWDOWN, 1)
M.add_chemical_effect(CE_PAINKILLER, 200 * chem_effective)
M.add_chemical_effect(CE_SLOWDOWN, 1)
M.eye_blurry = min(M.eye_blurry + 10, 250 * chem_effective)
M.Confuse(5)
/datum/reagent/oxycodone/overdose(var/mob/living/carbon/M, var/alien)
..()