cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3903 from Citadel-Station-13/upstream-merge-32597

Browse Source 
[MIRROR] Fixes stimulum decay
This commit is contained in:
LetterJay
2017-11-13 11:45:00 -06:00
committed by GitHub
parent 228aed8b35 a4d95d8bf7
commit f610a6110b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/reagents/chemistry/reagents/other_reagents.dm
View File

@@ -1174,6 +1174,8 @@
M.AdjustKnockdown(-20, 0)
M.AdjustUnconscious(-20, 0)
M.adjustStaminaLoss(-0.5*REM, 0)
..()
. = TRUE //Update status effects.
/datum/reagent/nitryl
name = "Nitryl"
@@ -1184,8 +1186,9 @@
color = "90560B"
taste_description = "burning"
/datum/reagent/browngas/on_mob_life(mob/living/M) //Has just a speedup
/datum/reagent/nitryl/on_mob_life(mob/living/M) //Has just a speedup
M.status_flags |= GOTTAGOFAST
..()
/////////////////////////Coloured Crayon Powder////////////////////////////
//For colouring in /proc/mix_color_from_reagents