Update bear.dm

2017-11-26 21:24:27 -05:00
parent c67063beb5
commit e5e17cf334
1 changed files with 1 additions and 5 deletions
@@ -36,13 +36,9 @@
 	maxbodytemp = 1500

 	faction = list("russian")
-<<<<<<< HEAD
-	gold_core_spawnable = 1
+	gold_core_spawnable = HOSTILE_SPAWN
 	devourable = TRUE
 	no_vore = FALSE
-=======
-	gold_core_spawnable = HOSTILE_SPAWN
->>>>>>> 2abae67... Cleans up goldcore defines (#33090)

 //SPACE BEARS! SQUEEEEEEEE~     OW! FUCK! IT BIT MY HAND OFF!!
 /mob/living/simple_animal/hostile/bear/Hudson