diff --git a/code/modules/mob/living/simple_animal/friendly/adhomai.dm b/code/modules/mob/living/simple_animal/friendly/adhomai.dm index 3e398dcafa2..d2dfd61a886 100644 --- a/code/modules/mob/living/simple_animal/friendly/adhomai.dm +++ b/code/modules/mob/living/simple_animal/friendly/adhomai.dm @@ -1,6 +1,7 @@ /mob/living/simple_animal/ice_tunneler name = "ice tunneler" desc = "An egg producing beast from Adhomai. It is known for burrowing in ice and snow." + icon = 'icons/mob/npc/livestock.dmi' icon_state = "tunneler" icon_living = "tunneler" icon_dead = "tunneler_dead" @@ -44,6 +45,7 @@ /mob/living/simple_animal/fatshouter name = "fatshouter" desc = "An adhomian animal known for its production of milk and wool." + icon = 'icons/mob/npc/livestock.dmi' icon_state = "fatshouter" icon_living = "fatshouter" icon_dead = "fatshouter_dead" @@ -75,6 +77,7 @@ /mob/living/simple_animal/hostile/retaliate/rafama name = "steed of Mata'ke" desc = "An animal native to Adhomai, known for its agressive behavior and mighty tusks." + icon = 'icons/mob/npc/livestock.dmi' icon_state = "rafama" icon_living = "rafama" icon_dead = "rafama_dead" diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 65d825a9ad6..40dff9ecb24 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -2,6 +2,7 @@ /mob/living/simple_animal/cat name = "cat" desc = "A domesticated, feline pet. Has a tendency to adopt crewmembers." + icon = 'icons/mob/npc/pets.dmi' icon_state = "cat2" item_state = "cat2" icon_living = "cat2" diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index 82bc938afbf..b5210d0b12f 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -3,6 +3,7 @@ name = "corgi" real_name = "corgi" desc = "It's a corgi." + icon = 'icons/mob/npc/pets.dmi' icon_state = "corgi" icon_living = "corgi" icon_dead = "corgi_dead" diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 9e0d1473d22..4550874438f 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -2,6 +2,7 @@ /mob/living/simple_animal/hostile/retaliate/goat name = "goat" desc = "Not known for their pleasant disposition." + icon = 'icons/mob/npc/livestock.dmi' icon_state = "goat" icon_living = "goat" icon_dead = "goat_dead" @@ -75,6 +76,7 @@ /mob/living/simple_animal/cow name = "cow" desc = "Known for their milk, just don't tip them over." + icon = 'icons/mob/npc/livestock.dmi' icon_state = "cow" icon_living = "cow" icon_dead = "cow_dead" @@ -119,6 +121,7 @@ /mob/living/simple_animal/chick name = "\improper chick" desc = "Adorable! They make such a racket though." + icon = 'icons/mob/npc/livestock.dmi' icon_state = "chick" icon_living = "chick" icon_dead = "chick_dead" @@ -168,6 +171,7 @@ /mob/living/simple_animal/chicken name = "\improper chicken" desc = "Hopefully the eggs are good this season." + icon = 'icons/mob/npc/livestock.dmi' icon_state = "chicken" icon_living = "chicken" icon_dead = "chicken_dead" diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm index 40c41b557a2..25908171900 100644 --- a/code/modules/mob/living/simple_animal/friendly/fox.dm +++ b/code/modules/mob/living/simple_animal/friendly/fox.dm @@ -3,6 +3,7 @@ name = "fox" real_name = "fox" desc = "It's a fox. I wonder what it says?" + icon = 'icons/mob/npc/pets.dmi' icon_state = "fox" icon_living = "fox" icon_dead = "fox_dead" diff --git a/code/modules/mob/living/simple_animal/friendly/hakhma.dm b/code/modules/mob/living/simple_animal/friendly/hakhma.dm index e423953d338..c23d83ace6d 100644 --- a/code/modules/mob/living/simple_animal/friendly/hakhma.dm +++ b/code/modules/mob/living/simple_animal/friendly/hakhma.dm @@ -1,6 +1,7 @@ /mob/living/simple_animal/hakhma name = "hakhma" desc = "An oversized insect breed by Scarab colony ships, known for their milk." + icon = 'icons/mob/npc/livestock.dmi' icon_state = "hakhma" icon_living = "hakhma" icon_dead = "hakhma_dead" diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm index 1f7057255c0..8ac995c14c9 100644 --- a/code/modules/mob/living/simple_animal/friendly/lizard.dm +++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm @@ -1,7 +1,6 @@ /mob/living/simple_animal/lizard name = "Lizard" desc = "It's a hissy little lizard. Is it related to Unathi?" - icon = 'icons/mob/npc/critter.dmi' icon_state = "lizard" icon_living = "lizard" icon_dead = "lizard-dead" diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm b/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm index ad455195eae..970efde33a3 100644 --- a/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm +++ b/code/modules/mob/living/simple_animal/hostile/commanded/guard_dog.dm @@ -3,7 +3,7 @@ short_name = "dog" desc = "A dog trained to listen and obey its owner commands, this one is a german shepherd." - icon = 'icons/mob/npc/dog.dmi' + icon = 'icons/mob/npc/pets.dmi' icon_state = "german" icon_living = "german" icon_dead = "german_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/creature.dm b/code/modules/mob/living/simple_animal/hostile/creature.dm index 08dda706f67..55cfbc2effd 100644 --- a/code/modules/mob/living/simple_animal/hostile/creature.dm +++ b/code/modules/mob/living/simple_animal/hostile/creature.dm @@ -1,7 +1,6 @@ /mob/living/simple_animal/hostile/creature name = "creature" desc = "A sanity-destroying otherthing." - icon = 'icons/mob/npc/critter.dmi' speak_emote = list("gibbers") icon_state = "otherthing" icon_living = "otherthing" diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm index b364af8b9a3..17cd0696c22 100644 --- a/code/modules/mob/living/simple_animal/hostile/faithless.dm +++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm @@ -1,6 +1,7 @@ /mob/living/simple_animal/hostile/faithless name = "Faithless" desc = "The Wish Granter's faith in humanity, incarnate" + icon = 'icons/mob/npc/human.dmi' icon_state = "faithless" icon_living = "faithless" icon_dead = "faithless_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm index d8b59818d5f..0a573769c71 100644 --- a/code/modules/mob/living/simple_animal/hostile/pirate.dm +++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm @@ -1,6 +1,7 @@ /mob/living/simple_animal/hostile/pirate name = "Pirate" desc = "Does what he wants cause a pirate is free." + icon = 'icons/mob/npc/human.dmi' icon_state = "piratemelee" icon_living = "piratemelee" icon_dead = "piratemelee_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm index 44da3d9cd15..92ba40166bd 100644 --- a/code/modules/mob/living/simple_animal/hostile/russian.dm +++ b/code/modules/mob/living/simple_animal/hostile/russian.dm @@ -1,6 +1,7 @@ /mob/living/simple_animal/hostile/russian name = "russian" desc = "For the Motherland!" + icon = 'icons/mob/npc/human.dmi' icon_state = "russianmelee" icon_living = "russianmelee" icon_dead = "russianmelee_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 7aeee774926..862e4735dad 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -1,6 +1,7 @@ /mob/living/simple_animal/hostile/syndicate name = "\improper Syndicate operative" desc = "Death to the Company." + icon = 'icons/mob/npc/human.dmi' icon_state = "syndicate" icon_living = "syndicate" icon_dead = "syndicate_dead" @@ -140,7 +141,7 @@ /mob/living/simple_animal/hostile/viscerator name = "viscerator" desc = "A small, twin-bladed machine capable of inflicting very deadly lacerations." - icon = 'icons/mob/npc/critter.dmi' + icon = 'icons/mob/npc/aibots.dmi' icon_state = "viscerator_attack" icon_living = "viscerator_attack" pass_flags = PASSTABLE diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 72c1ff41019..0e28e6b5a18 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -28,7 +28,7 @@ /mob/living/simple_animal/parrot name = "\improper Parrot" desc = "The parrot squaks, \"It's a Parrot! BAWWK!\"" - icon = 'icons/mob/npc/animal.dmi' + icon = 'icons/mob/npc/pets.dmi' icon_state = "parrot_fly" icon_living = "parrot_fly" icon_dead = "parrot_dead" diff --git a/html/changelogs/simple_animal_cleanup-wezzy.yml b/html/changelogs/simple_animal_cleanup-wezzy.yml new file mode 100644 index 00000000000..916318ca52e --- /dev/null +++ b/html/changelogs/simple_animal_cleanup-wezzy.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Adds movement states for some animals, and improves sprites of some mobs." diff --git a/icons/mob/amorph.dmi b/icons/mob/amorph.dmi deleted file mode 100644 index 5425adce887..00000000000 Binary files a/icons/mob/amorph.dmi and /dev/null differ diff --git a/icons/mob/npc/aibots.dmi b/icons/mob/npc/aibots.dmi index 0721b868359..7a6a723c0f0 100644 Binary files a/icons/mob/npc/aibots.dmi and b/icons/mob/npc/aibots.dmi differ diff --git a/icons/mob/npc/animal.dmi b/icons/mob/npc/animal.dmi index f1de8defea7..330c0b25e64 100644 Binary files a/icons/mob/npc/animal.dmi and b/icons/mob/npc/animal.dmi differ diff --git a/icons/mob/npc/bats.dmi b/icons/mob/npc/bats.dmi index 74466935077..387740d3fee 100644 Binary files a/icons/mob/npc/bats.dmi and b/icons/mob/npc/bats.dmi differ diff --git a/icons/mob/npc/biocraps.dmi b/icons/mob/npc/biocraps.dmi deleted file mode 100644 index 1bcbec018fe..00000000000 Binary files a/icons/mob/npc/biocraps.dmi and /dev/null differ diff --git a/icons/mob/npc/cavern.dmi b/icons/mob/npc/cavern.dmi index 93f69552e10..37dec1b215a 100644 Binary files a/icons/mob/npc/cavern.dmi and b/icons/mob/npc/cavern.dmi differ diff --git a/icons/mob/npc/critter.dmi b/icons/mob/npc/critter.dmi deleted file mode 100644 index 079df7c8035..00000000000 Binary files a/icons/mob/npc/critter.dmi and /dev/null differ diff --git a/icons/mob/npc/dog.dmi b/icons/mob/npc/dog.dmi deleted file mode 100644 index 17b28e0c3f4..00000000000 Binary files a/icons/mob/npc/dog.dmi and /dev/null differ diff --git a/icons/mob/npc/held_mobs.dmi b/icons/mob/npc/held_mobs.dmi index 0726e4cda68..6ed107ee816 100644 Binary files a/icons/mob/npc/held_mobs.dmi and b/icons/mob/npc/held_mobs.dmi differ diff --git a/icons/mob/npc/human.dmi b/icons/mob/npc/human.dmi new file mode 100644 index 00000000000..0add7234b23 Binary files /dev/null and b/icons/mob/npc/human.dmi differ diff --git a/icons/mob/npc/livestock.dmi b/icons/mob/npc/livestock.dmi index 538e14b1ea1..5fd57b6d91f 100644 Binary files a/icons/mob/npc/livestock.dmi and b/icons/mob/npc/livestock.dmi differ diff --git a/icons/mob/npc/pets.dmi b/icons/mob/npc/pets.dmi new file mode 100644 index 00000000000..1c3f299b051 Binary files /dev/null and b/icons/mob/npc/pets.dmi differ diff --git a/icons/mob/npc/rat.dmi b/icons/mob/npc/rat.dmi index 364ba95f3d6..1ef6c567cad 100644 Binary files a/icons/mob/npc/rat.dmi and b/icons/mob/npc/rat.dmi differ