cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update modifiers_misc.dm

Browse Source
This commit is contained in:
Novacat
2019-04-18 13:11:11 -04:00
committed by GitHub
parent 30726b47d6
commit cf0896f904
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mob/_modifiers/modifiers_misc.dm
View File

@@ -268,8 +268,6 @@ the artifact triggers the rage.
if(L.get_poison_protection() >= 1) if(L.get_poison_protection() >= 1)
return FALSE return FALSE
return TRUE return TRUE
<<<<<<< HEAD
=======
// Pulse modifier. // Pulse modifier.
/datum/modifier/false_pulse /datum/modifier/false_pulse
@@ -281,4 +279,3 @@ the artifact triggers the rage.
stacks = MODIFIER_STACK_EXTEND stacks = MODIFIER_STACK_EXTEND
pulse_set_level = PULSE_NORM pulse_set_level = PULSE_NORM
>>>>>>> 3661d6f... Merge pull request #6081 from Mechoid/PulseBasedReagentProcessing