shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update fox.dm

Browse Source
This commit is contained in:
deathride58
2017-11-26 21:23:26 -05:00
committed by GitHub
parent eb13f4ee2f
commit e70daa585c
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/friendly/fox.dm
+1 -5
View File
@@ -17,8 +17,7 @@
response_help = "pets" response_help = "pets"
response_disarm = "gently pushes aside" response_disarm = "gently pushes aside"
response_harm = "kicks" response_harm = "kicks"
<<<<<<< HEAD gold_core_spawnable = FRIENDLY_SPAWN
gold_core_spawnable = 2
devourable = TRUE devourable = TRUE
var/mob/living/simple_animal/mouse/movement_target var/mob/living/simple_animal/mouse/movement_target
var/turns_since_scan = 0 var/turns_since_scan = 0
@@ -60,9 +59,6 @@
if(movement_target) if(movement_target)
stop_automated_movement = 1 stop_automated_movement = 1
walk_to(src,movement_target,0,3) walk_to(src,movement_target,0,3)
=======
gold_core_spawnable = FRIENDLY_SPAWN
>>>>>>> 2abae67... Cleans up goldcore defines (#33090)
//Captain fox //Captain fox
/mob/living/simple_animal/pet/fox/Renault /mob/living/simple_animal/pet/fox/Renault