cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-14 09:28:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33 from Azarak/master

Browse Source 
Fixes for Stimulum and Nitryl
This commit is contained in:
quotefox
2019-10-14 16:49:49 +01:00
committed by GitHub
parent bd718654c3 0c4a3753bd
commit 713fdeeade
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/other_reagents.dm
+7
View File
@@ -1328,10 +1328,12 @@
..()
ADD_TRAIT(L, TRAIT_STUNIMMUNE, id)
ADD_TRAIT(L, TRAIT_SLEEPIMMUNE, id)
ADD_TRAIT(L, TRAIT_NOSLIPALL, id)
/datum/reagent/stimulum/on_mob_end_metabolize(mob/living/L)
REMOVE_TRAIT(L, TRAIT_STUNIMMUNE, id)
REMOVE_TRAIT(L, TRAIT_SLEEPIMMUNE, id)
REMOVE_TRAIT(L, TRAIT_NOSLIPALL, id)
..()
/datum/reagent/stimulum/on_mob_life(mob/living/carbon/M)
@@ -1358,6 +1360,11 @@
REMOVE_TRAIT(L, TRAIT_GOTTAGOFAST, id)
..()
/datum/reagent/nitryl/on_mob_life(mob/living/carbon/M)
current_cycle++
holder.remove_reagent(id, 0.99) //Gives time for the next tick of life().
. = TRUE //Update status effects.
/////////////////////////Coloured Crayon Powder////////////////////////////
//For colouring in /proc/mix_color_from_reagents