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

Conflict Resolution

Browse Source
This commit is contained in:
Unknown
2019-03-27 12:19:15 -04:00
parent 91a5203e32
commit 54b1d524ea
4 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,8 +180,6 @@ the artifact triggers the rage.
accuracy = -75 // Aiming requires focus.
accuracy_dispersion = 3 // Ditto.
evasion = -45 // Too angry to dodge.
<<<<<<< HEAD
=======
// Non-cult version of deep wounds.
// Surprisingly, more dangerous.