Skip to content

Commit

Permalink
the last one, I can not overcome the wall...
Browse files Browse the repository at this point in the history
  • Loading branch information
Syndicat-Meow committed Dec 26, 2024
1 parent f2f52da commit c0fcaec
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
4 changes: 2 additions & 2 deletions _maps/map_files/KiloStation/KiloStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -7878,7 +7878,7 @@
/obj/machinery/airalarm/directional/west,
/obj/structure/bed/dogbed/runtime,
/obj/item/toy/cattoy,
/mob/living/simple_animal/pet/cat/runtime,
/mob/living/basic/pet/cat/runtime,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
},
Expand Down Expand Up @@ -48361,7 +48361,7 @@
"pjN" = (
/obj/effect/turf_decal/trimline/hot_pink/filled/line,
/obj/structure/cable,
/mob/living/simple_animal/pet/cat{
/mob/living/basic/pet/cat{
name = "Pawtton";
desc = "Given as a sign of friendship by The Fleet, with love"
},
Expand Down
7 changes: 7 additions & 0 deletions code/modules/mob/living/basic/pets/cat/cat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@
minimum_survivable_temperature = TCMB
maximum_survivable_temperature = T0C + 40
held_state = "spacecat"
faction = list(FACTION_CAT)

/mob/living/basic/pet/cat/breadcat
name = "bread cat"
Expand All @@ -172,6 +173,7 @@
icon_dead = "breadcat_dead"
ai_controller = /datum/ai_controller/basic_controller/cat/bread
held_state = "breadcat"
faction = list(FACTION_CAT)
can_interact_with_stove = TRUE
butcher_results = list(
/obj/item/food/meat/slab = 2,
Expand All @@ -193,6 +195,7 @@
icon_dead = "original_dead"
unique_pet = TRUE
held_state = "original"
faction = list(FACTION_CAT)

/mob/living/basic/pet/cat/original/add_cell_sample()
return
Expand All @@ -210,6 +213,7 @@
ai_controller = /datum/ai_controller/basic_controller/cat/kitten
can_hold_item = FALSE
collar_icon_state = "kitten"
faction = list(FACTION_CAT)

/mob/living/basic/pet/cat/kitten/Initialize(mapload)
. = ..()
Expand All @@ -220,14 +224,17 @@
gender = MALE
gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
faction = list(FACTION_CAT)

/mob/living/basic/pet/cat/jerry //Holy shit we left jerry on donut ~ Arcane ~Fikou
name = "Jerry"
desc = "Tom is VERY amused."
gender = MALE
faction = list(FACTION_CAT)

/mob/living/basic/pet/cat/tabby
icon_state = "cat"
icon_living = "cat"
icon_dead = "cat_dead"
held_state = "cat"
faction = list(FACTION_CAT)

0 comments on commit c0fcaec

Please sign in to comment.