From 8fbb137b07b0bf4d46416d1801c3b0fbdbfafe1b Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Fri, 1 May 2020 15:05:26 -0400 Subject: [PATCH] Update durand.dm --- .../mob/living/simple_mob/subtypes/mechanical/mecha/durand.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/durand.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/durand.dm index a8aff85526e..df0984878ed 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/durand.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/durand.dm @@ -67,9 +67,6 @@ // Variant that starts in defense mode, perhaps for PoIs. /mob/living/simple_mob/mechanical/mecha/combat/durand/defensive/Initialize() set_defense_mode(TRUE) -<<<<<<< HEAD - return ..() -======= return ..() /mob/living/simple_mob/mechanical/mecha/combat/durand/defensive/mercenary @@ -79,4 +76,3 @@ projectiletype = /obj/item/projectile/beam/heavylaser/fakeemitter pilot_type = /mob/living/simple_mob/humanoid/merc/ranged ->>>>>>> aafd4b4... Explorer Expansion: New Horizons (#6960)