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

Conflict Resolution

Browse Source
This commit is contained in:
Unknown
2019-03-27 02:37:20 -04:00
parent c8006a6e84
commit c8ca8efa62
2 changed files with 0 additions and 5 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 = -75 // Aiming requires focus.
accuracy_dispersion = 3 // Ditto. accuracy_dispersion = 3 // Ditto.
evasion = -45 // Too angry to dodge. evasion = -45 // Too angry to dodge.
<<<<<<< HEAD
=======
// Non-cult version of deep wounds. // Non-cult version of deep wounds.
// Surprisingly, more dangerous. // Surprisingly, more dangerous.

3
vorestation.dme
View File

@@ -2588,11 +2588,8 @@
#include "code\modules\projectiles\guns\modular_guns.dm" #include "code\modules\projectiles\guns\modular_guns.dm"
#include "code\modules\projectiles\guns\projectile.dm" #include "code\modules\projectiles\guns\projectile.dm"
#include "code\modules\projectiles\guns\vox.dm" #include "code\modules\projectiles\guns\vox.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\projectiles\guns\energy\kinetic_accelerator_vr.dm" #include "code\modules\projectiles\guns\energy\kinetic_accelerator_vr.dm"
=======
#include "code\modules\projectiles\guns\energy\hooklauncher.dm" #include "code\modules\projectiles\guns\energy\hooklauncher.dm"
>>>>>>> a428fad... Event / Future PoI / Other weaponry & tools. (#5764):polaris.dme
#include "code\modules\projectiles\guns\energy\laser.dm" #include "code\modules\projectiles\guns\energy\laser.dm"
#include "code\modules\projectiles\guns\energy\netgun_vr.dm" #include "code\modules\projectiles\guns\energy\netgun_vr.dm"
#include "code\modules\projectiles\guns\energy\nuclear.dm" #include "code\modules\projectiles\guns\energy\nuclear.dm"