From 8a0f9e94249eb16469bd3b78face74b7b9aa4552 Mon Sep 17 00:00:00 2001 From: Mitchell Date: Sun, 11 Nov 2018 16:10:11 -0600 Subject: [PATCH] Fixes conflicts --- code/modules/mob/dead/observer/observer.dm | 2 +- code/modules/mob/living/carbon/alien/larva/larva.dm | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 99454dc5261..cb2bc013154 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -13,7 +13,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi density = 0 canmove = 0 alpha = 127 - anchored = 1 // don't get pushed around + move_resist = INFINITY // don't get pushed around invisibility = INVISIBILITY_OBSERVER var/can_reenter_corpse var/bootime = 0 diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index e6c9da4e1aa..e0748bd0734 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -38,12 +38,9 @@ amount_grown = min(amount_grown + 1, max_grown) ..(amount) -<<<<<<< HEAD -======= -/mob/living/carbon/alien/larva/start_pulling(atom/movable/AM, state, force = move_force, supress_message = FALSE) +/mob/living/carbon/alien/larva/start_pulling(atom/movable/AM, force = move_force, supress_message = FALSE) return ->>>>>>> Lots of edits, needs review /mob/living/carbon/alien/larva/ex_act(severity) ..()