From 4e2db63a33f3387311c04bc107aaf9a9602c7743 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 26 Nov 2017 21:21:28 -0500 Subject: [PATCH] Update cat.dm --- code/modules/mob/living/simple_animal/friendly/cat.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index f9ddd94f0a..a333f22c38 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -28,13 +28,9 @@ response_harm = "kicks" var/turns_since_scan = 0 var/mob/living/simple_animal/mouse/movement_target -<<<<<<< HEAD - gold_core_spawnable = 2 + gold_core_spawnable = FRIENDLY_SPAWN devourable = TRUE no_vore = FALSE -======= - gold_core_spawnable = FRIENDLY_SPAWN ->>>>>>> 2abae67... Cleans up goldcore defines (#33090) /mob/living/simple_animal/pet/cat/Initialize() . = ..() @@ -286,4 +282,4 @@ ..() if(L.a_intent == INTENT_HARM && L.reagents && !stat) L.reagents.add_reagent("nutriment", 0.4) - L.reagents.add_reagent("vitamin", 0.4) \ No newline at end of file + L.reagents.add_reagent("vitamin", 0.4)