Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Animal fixes #465

Merged
merged 1 commit into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion modular_ss220/mobs/code/mob_holder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
icon_state = "nymph"
origin_tech = "biotech=5"
slot_flags = SLOT_FLAG_HEAD|SLOT_FLAG_EARS
icon = 'icons/mob/animal.dmi'

/obj/item/holder/pai
name = "pAI"
Expand Down Expand Up @@ -243,12 +244,13 @@
/obj/item/holder/snake
name = "pet"
desc = "It's a pet"
icon = 'icons/mob/animal.dmi'
icon_state = "snake"

/obj/item/holder/parrot
name = "pet"
desc = "It's a pet"
icon = 'modular_ss220/mobs/icons/mob/animal.dmi'
icon = 'icons/mob/animal.dmi'
icon_state = "parrot_fly"

/obj/item/holder/axolotl
Expand Down
8 changes: 4 additions & 4 deletions modular_ss220/mobs/code/simple_animal/friendly/rat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
/mob/living/simple_animal/mouse/rat/color_pick()
if(!mouse_color)
mouse_color = pick(list("gray","white","irish"))
icon_state = "rat_[mouse_color]"
icon_living = "rat_[mouse_color]"
icon_dead = "rat_[mouse_color]_dead"
icon_resting = "rat_[mouse_color]_sleep"
icon_state = "rat_[mouse_color]"
icon_living = "rat_[mouse_color]"
icon_dead = "rat_[mouse_color]_dead"
icon_resting = "rat_[mouse_color]_sleep"

/mob/living/simple_animal/mouse/rat/pull_constraint(atom/movable/AM, show_message = FALSE)
return TRUE
Expand Down
1 change: 1 addition & 0 deletions modular_ss220/mobs/code/simple_animal/named_animals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
name = "Рататуй"
real_name = "Рататуй"
desc = "Личная крыса шеф повара, помогающая ему при готовке наиболее изысканных блюд. До момента пока он не пропадет и повар не начнет готовить что-то новенькое..."
mouse_color = "gray"
unique_pet = TRUE
gold_core_spawnable = NO_SPAWN
maxHealth = 20
Expand Down
Binary file modified modular_ss220/mobs/icons/mob/pets.dmi
Binary file not shown.
Binary file removed modular_ss220/mobs/tests/animal.dmi
Binary file not shown.
Binary file removed modular_ss220/mobs/tests/animal_test.dmi
Binary file not shown.
Binary file removed modular_ss220/mobs/tests/pets.dmi
Binary file not shown.
Binary file removed modular_ss220/mobs/tests/pets_test.dmi
Binary file not shown.
Loading