Update crab.dm

2017-11-26 21:21:55 -05:00
parent 4e2db63a33
commit 933b4a7a3a
1 changed files with 1 additions and 5 deletions
@@ -19,12 +19,8 @@
 	ventcrawler = VENTCRAWLER_ALWAYS
 	var/obj/item/inventory_head
 	var/obj/item/inventory_mask
-<<<<<<< HEAD
-	gold_core_spawnable = 2
-	devourable = TRUE
-=======
 	gold_core_spawnable = FRIENDLY_SPAWN
->>>>>>> 2abae67... Cleans up goldcore defines (#33090)
+	devourable = TRUE

 /mob/living/simple_animal/crab/Life()
 	..()