From 12cb0a98a4d17627633b8ceedf8a290b7e48e845 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 26 Nov 2017 21:25:51 -0500 Subject: [PATCH] Update headcrab.dm --- code/modules/mob/living/simple_animal/hostile/headcrab.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index 5b4324623f..4e302b3d55 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -22,11 +22,7 @@ ventcrawler = VENTCRAWLER_ALWAYS var/datum/mind/origin var/egg_lain = 0 -<<<<<<< HEAD -// gold_core_spawnable = 1 //are you sure about this?? -======= - gold_core_spawnable = HOSTILE_SPAWN //are you sure about this?? ->>>>>>> 2abae67... Cleans up goldcore defines (#33090) +// gold_core_spawnable = HOSTILE_SPAWN //are you sure about this?? /mob/living/simple_animal/hostile/headcrab/proc/Infect(mob/living/carbon/victim) var/obj/item/organ/body_egg/changeling_egg/egg = new(victim)