From c8ca8efa62f4a0a34dc4d4292a0cdf7bc417477b Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 27 Mar 2019 02:37:20 -0400 Subject: [PATCH] Conflict Resolution --- code/modules/mob/_modifiers/modifiers_misc.dm | 2 -- vorestation.dme | 3 --- 2 files changed, 5 deletions(-) diff --git a/code/modules/mob/_modifiers/modifiers_misc.dm b/code/modules/mob/_modifiers/modifiers_misc.dm index 17e68b8647..b94024c7e3 100644 --- a/code/modules/mob/_modifiers/modifiers_misc.dm +++ b/code/modules/mob/_modifiers/modifiers_misc.dm @@ -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. diff --git a/vorestation.dme b/vorestation.dme index be0b5c773e..1d6e90c640 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2588,11 +2588,8 @@ #include "code\modules\projectiles\guns\modular_guns.dm" #include "code\modules\projectiles\guns\projectile.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\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\netgun_vr.dm" #include "code\modules\projectiles\guns\energy\nuclear.dm"