Replacing carp/shark sprites. (#6121)

This PR replaces carps and sharks sprites. by thread https://forums.aurorastation.org/topic/11503-space-carpspace-shark-aesthetic-change/

Replaces carp/shark sprites

Moves shark sprites into animal.dmi file. Removes spaceshark.dmi

Old sprites of carp and shark remain. Also made a new mobs that uses old carp and shark sprites

Moves all NPC sprite files into icons/mob/npc folder, for organization.

Updates all paths.

code/game/objects/effects/aliens.dm

@@ -5,7 +5,7 @@
 	name = "acid"
 	desc = "Burbling corrosive stuff. Probably a bad idea to roll around in it."
 	icon_state = "acid"
-	icon = 'icons/mob/alien.dmi'
+	icon = 'icons/mob/npc/alien.dmi'
 
 	density = 0
 	opacity = 0

code/game/objects/effects/decals/remains.dm

@@ -20,7 +20,7 @@
 /obj/effect/decal/remains/mouse
 	name = "mouse skeleton"
 	desc = "Looks like the remains of a small rodent. It doesn't squeak anymore."
-	icon = 'icons/mob/mouse.dmi'
+	icon = 'icons/mob/npc/mouse.dmi'
 	icon_state = "skeleton"
 
 /obj/effect/decal/remains/lizard

code/game/objects/items/stacks/sheets/leather.dm

@@ -57,19 +57,19 @@
 	name = "alien chitin"
 	desc = "A piece of the hide of a terrible creature."
 	singular_name = "alien hide piece"
-	icon = 'icons/mob/alien.dmi'
+	icon = 'icons/mob/npc/alien.dmi'
 	icon_state = "chitin"
 
 /obj/item/xenos_claw
 	name = "alien claw"
 	desc = "The claw of a terrible creature."
-	icon = 'icons/mob/alien.dmi'
+	icon = 'icons/mob/npc/alien.dmi'
 	icon_state = "claw"
 
 /obj/item/weed_extract
 	name = "weed extract"
 	desc = "A piece of slimy, purplish weed."
-	icon = 'icons/mob/alien.dmi'
+	icon = 'icons/mob/npc/alien.dmi'
 	icon_state = "weed_extract"
 
 /obj/item/stack/material/hairlesshide

code/game/objects/items/weapons/power_cells.dm

@@ -127,7 +127,7 @@
 	name = "charged slime core"
 	desc = "A yellow slime core infused with phoron, it crackles with power."
 	origin_tech = list(TECH_POWER = 2, TECH_BIO = 4)
-	icon = 'icons/mob/slimes.dmi' //'icons/obj/harvest.dmi'
+	icon = 'icons/mob/npc/slimes.dmi' //'icons/obj/harvest.dmi'
 	icon_state = "yellow slime extract" //"potato_battery"
 	maxcharge = 10000
 	matter = null

code/game/objects/items/weapons/storage/bags.dm

@@ -132,7 +132,7 @@
 
 /obj/item/weapon/storage/bag/slimes
 	name = "slime core bag"
-	icon = 'icons/mob/slimes.dmi'
+	icon = 'icons/mob/npc/slimes.dmi'
 	icon_state = "slimebag"
 	desc = "A pressurized and thermoregulated bag for the storage and transport of slime cores."
 	max_storage_space = 100

code/game/objects/structures/alien/alien.dm

@@ -1,7 +1,7 @@
 /obj/structure/alien
 	name = "alien thing"
 	desc = "There's something alien about this."
-	icon = 'icons/mob/alien.dmi'
+	icon = 'icons/mob/npc/alien.dmi'
 	layer = 4
 	var/health = 50
 

code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm

@@ -4,7 +4,7 @@
 /obj/structure/bed/nest
 	name = "alien nest"
 	desc = "It's a gruesome pile of thick, sticky resin shaped like a nest."
-	icon = 'icons/mob/alien.dmi'
+	icon = 'icons/mob/npc/alien.dmi'
 	icon_state = "nest"
 	var/health = 100
 

code/modules/blob/blob.dm

@@ -1,7 +1,7 @@
 //I will need to recode parts of this but I am way too tired atm
 /obj/effect/blob
 	name = "blob"
-	icon = 'icons/mob/blob.dmi'
+	icon = 'icons/mob/npc/blob.dmi'
 	icon_state = "blob"
 	light_range = 3
 	light_color = "#b5ff5b"
@@ -249,7 +249,6 @@
 
 /obj/effect/blob/core
 	name = "blob core"
-	icon = 'icons/mob/blob.dmi'
 	icon_state = "blob_core"
 	light_range = 1
 	light_power = 2
@@ -298,7 +297,6 @@
 // Half the stats of a normal core. Blob has a very small probability of growing these when spreading. These will spread the blob further.
 /obj/effect/blob/core/secondary
 	name = "small blob core"
-	icon = 'icons/mob/blob.dmi'
 	icon_state = "blob_core"
 	maxHealth = 100
 	brute_resist = 1
@@ -319,7 +317,6 @@
 
 /obj/effect/blob/shield
 	name = "strong blob"
-	icon = 'icons/mob/blob.dmi'
 	icon_state = "blob_idle"
 	maxHealth = 60
 	brute_resist = 1

code/modules/flufftext/Hallucination.dm

@@ -149,7 +149,7 @@ mob/living/carbon/proc/handle_hallucinations()
 							if(2,3)
 								halbody = image('icons/mob/human.dmi',target,"husk_s",TURF_LAYER)
 							if(4)
-								halbody = image('icons/mob/alien.dmi',target,"alienother",TURF_LAYER)
+								halbody = image('icons/mob/npc/alien.dmi',target,"alienother",TURF_LAYER)
 	//						if(5)
 	//							halbody = image('xcomalien.dmi',target,"chryssalid",TURF_LAYER)
 

code/modules/holodeck/HolodeckObjects.dm

@@ -454,7 +454,7 @@
 //Holo-penguin
 
 /mob/living/simple_animal/penguin/holodeck
-	icon = 'icons/mob/penguins.dmi'
+	icon = 'icons/mob/npc/penguins.dmi'
 	icon_state = "penguin"
 	icon_living = "penguin"
 	icon_dead = "penguin_dead"

code/modules/mob/holder.dm

@@ -4,7 +4,7 @@ var/list/holder_mob_icon_cache = list()
 /obj/item/weapon/holder
 	name = "holder"
 	desc = "You shouldn't ever see this."
-	icon = 'icons/mob/held_mobs.dmi'
+	icon = 'icons/mob/npc/held_mobs.dmi'
 	slot_flags = 0
 	sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi')
 	origin_tech = null
@@ -473,7 +473,7 @@ var/list/holder_mob_icon_cache = list()
 	name = "mouse"
 	desc = "It's a fuzzy little critter."
 	desc_dead = "It's filthy vermin, throw it in the trash."
-	icon = 'icons/mob/mouse.dmi'
+	icon = 'icons/mob/npc/mouse.dmi'
 	icon_state = "mouse_brown_sleep"
 	item_state = "mouse_brown"
 	icon_state_dead = "mouse_brown_dead"
@@ -559,7 +559,7 @@ var/list/holder_mob_icon_cache = list()
 
 //pAI
 /obj/item/weapon/holder/pai
-	icon = 'icons/mob/pai.dmi'
+	icon = 'icons/mob/npc/pai.dmi'
 	dir = EAST
 	contained_sprite = 1
 	slot_flags = SLOT_HEAD

code/modules/mob/living/carbon/alien/alien.dm

@@ -2,7 +2,7 @@
 
 	name = "alien"
 	desc = "What IS that?"
-	icon = 'icons/mob/alien.dmi'
+	icon = 'icons/mob/npc/alien.dmi'
 	icon_state = "alien"
 	pass_flags = PASSTABLE
 	health = 100

code/modules/mob/living/carbon/brain/brain_item.dm

@@ -23,14 +23,14 @@
 	desc = "Did someone tread on this? It looks useless for cloning or cyborgification."
 	organ_tag = "brain"
 	parent_organ = "head"
-	icon = 'icons/mob/alien.dmi'
+	icon = 'icons/mob/npc/alien.dmi'
 	icon_state = "chitin"
 	vital = 1
 
 /obj/item/organ/brain/xeno
 	name = "thinkpan"
 	desc = "It looks kind of like an enormous wad of purple bubblegum."
-	icon = 'icons/mob/alien.dmi'
+	icon = 'icons/mob/npc/alien.dmi'
 	icon_state = "chitin"
 
 /obj/item/organ/brain/xeno/gain_trauma()
@@ -142,7 +142,7 @@
 	name = "slime core"
 	desc = "A complex, organic knot of jelly and crystalline particles."
 	robotic = 2
-	icon = 'icons/mob/slimes.dmi'
+	icon = 'icons/mob/npc/slimes.dmi'
 	icon_state = "green slime extract"
 	can_lobotomize = 0
 

code/modules/mob/living/carbon/human/species/xenomorphs/alien_embryo.dm

@@ -1,7 +1,7 @@
 /obj/item/organ/parasite/alien_embryo
 	name = "alien embryo"
 	desc = "All slimy and yuck."
-	icon = 'icons/mob/alien.dmi'
+	icon = 'icons/mob/npc/alien.dmi'
 	icon_state = "larva0_dead"
 	parent_organ = "chest"
 	organ_tag = "alien embryo"
@@ -113,7 +113,7 @@ Des: Removes all infection images from aliens and places an infection image on a
 			for(var/mob/living/L in mob_list)
 				if(iscarbon(L))
 					if(L.status_flags & XENO_HOST)
-						var/image/I = image('icons/mob/alien.dmi', loc = L, icon_state = "infected[stage]")
+						var/image/I = image('icons/mob/npc/alien.dmi', loc = L, icon_state = "infected[stage]")
 						alien.client.images += I
 
 /*----------------------------------------
@@ -130,7 +130,7 @@ Des: Checks if the passed mob (C) is infected with the alien egg, then gives eac
 
 			if(alien.client)
 				if(C.status_flags & XENO_HOST)
-					var/image/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected[stage]")
+					var/image/I = image('icons/mob/npc/alien.dmi', loc = C, icon_state = "infected[stage]")
 					alien.client.images += I
 
 /*----------------------------------------

code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm

@@ -11,7 +11,7 @@ var/const/MAX_ACTIVE_TIME = 400
 /obj/item/clothing/mask/facehugger
 	name = "alien"
 	desc = "It has some sort of a tube at the end of its tail."
-	icon = 'icons/mob/alien.dmi'
+	icon = 'icons/mob/npc/alien.dmi'
 	icon_state = "facehugger"
 	item_state = "facehugger"
 	w_class = 3 //note: can be picked up by aliens unlike most other items of w_class below 4

code/modules/mob/living/carbon/metroid/items.dm

@@ -1,7 +1,7 @@
 /obj/item/slime_extract
 	name = "slime extract"
 	desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"."
-	icon = 'icons/mob/slimes.dmi'
+	icon = 'icons/mob/npc/slimes.dmi'
 	icon_state = "grey slime extract"
 	force = 1.0
 	w_class = 1.0

code/modules/mob/living/carbon/metroid/metroid.dm

@@ -1,6 +1,6 @@
 /mob/living/carbon/slime
 	name = "baby slime"
-	icon = 'icons/mob/slimes.dmi'
+	icon = 'icons/mob/npc/slimes.dmi'
 	icon_state = "grey baby slime"
 	pass_flags = PASSTABLE
 	var/is_adult = 0

code/modules/mob/living/silicon/pai/pai.dm

@@ -1,6 +1,6 @@
 /mob/living/silicon/pai
 	name = "pAI"
-	icon = 'icons/mob/pai.dmi'
+	icon = 'icons/mob/npc/pai.dmi'
 	icon_state = "repairbot"
 	holder_type = /obj/item/weapon/holder/pai/drone
 

code/modules/mob/living/simple_animal/familiars/familiars.dm

@@ -28,7 +28,7 @@
 /mob/living/simple_animal/familiar/carcinus
 	name = "crab"
 	desc = "A small crab said to be made of stone and starlight."
-	icon = 'icons/mob/animal.dmi'
+	icon = 'icons/mob/npc/animal.dmi'
 	icon_state = "evilcrab"
 	icon_living = "evilcrab"
 	icon_dead = "evilcrab_dead"
@@ -48,11 +48,11 @@
 /mob/living/simple_animal/familiar/pike
 	name = "space pike"
 	desc = "A bigger, more magical cousin of the space carp."
-
-	icon = 'icons/mob/spaceshark.dmi'
+	icon = 'icons/mob/npc/spaceshark.dmi'
 	icon_state = "shark"
 	icon_living = "shark"
 	icon_dead = "shark_dead"
+	icon_rest = "shark_rest"
 	pixel_x = -16
 
 	speak_emote = list("gnashes")
@@ -136,7 +136,7 @@
 
 
 /mob/living/simple_animal/familiar/pet //basically variants of normal animals with spells.
-	icon = 'icons/mob/animal.dmi'
+	icon = 'icons/mob/npc/animal.dmi'
 
 /mob/living/simple_animal/familiar/pet/MouseDrop(atom/over_object)
 	var/mob/living/carbon/H = over_object

code/modules/mob/living/simple_animal/friendly/farm_animals.dm

@@ -304,7 +304,7 @@
 /mob/living/simple_animal/penguin
 	name = "penguin"
 	desc = "A king of the icy regions."
-	icon = 'icons/mob/penguins.dmi'
+	icon = 'icons/mob/npc/penguins.dmi'
 	icon_state = "penguin"
 	icon_living = "penguin"
 	icon_dead = "penguin_dead"

code/modules/mob/living/simple_animal/friendly/lizard.dm

@@ -1,7 +1,7 @@
 /mob/living/simple_animal/lizard
 	name = "Lizard"
 	desc = "It's a hissy little lizard. Is it related to Unathi?"
-	icon = 'icons/mob/critter.dmi'
+	icon = 'icons/mob/npc/critter.dmi'
 	icon_state = "lizard"
 	icon_living = "lizard"
 	icon_dead = "lizard-dead"

code/modules/mob/living/simple_animal/friendly/mouse.dm

@@ -3,7 +3,7 @@
 	real_name = "mouse"
 	desc = "It's a small, disgusting rodent, often found being annoying, and aiding in the spread of disease."
 
-	icon = 'icons/mob/mouse.dmi'
+	icon = 'icons/mob/npc/mouse.dmi'
 	icon_state = "mouse_gray"
 	item_state = "mouse_gray"
 	icon_living = "mouse_gray"
@@ -270,7 +270,7 @@
 	..()
 
 /mob/living/simple_animal/mouse/dust()
-	..(anim = "dust_[body_color]", remains = /obj/effect/decal/remains/mouse, iconfile = 'icons/mob/mouse.dmi')
+	..(anim = "dust_[body_color]", remains = /obj/effect/decal/remains/mouse, iconfile = 'icons/mob/npc/mouse.dmi')
 
 
 /*

code/modules/mob/living/simple_animal/friendly/ratking.dm

@@ -59,7 +59,7 @@
 	cut_overlays()
 
 	for(var/mob/living/simple_animal/mouse/R in rats)
-		var/image/rat_overlay = image('icons/mob/animal.dmi', "[R.icon_state]")
+		var/image/rat_overlay = image('icons/mob/npc/animal.dmi', "[R.icon_state]")
 		rat_overlay.dir = src.dir
 		var/matrix/M = matrix()
 		M.Translate(rand(-6, 6), rand(-4, 8))

code/modules/mob/living/simple_animal/friendly/slime.dm

@@ -1,7 +1,7 @@
 /mob/living/simple_animal/slime
 	name = "pet slime"
 	desc = "A lovable, domesticated slime."
-	icon = 'icons/mob/slimes.dmi'
+	icon = 'icons/mob/npc/slimes.dmi'
 	icon_state = "grey baby slime"
 	icon_living = "grey baby slime"
 	icon_dead = "grey baby slime dead"
@@ -24,7 +24,7 @@
 /mob/living/simple_animal/adultslime
 	name = "pet slime"
 	desc = "A lovable, domesticated slime."
-	icon = 'icons/mob/slimes.dmi'
+	icon = 'icons/mob/npc/slimes.dmi'
 	health = 200
 	maxHealth = 200
 	icon_state = "grey adult slime"

code/modules/mob/living/simple_animal/hostile/alien.dm

@@ -1,7 +1,7 @@
 /mob/living/simple_animal/hostile/alien
 	name = "alien hunter"
 	desc = "Hiss!"
-	icon = 'icons/mob/alien.dmi'
+	icon = 'icons/mob/npc/alien.dmi'
 	icon_state = "alienh_running"
 	icon_living = "alienh_running"
 	icon_dead = "alien_l"
@@ -80,7 +80,7 @@
 
 /mob/living/simple_animal/hostile/alien/queen/large
 	name = "alien empress"
-	icon = 'icons/mob/alienqueen.dmi'
+	icon = 'icons/mob/npc/alienqueen.dmi'
 	icon_state = "queen_s"
 	icon_living = "queen_s"
 	icon_dead = "queen_dead"

code/modules/mob/living/simple_animal/hostile/bat.dm

@@ -1,7 +1,7 @@
 /mob/living/simple_animal/hostile/scarybat
 	name = "space bats"
 	desc = "A swarm of cute little blood sucking bats that looks pretty upset."
-	icon = 'icons/mob/bats.dmi'
+	icon = 'icons/mob/npc/bats.dmi'
 	icon_state = "bat"
 	icon_living = "bat"
 	icon_dead = "bat_dead"

code/modules/mob/living/simple_animal/hostile/carp.dm

@@ -7,6 +7,7 @@
 	icon_living = "carp"
 	icon_dead = "carp_dead"
 	icon_gib = "carp_gib"
+	icon_rest = "carp_rest"
 	speak_chance = 0
 	turns_per_move = 5
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat
@@ -136,14 +137,12 @@
 /mob/living/simple_animal/hostile/carp/shark
 	name = "space shark"
 	desc = "The bigger, angrier cousin of the space carp."
-	icon = 'icons/mob/spaceshark.dmi'
 	icon_state = "shark"
 	icon_living = "shark"
 	icon_dead = "shark_dead"
+	icon_rest = "shark_rest"
 	meat_amount = 5
 
-	pixel_x = -16
-
 	maxHealth = 100
 	health = 100
 
@@ -152,3 +151,18 @@
 	harm_intent_damage = 5
 	melee_damage_lower = 20
 	melee_damage_upper = 25
+
+/mob/living/simple_animal/hostile/carp/old
+	icon_state = "carp_old"
+	icon_living = "carp_old"
+	icon_dead = "carp_old_dead"
+	icon_gib = "carp_old_gib"
+	icon_rest = "carp_old"
+
+/mob/living/simple_animal/hostile/carp/shark/old
+	icon = 'icons/mob/npc/spaceshark.dmi'
+	icon_state = "shark"
+	icon_living = "shark"
+	icon_dead = "shark_dead"
+	icon_rest = "shark"
+	pixel_x = -16

code/modules/mob/living/simple_animal/hostile/changeling.dm

@@ -2,7 +2,7 @@
 	name = "shambling horror"
 	desc = "A monstrous creature, made of twisted flesh and bone."
 	speak_emote = list("gibbers")
-	icon = 'icons/mob/animal.dmi'
+	icon = 'icons/mob/npc/animal.dmi'
 	icon_state = "abomination"
 	icon_living = "abomination"
 	icon_dead = "abomination_dead"

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/dog.dmi'
+	icon = 'icons/mob/npc/dog.dmi'
 	icon_state = "german"
 	icon_living = "german"
 	icon_dead = "german_dead"

code/modules/mob/living/simple_animal/hostile/creature.dm

@@ -1,7 +1,7 @@
 /mob/living/simple_animal/hostile/creature
 	name = "creature"
 	desc = "A sanity-destroying otherthing."
-	icon = 'icons/mob/critter.dmi'
+	icon = 'icons/mob/npc/critter.dmi'
 	speak_emote = list("gibbers")
 	icon_state = "otherthing"
 	icon_living = "otherthing"

code/modules/mob/living/simple_animal/hostile/hivebot.dm

@@ -9,7 +9,7 @@
 /mob/living/simple_animal/hostile/hivebot
 	name = "Hivebot"
 	desc = "A small robot"
-	icon = 'icons/mob/hivebot.dmi'
+	icon = 'icons/mob/npc/hivebot.dmi'
 	icon_state = "basic"
 	icon_living = "basic"
 	icon_dead = "basic"
@@ -59,7 +59,6 @@
 /mob/living/simple_animal/hostile/hivebot/tele//this still needs work
 	name = "Beacon"
 	desc = "Some odd beacon thing"
-	icon = 'icons/mob/hivebot.dmi'
 	icon_state = "def_radar-off"
 	icon_living = "def_radar-off"
 	health = 200

code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm

@@ -2,7 +2,7 @@
 /mob/living/simple_animal/hostile/retaliate/cavern_dweller
 	name = "cavern dweller"
 	desc = "An alien creature that dwells in the tunnels of the asteroid, commonly found in the Romanovich Cloud."
-	icon = 'icons/mob/cavern.dmi'
+	icon = 'icons/mob/npc/cavern.dmi'
 	icon_state = "dweller" //icons from europa station
 	icon_living = "dweller"
 	icon_dead = "dweller_dead"
@@ -69,7 +69,7 @@
 /mob/living/simple_animal/hostile/retaliate/minedrone
 	name = "mining rover"
 	desc = "A dilapidated mining rover, with the faded colors of the Sol Alliance. It looks more than a little lost."
-	icon = 'icons/mob/cavern.dmi'
+	icon = 'icons/mob/npc/cavern.dmi'
 	icon_state = "sadrone"
 	icon_living = "sadrone"
 	icon_dead = "sadrone_dead"

code/modules/mob/living/simple_animal/hostile/sarlacc.dm

@@ -11,7 +11,7 @@
 /obj/item/weapon/trap/sarlacc
 	name = "great worm maw"
 	desc = "Hop in, the gastrointestinal juices are just fine."
-	icon = 'icons/mob/cavern.dmi'
+	icon = 'icons/mob/npc/cavern.dmi'
 	icon_state = "blank"
 	mouse_opacity = 0
 	throwforce = 0
@@ -90,7 +90,7 @@
 /mob/living/simple_animal/hostile/greatworm
 	name = "great worm"
 	desc = "The gaping maw opens and closes eternally, insatiably... Rumours however tell that those who can sate it are rewarded."
-	icon = 'icons/mob/cavern.dmi'
+	icon = 'icons/mob/npc/cavern.dmi'
 	icon_state = "sarlacc"
 	see_in_dark = 8
 	health = 100
@@ -254,7 +254,7 @@
 /mob/living/simple_animal/hostile/lesserworm
 	name = "lesser worm"
 	desc = "The maw on this creature is substantially smaller than the one on it's master, but it still hurts like hell."
-	icon = 'icons/mob/cavern.dmi'
+	icon = 'icons/mob/npc/cavern.dmi'
 	icon_state = "sarlacctentacle"
 	health = 25
 	maxHealth = 25
@@ -311,7 +311,7 @@
 /mob/living/simple_animal/hostile/greatwormking
 	name = "great worm king"
 	desc = "This pulsating brain seems somehow connected to all the other orifices in this room..."
-	icon = 'icons/mob/cavern.dmi'
+	icon = 'icons/mob/npc/cavern.dmi'
 	icon_state = "sarlaccbrain"
 	see_in_dark = 8
 	see_invisible = SEE_INVISIBLE_NOLIGHTING
@@ -405,7 +405,7 @@
 /obj/structure/greatworm
 	name = "great worm rectum"
 	desc = "The intestinal length of the great worm this end belongs to travels for what looks like miles."
-	icon = 'icons/mob/cavern.dmi'
+	icon = 'icons/mob/npc/cavern.dmi'
 	icon_state = "sarlaccend"
 	anchored = 1
 	density = 0

code/modules/mob/living/simple_animal/hostile/syndicate.dm

@@ -140,7 +140,7 @@
 /mob/living/simple_animal/hostile/viscerator
 	name = "viscerator"
 	desc = "A small, twin-bladed machine capable of inflicting very deadly lacerations."
-	icon = 'icons/mob/critter.dmi'
+	icon = 'icons/mob/npc/critter.dmi'
 	icon_state = "viscerator_attack"
 	icon_living = "viscerator_attack"
 	pass_flags = PASSTABLE

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/animal.dmi'
+	icon = 'icons/mob/npc/animal.dmi'
 	icon_state = "parrot_fly"
 	icon_living = "parrot_fly"
 	icon_dead = "parrot_dead"

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -1,6 +1,6 @@
 /mob/living/simple_animal
 	name = "animal"
-	icon = 'icons/mob/animal.dmi'
+	icon = 'icons/mob/npc/animal.dmi'
 	health = 20
 	maxHealth = 20
 

code/modules/mob/living/simple_animal/worm.dm

@@ -1,7 +1,7 @@
 /mob/living/simple_animal/space_worm
 	name = "space worm segment"
 	desc = "A part of a space worm."
-	icon = 'icons/mob/animal.dmi'
+	icon = 'icons/mob/npc/animal.dmi'
 	icon_state = "spaceworm"
 	icon_living = "spaceworm"
 	icon_dead = "spacewormdead"

code/modules/organs/subtypes/diona.dm

@@ -224,7 +224,7 @@
 	name = "nutrient channel"
 	parent_organ = "chest"
 	organ_tag = "nutrient channel"
-	icon = 'icons/mob/alien.dmi'
+	icon = 'icons/mob/npc/alien.dmi'
 	icon_state = "claw"
 
 /obj/item/organ/diona/nutrients/removed()
@@ -234,7 +234,7 @@
 	name = "response node"
 	parent_organ = "head"
 	organ_tag = "response node"
-	icon = 'icons/mob/alien.dmi'
+	icon = 'icons/mob/npc/alien.dmi'
 	icon_state = "claw"
 
 /obj/item/organ/diona/node/removed()

code/modules/organs/subtypes/parasite.dm

@@ -1,6 +1,6 @@
 /obj/item/organ/parasite
 	name = "parasite"
-	icon = 'icons/mob/alien.dmi'
+	icon = 'icons/mob/npc/alien.dmi'
 	icon_state = "burst_lie"
 	dead_icon = "bursted_lie"
 

html/changelogs/Sindorman-carp.yml

@@ -0,0 +1,42 @@
+################################
+# 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: PoZe
+
+# 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: 
+  - tweak: "Space carp and shark sprites were replace by something less fishy. Wizard shark familiar still uses old sprites."
+  - imageadd: "Space carp and shark now have resting sprites."