cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 12:05:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update durand.dm

Browse Source
This commit is contained in:
Aronai Sieyes
2020-05-01 15:05:26 -04:00
committed by GitHub
parent 275551072a
commit 8fbb137b07
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/durand.dm
-4
View File
@@ -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)