diff --git a/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm b/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm
index e1671448e3486..45eee5cbe8b46 100644
--- a/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm
+++ b/_maps/RandomRuins/SpaceRuins/russian_derelict.dmm
@@ -4876,10 +4876,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating/airless,
 /area/ruin/space/ks13/engineering/singulo)
-"IZ" = (
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/iron/airless,
-/area/ruin/space/ks13/engineering/singulo)
 "Jc" = (
 /obj/effect/mapping_helpers/broken_floor,
 /obj/effect/mapping_helpers/broken_floor,
@@ -11718,7 +11714,7 @@ PI
 Ex
 pi
 FI
-IZ
+FI
 FI
 FI
 zv
diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm
index e6af579a236c8..0b82ba735b3b3 100644
--- a/_maps/map_files/Birdshot/birdshot.dmm
+++ b/_maps/map_files/Birdshot/birdshot.dmm
@@ -16085,7 +16085,7 @@
 /obj/structure/chair/office/light{
 	dir = 4
 	},
-/mob/living/simple_animal/parrot/poly,
+/mob/living/basic/poly,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index bb4f8c4c16b49..ad7e0886d41dc 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -34717,7 +34717,7 @@
 /obj/structure/filingcabinet/chestdrawer,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/machinery/newscaster/directional/north,
-/mob/living/simple_animal/parrot/poly,
+/mob/living/basic/poly,
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/ce)
 "iDq" = (
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 2b92201ed4a93..dd6a382b60e29 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -4587,7 +4587,7 @@
 "bup" = (
 /obj/structure/filingcabinet/chestdrawer,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
-/mob/living/simple_animal/parrot/poly,
+/mob/living/basic/poly,
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/ce)
 "buv" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 234b5fd4ab63b..92923f5026625 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -3127,7 +3127,7 @@
 "bdV" = (
 /obj/structure/filingcabinet/chestdrawer,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
-/mob/living/simple_animal/parrot/poly,
+/mob/living/basic/poly,
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/ce)
 "beo" = (
diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
index 3c4c0a57d714b..1b85cd7804d28 100644
--- a/_maps/map_files/NorthStar/north_star.dmm
+++ b/_maps/map_files/NorthStar/north_star.dmm
@@ -6814,7 +6814,7 @@
 /obj/machinery/computer/security/telescreen/engine{
 	name = "Engineering and atmospherics monitor"
 	},
-/mob/living/simple_animal/parrot/poly,
+/mob/living/basic/poly,
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/station/command/heads_quarters/ce)
 "bIQ" = (
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index 09f7fb52e4cda..e560f7b87c43e 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -47552,7 +47552,7 @@
 	},
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable,
-/mob/living/simple_animal/parrot/poly,
+/mob/living/basic/poly,
 /turf/open/floor/iron,
 /area/station/command/heads_quarters/ce)
 "pWt" = (
diff --git a/_maps/shuttles/emergency_hugcage.dmm b/_maps/shuttles/emergency_hugcage.dmm
index 80211ed6092ea..fc47476440151 100644
--- a/_maps/shuttles/emergency_hugcage.dmm
+++ b/_maps/shuttles/emergency_hugcage.dmm
@@ -31,7 +31,7 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "dz" = (
-/mob/living/simple_animal/parrot/natural{
+/mob/living/basic/parrot{
 	melee_damage_upper = 5
 	},
 /turf/open/floor/mineral/titanium/blue,
diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm
index 7dd4be59ba7ca..77c4e37bc0326 100644
--- a/_maps/shuttles/ruin_pirate_cutter.dmm
+++ b/_maps/shuttles/ruin_pirate_cutter.dmm
@@ -702,7 +702,7 @@
 "Ry" = (
 /obj/structure/rack,
 /obj/item/storage/bag/money/vault,
-/mob/living/simple_animal/parrot{
+/mob/living/basic/parrot{
 	faction = list("pirate");
 	name = "Pegwing"
 	},
diff --git a/_maps/virtual_domains/pirates.dmm b/_maps/virtual_domains/pirates.dmm
index 9868ab8e9b32e..5eddef7828938 100644
--- a/_maps/virtual_domains/pirates.dmm
+++ b/_maps/virtual_domains/pirates.dmm
@@ -791,7 +791,7 @@
 /area/virtual_domain/powered)
 "Pz" = (
 /obj/structure/table/wood,
-/mob/living/simple_animal/parrot{
+/mob/living/basic/parrot{
 	name = "pepper"
 	},
 /turf/open/floor/carpet/blue,