cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorganizes custom item cat code

Browse Source
This commit is contained in:
mwerezak
2015-01-25 15:08:17 -05:00
parent b842bc50d6
commit 147ca72f7c
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/modules/customitems/item_defines.dm
View File

@@ -1413,12 +1413,6 @@
////////////////////////////// Foxler - Erstatz Vryroxes ///////////////////////////////////////////////// ////////////////////////////// Foxler - Erstatz Vryroxes /////////////////////////////////////////////////
/obj/item/weapon/holder/cat/fluff/bones
name = "Bones"
desc = "It's Bones! Meow."
gender = MALE
icon_state = "cat3"
//Use this subtype for spawning in the custom item. //Use this subtype for spawning in the custom item.
/obj/item/weapon/holder/cat/fluff/bones/custom_item /obj/item/weapon/holder/cat/fluff/bones/custom_item
@@ -1427,6 +1421,12 @@
new/mob/living/simple_animal/cat/fluff/bones (src) new/mob/living/simple_animal/cat/fluff/bones (src)
..() ..()
/obj/item/weapon/holder/cat/fluff/bones
name = "Bones"
desc = "It's Bones! Meow."
gender = MALE
icon_state = "cat3"
/mob/living/simple_animal/cat/fluff/bones /mob/living/simple_animal/cat/fluff/bones
name = "Bones" name = "Bones"
desc = "That's Bones the cat. He's a laid back, black cat. Meow." desc = "That's Bones the cat. He's a laid back, black cat. Meow."
@@ -1435,4 +1435,12 @@
icon_living = "cat3" icon_living = "cat3"
icon_dead = "cat3_dead" icon_dead = "cat3_dead"
holder_type = /obj/item/weapon/holder/cat/fluff/bones holder_type = /obj/item/weapon/holder/cat/fluff/bones
bff_name = "Erstatz Vryroxes" var/bff_name = "Erstatz Vryroxes"
/mob/living/simple_animal/cat/fluff/bones/handle_movement_target()
if (!bff)
for (var/mob/living/carbon/human/M in player_list)
if (M.real_name == bff_name)
bff = M
break
..()

8
code/modules/mob/living/simple_animal/friendly/cat.dm
View File

@@ -83,16 +83,9 @@
//Basic friend AI //Basic friend AI
/mob/living/simple_animal/cat/fluff /mob/living/simple_animal/cat/fluff
var/bff_name
var/mob/living/carbon/human/bff var/mob/living/carbon/human/bff
/mob/living/simple_animal/cat/fluff/handle_movement_target() /mob/living/simple_animal/cat/fluff/handle_movement_target()
if (!bff)
for (var/mob/living/carbon/human/M in player_list)
if (M.real_name == bff_name)
bff = M
break
if (bff) if (bff)
var/follow_dist = 5 var/follow_dist = 5
if (bff.stat >= DEAD || bff.health <= config.health_threshold_softcrit) //danger if (bff.stat >= DEAD || bff.health <= config.health_threshold_softcrit) //danger
@@ -167,7 +160,6 @@
return return
bff = usr bff = usr
bff_name = usr.real_name
set_dir(get_dir(src, bff)) set_dir(get_dir(src, bff))
say("Meow!") say("Meow!")