diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm
index 87e1efa3617..d070f4deb97 100644
--- a/code/modules/events/infestation.dm
+++ b/code/modules/events/infestation.dm
@@ -56,7 +56,7 @@
switch(vermin)
if(VERM_MICE)
- spawn_types = list(/mob/living/simple_animal/mouse/gray, /mob/living/simple_animal/mouse/brown, /mob/living/simple_animal/mouse/white)
+ spawn_types = list(/mob/living/simple_animal/mouse/common/gray, /mob/living/simple_animal/mouse/common/brown, /mob/living/simple_animal/mouse/common/white)
max_number = 12
vermstring = "mice"
if(VERM_LIZARDS)
diff --git a/code/modules/maps/nests.dm b/code/modules/maps/nests.dm
index 37766ac4a58..35b551b14d3 100644
--- a/code/modules/maps/nests.dm
+++ b/code/modules/maps/nests.dm
@@ -42,7 +42,7 @@
/obj/abstract/map/nest/mouse
name = "mouse breeding ground"
icon_state = "mouse"
- mob_type = /mob/living/simple_animal/mouse
+ mob_type = /mob/living/simple_animal/mouse/common
breed_time = 1200
/obj/abstract/map/nest/mouse/limited
diff --git a/code/modules/maps/spawners/spawners.dm b/code/modules/maps/spawners/spawners.dm
index e40405c4b13..d89acb25f1c 100644
--- a/code/modules/maps/spawners/spawners.dm
+++ b/code/modules/maps/spawners/spawners.dm
@@ -877,9 +877,9 @@
amount = 2
chance = 50
to_spawn = list(
- /mob/living/simple_animal/mouse/brown,
- /mob/living/simple_animal/mouse/gray,
- /mob/living/simple_animal/mouse/white,
+ /mob/living/simple_animal/mouse/common/brown,
+ /mob/living/simple_animal/mouse/common/gray,
+ /mob/living/simple_animal/mouse/common/white,
)
/obj/abstract/map/spawner/mobs/bear
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index c371bfe8115..628052bed63 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -754,7 +754,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
//find a viable mouse candidate
- var/mob/living/simple_animal/mouse/host
+ var/mob/living/simple_animal/mouse/common/host
var/obj/machinery/atmospherics/unary/vent_pump/vent_found
var/list/found_vents = list()
for(var/obj/machinery/atmospherics/unary/vent_pump/v in atmos_machines)
@@ -762,7 +762,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
found_vents.Add(v)
if(found_vents.len)
vent_found = pick(found_vents)
- host = new /mob/living/simple_animal/mouse(vent_found.loc)
+ host = new /mob/living/simple_animal/mouse/common(vent_found.loc)
else
to_chat(src, "Unable to find any unwelded vents to spawn mice at.")
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index bd3a7f60a26..042d48ec900 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -13,6 +13,8 @@
icon_state = "mouse_gray"
icon_living = "mouse_gray"
icon_dead = "mouse_gray_dead"
+ var/icon_sleep = "mouse_gray_sleep"
+ var/icon_splat = "mouse_gray_splat"
speak = list("Squeek!","SQUEEK!","Squeek?")
speak_emote = list("squeeks","squeeks","squiks")
emote_hear = list("squeeks","squeaks","squiks")
@@ -56,14 +58,14 @@
if(!ckey && stat == CONSCIOUS && prob(0.5))
stat = UNCONSCIOUS
- icon_state = "mouse_[_color]_sleep"
+ icon_state = icon_sleep
wander = 0
speak_chance = 0
//snuffles
else if(stat == UNCONSCIOUS)
if(ckey || prob(1))
stat = CONSCIOUS
- icon_state = "mouse_[_color]"
+ icon_state = icon_living
wander = 1
speak_chance = initial(speak_chance)
else if(prob(5))
@@ -90,8 +92,6 @@
if(prob(5))
to_chat(src, "You are getting hungry!")
-
-
if(!isUnconscious())
var/list/can_see = view(src, 5) //Decent radius, not too large so they're attracted across rooms, but large enough to attract them to mousetraps
@@ -141,23 +141,6 @@
multiplier = 2.5
nutrition = max(0, nutrition - MOUSEMOVECOST*multiplier)
-/mob/living/simple_animal/mouse/New()
- ..()
- if(config && config.uneducated_mice)
- universal_understand = 0
- // Mice IDs
- if(namenumbers)
- name = "[name] ([rand(1, 1000)])"
- real_name = name
- if(!_color)
- _color = pick( list("brown","gray","white") )
- icon_state = "mouse_[_color]"
- icon_living = "mouse_[_color]"
- icon_dead = "mouse_[_color]_dead"
- desc = "It's a small [_color] rodent, often seen hiding in maintenance areas and making a nuisance of itself."
- add_language(LANGUAGE_MOUSE)
- default_language = all_languages[LANGUAGE_MOUSE]
-
/mob/living/simple_animal/mouse/unarmed_attack_mob(mob/living/target)
..()
if(can_be_infected(target))
@@ -185,8 +168,8 @@
/mob/living/simple_animal/mouse/proc/splat()
death()
- src.icon_dead = "mouse_[_color]_splat"
- src.icon_state = "mouse_[_color]_splat"
+ src.icon_dead = icon_splat
+ src.icon_state = icon_splat
if(client)
client.time_died_as_mouse = world.time
@@ -262,43 +245,6 @@
client.time_died_as_mouse = world.time
..(gibbed)
-/*
- * Mouse types
- */
-
-/mob/living/simple_animal/mouse/white
- _color = "white"
- icon_state = "mouse_white"
-
-/mob/living/simple_animal/mouse/gray
- _color = "gray"
- icon_state = "mouse_gray"
-
-/mob/living/simple_animal/mouse/brown
- _color = "brown"
- icon_state = "mouse_brown"
-
-/mob/living/simple_animal/mouse/black
- _color = "black"
- icon_state = "mouse_black"
-
-//TOM IS ALIVE! SQUEEEEEEEE~K :)
-/mob/living/simple_animal/mouse/brown/Tom
- name = "Tom"
- namenumbers = FALSE
- desc = "Jerry the cat is not amused."
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "splats"
-
-/mob/living/simple_animal/mouse/black/dessert
- name = "Dessert"
- namenumbers = FALSE
- desc = "Crunchy!"
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "tenderizes"
-
/mob/living/simple_animal/mouse/say_quote(text)
if(!text)
return "squeaks, \"...\""; //not the best solution, but it will stop a large number of runtimes. The cause is somewhere in the Tcomms code
@@ -310,14 +256,89 @@
gib()
return 0
-/mob/living/simple_animal/mouse/wire_biter
+/*
+ * MOUSE TYPES BELOW
+ */
+
+//Common mice - these are the kind that spawn from mouse spawners and that ghosts can respawn as.
+
+/mob/living/simple_animal/mouse/common
+
+
+/mob/living/simple_animal/mouse/common/white
+ _color = "white"
+ icon_state = "mouse_white"
+
+/mob/living/simple_animal/mouse/common/gray
+ _color = "gray"
+ icon_state = "mouse_gray"
+
+/mob/living/simple_animal/mouse/common/brown
+ _color = "brown"
+ icon_state = "mouse_brown"
+
+/mob/living/simple_animal/mouse/common/black
+ _color = "black"
+ icon_state = "mouse_black"
+
+/mob/living/simple_animal/mouse/common/New()
+ ..()
+ if(config && config.uneducated_mice)
+ universal_understand = 0
+ // Mice IDs
+ if(namenumbers)
+ name = "[name] ([rand(1, 1000)])"
+ real_name = name
+ if(!_color)
+ _color = pick( list("brown","gray","white") )
+ icon_state = "mouse_[_color]"
+ icon_living = "mouse_[_color]"
+ icon_dead = "mouse_[_color]_dead"
+ icon_sleep = "mouse_[_color]_sleep"
+ icon_splat = "mouse_[_color]_splat"
+ desc = "It's a small [_color] rodent, often seen hiding in maintenance areas and making a nuisance of itself."
+ add_language(LANGUAGE_MOUSE)
+ default_language = all_languages[LANGUAGE_MOUSE]
+
+/*
+* Unique Mice
+*/
+
+//TOM IS ALIVE! SQUEEEEEEEE~K :)
+/mob/living/simple_animal/mouse/common/brown/Tom
+ name = "Tom"
+ namenumbers = FALSE
+ desc = "Jerry the cat is not amused."
+ response_help = "pets"
+ response_disarm = "gently pushes aside"
+ response_harm = "splats"
+
+/mob/living/simple_animal/mouse/common/black/dessert
+ name = "Dessert"
+ namenumbers = FALSE
+ desc = "Crunchy!"
+ response_help = "pets"
+ response_disarm = "gently pushes aside"
+ response_harm = "tenderizes"
+
+/mob/living/simple_animal/mouse/common/wire_biter
can_chew_wires = 1
-/mob/living/simple_animal/mouse/plague
+/mob/living/simple_animal/mouse/common/plague
disease_carrier = 1
+/*
+* MOUSE OPS
+*/
+
/mob/living/simple_animal/mouse/mouse_op
name = "mouse operative"
+ desc = "Oh no..."
+ icon_state = "mouse_operative"
+ icon_living = "mouse_operative"
+ icon_sleep = "mouse_operative_sleep"
+ icon_dead = "mouse_operative_dead"
+ icon_splat = "mouse_operative_splat"
namenumbers = FALSE
min_oxy = 0
minbodytemp = 0
@@ -327,14 +348,14 @@
universal_speak = 1
can_chew_wires = 1
mutations = list(M_NO_SHOCK)
+ universal_understand = 1
/mob/living/simple_animal/mouse/mouse_op/New()
..()
- desc = "Oh no..."
- icon_state = "mouse_operative"
- universal_understand = 1
+ add_language(LANGUAGE_MOUSE)
+ default_language = all_languages[LANGUAGE_MOUSE]
/mob/living/simple_animal/mouse/mouse_op/death(var/gibbed = FALSE)
- . = ..()
+ ..()
if(gibbed == FALSE)
src.gib()
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 314e76dfba7..2c79928a65d 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -380,7 +380,7 @@ var/global/list/animal_count = list() //Stores types, and amount of animals of t
/mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj)
if(!Proj)
return
- // FUCK mice. - N3X
+ // mice are pretty cool guys
if(ismouse(src) && (Proj.stun+Proj.weaken+Proj.paralyze+Proj.agony)>5)
var/mob/living/simple_animal/mouse/M=src
to_chat(M, "What would probably not kill a human completely overwhelms your tiny body.")
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 335bd1ad881..cff7ea3d5a3 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -3352,7 +3352,7 @@
H.vomit(instant = TRUE) //mouse spawning continues below
var/location = get_turf(holder.my_atom)
for(var/i=1 to created_volume)
- new /mob/living/simple_animal/mouse(location)
+ new /mob/living/simple_animal/mouse/common(location)
/datum/chemical_reaction/aminocyprinidol
name = "Aminocyprinidol"
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm b/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm
index 6db85454f6f..4c9a3c6f1f3 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm
@@ -41,7 +41,7 @@
/mob/living/simple_animal/parrot,
/mob/living/simple_animal/slime,
/mob/living/simple_animal/crab,
- /mob/living/simple_animal/mouse,
+ /mob/living/simple_animal/mouse/common,
/mob/living/simple_animal/hostile/retaliate/goat,
/mob/living/carbon/monkey,
)
diff --git a/maps/bagelstation.dmm b/maps/bagelstation.dmm
index 717e764a3b7..ccc5fc0c1c0 100644
--- a/maps/bagelstation.dmm
+++ b/maps/bagelstation.dmm
@@ -1923,7 +1923,7 @@
"aKY" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/binary/valve/digital{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/maintenance/starboard)
"aKZ" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood{icon_state = "wood-broken"},/area/maintenance/starboard)
"aLa" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood{broken = 1; icon_state = "wood-broken6"},/area/maintenance/starboard)
-"aLb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/mob/living/simple_animal/mouse/white,/turf/simulated/floor/plating,/area/maintenance/starboard)
+"aLb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/mob/living/simple_animal/mouse/common/white,/turf/simulated/floor/plating,/area/maintenance/starboard)
"aLc" = (/obj/machinery/atmospherics/binary/valve{dir = 4},/turf/simulated/floor/plating,/area/maintenance/starboard)
"aLd" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/starboard)
"aLe" = (/obj/structure/catwalk,/obj/structure/grille,/turf/space,/area/solar/fport)
diff --git a/maps/defficiency.dmm b/maps/defficiency.dmm
index 09efaea06e8..e9c626a97e3 100644
--- a/maps/defficiency.dmm
+++ b/maps/defficiency.dmm
@@ -2293,7 +2293,7 @@
"aSe" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/shard{icon_state = "medium"},/obj/structure/window/reinforced/tinted{dir = 1},/turf/simulated/floor/plating,/area/derelictparts/fore)
"aSf" = (/obj/effect/decal/cleanable/dirt,/obj/structure/grille,/obj/item/weapon/shard{icon_state = "small"},/turf/simulated/floor/plating{icon_state = "platingdmg1"},/area/derelictparts/fore)
"aSg" = (/obj/item/device/flashlight,/turf/simulated/floor/plating,/area/derelictparts/fore)
-"aSh" = (/obj/item/weapon/pen,/obj/item/weapon/stock_parts/manipulator{pixel_x = 4; pixel_y = 10},/mob/living/simple_animal/mouse/gray,/turf/simulated/floor/plating,/area/derelictparts/fore)
+"aSh" = (/obj/item/weapon/pen,/obj/item/weapon/stock_parts/manipulator{pixel_x = 4; pixel_y = 10},/mob/living/simple_animal/mouse/common/gray,/turf/simulated/floor/plating,/area/derelictparts/fore)
"aSi" = (/obj/structure/window/barricade/full,/turf/simulated/floor/plating{icon_state = "panelscorched"},/area/derelictparts/fore)
"aSj" = (/obj/item/weapon/caution/cone,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 1},/area/derelictparts/fore)
"aSk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/hydroponics)
@@ -3667,7 +3667,7 @@
"bsA" = (/obj/structure/table,/turf/simulated/floor/plating{icon_state = "platingdmg3"},/area/derelictparts/asderelict)
"bsB" = (/obj/structure/girder,/turf/simulated/floor/plating,/area/derelictparts/asderelict)
"bsC" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plating,/area/derelictparts/asderelict)
-"bsD" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/mob/living/simple_animal/mouse/brown,/turf/simulated/floor/plating,/area/derelictparts/asderelict)
+"bsD" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/mob/living/simple_animal/mouse/common/brown,/turf/simulated/floor/plating,/area/derelictparts/asderelict)
"bsE" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating{icon_state = "platingdmg3"},/area/derelictparts/asderelict)
"bsF" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/maintenance{name = "Derelict Parts Access"; req_access_txt = "12"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/derelictparts/asderelict)
"bsG" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{icon_state = "platingdmg1"},/area/derelictparts/asderelict)
@@ -3722,7 +3722,7 @@
"btD" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/derelictparts/asderelict)
"btE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plating,/area/derelictparts/asderelict)
"btF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/derelictparts/asderelict)
-"btG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/mob/living/simple_animal/mouse/gray,/turf/simulated/floor/plating{icon_state = "platingdmg3"},/area/derelictparts/asderelict)
+"btG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/mob/living/simple_animal/mouse/common/gray,/turf/simulated/floor/plating{icon_state = "platingdmg3"},/area/derelictparts/asderelict)
"btH" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/simulated/floor/plating,/area/derelictparts/asderelict)
"btI" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating{icon_state = "panelscorched"},/area/derelictparts/asderelict)
"btJ" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/stack/sheet/cardboard,/turf/simulated/floor/plating,/area/derelictparts/asderelict)
@@ -3735,7 +3735,7 @@
"btQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating,/area/derelictparts/asderelict)
"btR" = (/obj/structure/grille,/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/derelictparts/asderelict)
"btS" = (/obj/structure/grille/broken,/obj/item/stack/rods,/turf/simulated/floor/plating,/area/derelictparts/asderelict)
-"btT" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/effect/nmpi{tag = "icon-maintguide (EAST)"; icon_state = "maintguide"; dir = 4},/obj/effect/nmpi{tag = "icon-maintguide (SOUTHEAST)"; icon_state = "maintguide"; dir = 6},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/mob/living/simple_animal/mouse/brown,/turf/simulated/floor/plating,/area/maintenance/apmaint)
+"btT" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/effect/nmpi{tag = "icon-maintguide (EAST)"; icon_state = "maintguide"; dir = 4},/obj/effect/nmpi{tag = "icon-maintguide (SOUTHEAST)"; icon_state = "maintguide"; dir = 6},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/mob/living/simple_animal/mouse/common/brown,/turf/simulated/floor/plating,/area/maintenance/apmaint)
"btU" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
"btV" = (/obj/structure/cable,/turf/simulated/floor/plating,/area/maintenance/fsmaint)
"btW" = (/obj/structure/grille,/obj/structure/window/reinforced/tinted{dir = 1},/obj/structure/window/reinforced/tinted,/turf/simulated/floor/plating{icon_state = "platingdmg3"},/area/derelictparts/fsderelict)
@@ -4185,7 +4185,7 @@
"bCy" = (/obj/structure/table,/obj/item/weapon/coin/silver,/obj/item/weapon/pen,/turf/simulated/floor/plating{icon_state = "panelscorched"},/area/derelictparts/asderelict)
"bCz" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/derelictparts/asderelict)
"bCA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/weapon/pen,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/derelictparts/asderelict)
-"bCB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/mob/living/simple_animal/mouse/gray,/turf/simulated/floor/plating,/area/derelictparts/asderelict)
+"bCB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/mob/living/simple_animal/mouse/common/gray,/turf/simulated/floor/plating,/area/derelictparts/asderelict)
"bCC" = (/obj/structure/grille/broken,/obj/item/stack/rods,/turf/simulated/floor/plating{icon_state = "platingdmg3"},/area/derelictparts/asderelict)
"bCD" = (/turf/simulated/wall/r_wall,/area/derelictparts/port)
"bCE" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/bluegrid,/area/turret_protected/ai)
@@ -4289,7 +4289,7 @@
"bEy" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/wall/r_wall,/area/derelictparts/port)
"bEz" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor/plating,/area/maintenance/port)
"bEA" = (/obj/effect/decal/cleanable/blood/gibs/robot{icon_state = "gib5"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/effect/nmpi,/turf/simulated/floor/plating,/area/maintenance/port)
-"bEB" = (/obj/item/weapon/stool,/obj/machinery/light/small{dir = 8},/mob/living/simple_animal/mouse/white,/turf/simulated/floor/plating,/area/maintenance/port)
+"bEB" = (/obj/item/weapon/stool,/obj/machinery/light/small{dir = 8},/mob/living/simple_animal/mouse/common/white,/turf/simulated/floor/plating,/area/maintenance/port)
"bEC" = (/obj/item/trash/cigbutt,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating,/area/maintenance/port)
"bED" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/obj/effect/nmpi,/turf/simulated/floor/plating,/area/maintenance/port)
"bEE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/port)
@@ -4550,7 +4550,7 @@
"bJz" = (/obj/item/device/paicard,/turf/simulated/floor/plating,/area/derelictparts/apderelict)
"bJA" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating{icon_state = "panelscorched"},/area/derelictparts/apderelict)
"bJB" = (/obj/machinery/light_construct/small{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
-"bJC" = (/mob/living/simple_animal/mouse/gray,/turf/simulated/floor/plating,/area/maintenance/fsmaint)
+"bJC" = (/mob/living/simple_animal/mouse/common/gray,/turf/simulated/floor/plating,/area/maintenance/fsmaint)
"bJD" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/effect/decal/cleanable/dirt,/obj/effect/nmpi{tag = "icon-maintguide (NORTHWEST)"; icon_state = "maintguide"; dir = 9},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
"bJE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/engineering{name = "Starboard Solar Access"; req_access_txt = "10"},/turf/simulated/floor/plating,/area/maintenance/fstarboardsolar)
"bJF" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating,/area/maintenance/fstarboardsolar)
@@ -4896,7 +4896,7 @@
"bQh" = (/obj/machinery/door/airlock/glass{autoclose = 0; frequency = 1449; heat_proof = 1; icon_state = "door_locked"; id_tag = "incinerator_airlock_exterior"; locked = 1; name = "Mixing Room Exterior Airlock"; req_access_txt = "12"},/turf/simulated/floor/engine/vacuum,/area/derelictparts/incinerator)
"bQi" = (/turf/simulated/floor/plating,/area/derelictparts/incinerator)
"bQj" = (/obj/machinery/igniter{icon_state = "igniter0"; id_tag = "Incinerator"; on = 0},/turf/simulated/floor/engine/vacuum,/area/derelictparts/incinerator)
-"bQk" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/mob/living/simple_animal/mouse/gray,/turf/simulated/floor{icon_state = "floorscorched1"},/area/derelictparts/incinerator)
+"bQk" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/mob/living/simple_animal/mouse/common/gray,/turf/simulated/floor{icon_state = "floorscorched1"},/area/derelictparts/incinerator)
"bQl" = (/obj/effect/decal/cleanable/dirt,/obj/item/weapon/wrench,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "floorgrime"},/area/derelictparts/incinerator)
"bQm" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "damaged2"},/area/derelictparts/incinerator)
"bQn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "floorgrime"},/area/derelictparts/incinerator)
@@ -4945,7 +4945,7 @@
"bRe" = (/obj/effect/decal/cleanable/blood/splatter,/obj/item/weapon/camera_assembly,/turf/simulated/floor{icon_state = "floorgrime"},/area/derelictparts/medbay)
"bRf" = (/obj/effect/decal/cleanable/blood/splatter,/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor{icon_state = "floorgrime"},/area/derelictparts/medbay)
"bRg" = (/obj/effect/decal/cleanable/blood/splatter,/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "floorgrime"},/area/derelictparts/medbay)
-"bRh" = (/mob/living/simple_animal/mouse/gray,/turf/simulated/floor{icon_state = "floorgrime"},/area/derelictparts/medbay)
+"bRh" = (/mob/living/simple_animal/mouse/common/gray,/turf/simulated/floor{icon_state = "floorgrime"},/area/derelictparts/medbay)
"bRi" = (/obj/effect/decal/cleanable/blood/splatter,/obj/effect/decal/cleanable/dirt,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/closet/crate/medical,/obj/item/stack/medical/ointment,/obj/machinery/power/apc{cell_type = 0; dir = 1; icon_state = "apc1"; opened = 1; pixel_x = 0; pixel_y = 24},/turf/simulated/floor{icon_state = "floorgrime"},/area/derelictparts/medbay)
"bRj" = (/obj/effect/decal/cleanable/dirt,/obj/item/trash/cigbutt,/obj/structure/sink{dir = 1; pixel_y = 25},/turf/simulated/floor{icon_state = "floorgrime"},/area/derelictparts/medbay)
"bRk" = (/obj/item/stack/rods,/turf/simulated/floor{icon_state = "floorgrime"},/area/derelictparts/medbay)
@@ -5156,7 +5156,7 @@
"bVh" = (/obj/structure/closet/l3closet/general,/turf/simulated/floor{icon_state = "floorgrime"},/area/derelictparts/medbay)
"bVi" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating/airless,/area/solar/fstarboard)
"bVj" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating{icon_state = "platingdmg1"},/area/derelictparts/port)
-"bVk" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/mob/living/simple_animal/mouse/brown,/turf/simulated/floor/plating,/area/derelictparts/port)
+"bVk" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/mob/living/simple_animal/mouse/common/brown,/turf/simulated/floor/plating,/area/derelictparts/port)
"bVl" = (/obj/item/weapon/mop,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plating,/area/derelictparts/port)
"bVm" = (/obj/machinery/door/airlock/maintenance{name = "Derelict Parts Access"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/derelictparts/port)
"bVn" = (/obj/item/mounted/poster,/obj/item/device/assembly/signaler,/obj/effect/decal/cleanable/dirt,/obj/item/weapon/stock_parts/manipulator,/turf/simulated/floor/plating,/area/derelictparts/port)
@@ -5644,7 +5644,7 @@
"ceE" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/grille,/turf/simulated/floor/plating,/area/derelictparts/port)
"ceF" = (/obj/effect/decal/cleanable/blood/gibs/robot,/turf/simulated/floor/plating,/area/derelictparts/port)
"ceG" = (/obj/structure/grille/broken,/obj/item/stack/rods,/turf/simulated/floor/plating,/area/derelictparts/port)
-"ceH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/mob/living/simple_animal/mouse/gray,/turf/simulated/floor/plating,/area/derelictparts/port)
+"ceH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/mob/living/simple_animal/mouse/common/gray,/turf/simulated/floor/plating,/area/derelictparts/port)
"ceI" = (/obj/machinery/power/apc{dir = 8; pixel_x = -24; pixel_y = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/item/weapon/mop,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/reagent_containers/glass/bucket,/obj/structure/mopbucket,/turf/simulated/floor,/area/janitor)
"ceJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/janitor)
"ceK" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/landmark/start{name = "Janitor"},/turf/simulated/floor,/area/janitor)
@@ -5744,7 +5744,7 @@
"cgA" = (/obj/machinery/computer/arcade,/turf/simulated/floor{icon_state = "dark"},/area/security/prison)
"cgB" = (/obj/structure/table,/obj/item/weapon/storage/bible,/turf/simulated/floor{icon_state = "dark"},/area/security/prison)
"cgC" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark vault full"},/area/storage/nuke_storage)
-"cgD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/mob/living/simple_animal/mouse/brown/Tom,/turf/simulated/floor{icon_state = "dark"},/area/storage/nuke_storage)
+"cgD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/mob/living/simple_animal/mouse/common/brown/Tom,/turf/simulated/floor{icon_state = "dark"},/area/storage/nuke_storage)
"cgE" = (/obj/item/stack/sheet/cardboard,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/derelictparts/apderelict)
"cgF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/derelictparts/apderelict)
"cgG" = (/obj/effect/decal/cleanable/dirt,/obj/item/stack/rods,/obj/item/weapon/wrench,/turf/simulated/floor/plating,/area/derelictparts/apderelict)
@@ -5897,7 +5897,7 @@
"cjx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/nmpi{tag = "icon-maintguide (EAST)"; icon_state = "maintguide"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/apmaint)
"cjy" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/nmpi{tag = "icon-maintguide (EAST)"; icon_state = "maintguide"; dir = 4},/turf/simulated/floor/plating,/area/maintenance/apmaint)
"cjz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/effect/nmpi{tag = "icon-maintguide (EAST)"; icon_state = "maintguide"; dir = 4},/obj/effect/nmpi{tag = "icon-maintguide (SOUTHWEST)"; icon_state = "maintguide"; dir = 10},/turf/simulated/floor/plating,/area/maintenance/apmaint)
-"cjA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/nmpi{tag = "icon-maintguide (EAST)"; icon_state = "maintguide"; dir = 4},/mob/living/simple_animal/mouse/brown,/turf/simulated/floor/plating,/area/maintenance/apmaint)
+"cjA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/nmpi{tag = "icon-maintguide (EAST)"; icon_state = "maintguide"; dir = 4},/mob/living/simple_animal/mouse/common/brown,/turf/simulated/floor/plating,/area/maintenance/apmaint)
"cjB" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/nmpi{tag = "icon-maintguide (EAST)"; icon_state = "maintguide"; dir = 4},/obj/effect/nmpi{tag = "icon-maintguide (NORTHWEST)"; icon_state = "maintguide"; dir = 9},/turf/simulated/floor/plating,/area/maintenance/apmaint)
"cjC" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/nmpi{tag = "icon-maintguide (NORTHEAST)"; icon_state = "maintguide"; dir = 5},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/apmaint)
"cjD" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/maintenance/apmaint)
@@ -6606,7 +6606,7 @@
"cxe" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (WEST)"; icon_state = "warning"; dir = 8},/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/structure/window{dir = 8},/turf/simulated/floor/plating,/area/security/brig)
"cxf" = (/turf/simulated/wall,/area/security/medical{name = "Security Medbay"})
"cxg" = (/turf/simulated/wall/r_wall,/area/security/medical{name = "Security Medbay"})
-"cxh" = (/mob/living/simple_animal/mouse/brown,/turf/simulated/floor/plating,/area/derelictparts/apderelict)
+"cxh" = (/mob/living/simple_animal/mouse/common/brown,/turf/simulated/floor/plating,/area/derelictparts/apderelict)
"cxi" = (/obj/effect/decal/cleanable/blood/gibs/robot{icon_state = "gibdown"},/turf/simulated/floor/plating,/area/derelictparts/apderelict)
"cxj" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/solar/panel/tracker,/turf/simulated/floor/plating/airless{icon_state = "panelscorched"},/area/solar/aport)
"cxk" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating/airless,/area/solar/aport)
@@ -6701,7 +6701,7 @@
"cyV" = (/obj/item/weapon/stool{pixel_y = 8},/turf/simulated/floor/plating,/area/maintenance/aportsolar)
"cyW" = (/obj/structure/cable,/obj/machinery/power/apc{dir = 4; pixel_x = 24; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/aportsolar)
"cyX" = (/turf/simulated/floor/plating,/area/maintenance/aft)
-"cyY" = (/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/aft)
+"cyY" = (/mob/living/simple_animal/mouse/common,/turf/simulated/floor/plating,/area/maintenance/aft)
"cyZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/nmpi{tag = "icon-maintguide (NORTH)"; icon_state = "maintguide"; dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/aft)
"cza" = (/obj/machinery/alarm{pixel_y = 25},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
"czb" = (/obj/machinery/disposal,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
@@ -11836,7 +11836,7 @@
"euq" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/cobweb,/obj/machinery/power/apc{dir = 1; pixel_y = 24; pixel_x = 0},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/fore)
"eur" = (/obj/machinery/door/airlock/research{name = "Toxins Storage"; req_access_txt = "8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "floorgrime"},/area/science/storage)
"eus" = (/obj/structure/table,/obj/item/weapon/wirecutters,/obj/item/device/t_scanner,/obj/machinery/alarm{pixel_y = 24},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/fore)
-"eut" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/mob/living/simple_animal/mouse/brown,/turf/simulated/floor{icon_state = "floorgrime"},/area/science/storage)
+"eut" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/mob/living/simple_animal/mouse/common/brown,/turf/simulated/floor{icon_state = "floorgrime"},/area/science/storage)
"euu" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{icon_state = "floorgrime"},/area/science/storage)
"euv" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/medical/medbay)
"euw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "floorgrime"},/area/science/storage)
diff --git a/maps/metaclub.dmm b/maps/metaclub.dmm
index d6ee326e3fd..f911a050439 100644
--- a/maps/metaclub.dmm
+++ b/maps/metaclub.dmm
@@ -1060,7 +1060,7 @@
"aut" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"})
"auu" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/maintenance/fpmaint2{name = "Port Maintenance"})
"auv" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"})
-"auw" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"})
+"auw" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/mob/living/simple_animal/mouse/common,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"})
"aux" = (/obj/effect/spawner/lootdrop{loot = list("/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/structure/grille","/obj/item/trash/cigbutt","/obj/item/trash/cheesie","/obj/item/trash/candy","/obj/item/trash/chips","/obj/item/trash/deadmouse","/obj/item/trash/pistachios","/obj/item/trash/plate","/obj/item/trash/popcorn","/obj/item/trash/raisins","/obj/item/trash/sosjerky","/obj/item/trash/syndi_cakes"); name = "maint grille or trash spawner"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"})
"auy" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"})
"auz" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"})
@@ -1595,7 +1595,7 @@
"aEI" = (/obj/structure/rack{dir = 8},/obj/item/weapon/circuitboard/power_control,/obj/item/weapon/cell{maxcharge = 2000},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 2; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "floorgrime"},/area/supply/sorting{name = "\improper Warehouse"})
"aEJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/wall/r_wall,/area/storage/nuke_storage)
"aEK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -30},/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/storage/nuke_storage)
-"aEL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/mob/living/simple_animal/mouse/brown/Tom,/turf/simulated/floor{tag = "icon-vault (SOUTHEAST)"; icon_state = "vault"; dir = 6},/area/storage/nuke_storage)
+"aEL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/mob/living/simple_animal/mouse/common/brown/Tom,/turf/simulated/floor{tag = "icon-vault (SOUTHEAST)"; icon_state = "vault"; dir = 6},/area/storage/nuke_storage)
"aEM" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{tag = "icon-vault"; icon_state = "vault"},/area/storage/nuke_storage)
"aEN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{tag = "icon-vault (SOUTHWEST)"; icon_state = "vault"; dir = 10},/area/storage/nuke_storage)
"aEO" = (/obj/structure/safe,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/obj/abstract/map/spawner/safe/weapon{chance = 50},/obj/abstract/map/spawner/safe/medical{chance = 75},/obj/abstract/map/spawner/safe/medal,/obj/abstract/map/spawner/safe/food,/obj/abstract/map/spawner/safe/clothing,/obj/abstract/map/spawner/safe/any,/turf/simulated/floor{icon_state = "vault"; dir = 4},/area/storage/nuke_storage)
@@ -5843,7 +5843,7 @@
"cis" = (/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/machinery/power/apc{dir = 8; name = "Incinerator APC"; pixel_x = -24; pixel_y = 0},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
"cit" = (/obj/effect/landmark{name = "blobstart"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
"ciu" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
-"civ" = (/obj/structure/disposalpipe/segment{dir = 4},/mob/living/simple_animal/mouse,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
+"civ" = (/obj/structure/disposalpipe/segment{dir = 4},/mob/living/simple_animal/mouse/common,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
"ciw" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/general/visible{dir = 8},/obj/machinery/meter,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
"cix" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/atmospherics/binary/pump{dir = 8; name = "input port pump"},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
"ciy" = (/obj/machinery/light/small{dir = 4},/obj/structure/sign/fire{pixel_x = 32; pixel_y = 0},/obj/machinery/atmospherics/unary/portables_connector{dir = 8; name = "input gas connector port"},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
diff --git a/maps/packedstation.dmm b/maps/packedstation.dmm
index a6d7c19c2be..c3597a118a5 100644
--- a/maps/packedstation.dmm
+++ b/maps/packedstation.dmm
@@ -1654,7 +1654,7 @@
"aFP" = (/obj/machinery/power/apc{dir = 4; name = "_East APC"; pixel_x = 27; pixel_y = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/maintenance/fore)
"aFQ" = (/obj/structure/rack,/obj/item/device/instrument/violin,/obj/item/device/camera,/obj/item/weapon/reagent_containers/food/snacks/pie,/obj/item/device/soundsynth,/obj/machinery/light{dir = 8},/obj/item/device/instrument/guitar,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor{icon_state = "escape"; dir = 9},/area/crew_quarters/theatre)
"aFR" = (/obj/structure/flora/pottedplant/random,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/genetics)
-"aFS" = (/obj/structure/table,/obj/item/weapon/storage/fancy/crayons,/obj/item/weapon/reagent_containers/food/snacks/pie,/obj/machinery/light{dir = 4},/obj/item/mounted/poster,/mob/living/simple_animal/mouse/brown/Tom,/turf/simulated/floor{icon_state = "escape"; dir = 9},/area/crew_quarters/theatre)
+"aFS" = (/obj/structure/table,/obj/item/weapon/storage/fancy/crayons,/obj/item/weapon/reagent_containers/food/snacks/pie,/obj/machinery/light{dir = 4},/obj/item/mounted/poster,/common/brown/Tom,/turf/simulated/floor{icon_state = "escape"; dir = 9},/area/crew_quarters/theatre)
"aFT" = (/obj/machinery/crema_switch{id = 2; pixel_x = -24},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
"aFU" = (/obj/machinery/door/window{dir = 4; name = "Crematorium"; req_access_txt = "27"},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
"aFV" = (/obj/machinery/camera/autoname{dir = 1},/turf/simulated/floor{icon_state = "grimy"},/area/chapel/main)
@@ -2650,7 +2650,7 @@
"aYX" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4; initialize_directions = 11},/turf/simulated/floor/plating,/area/maintenance/asmaint)
"aYY" = (/obj/structure/rack{dir = 8},/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/maintenance/asmaint)
"aYZ" = (/obj/machinery/atmospherics/unary/vent{dir = 1},/obj/structure/catwalk,/turf/space,/area/medical/virology)
-"aZa" = (/mob/living/simple_animal/mouse/black,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
+"aZa" = (/mob/living/simple_animal/mouse/common/black,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"aZb" = (/obj/structure/closet/emcloset,/turf/simulated/floor{icon_state = "blue"; dir = 10},/area/hallway/primary/aft)
"aZc" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/obj/effect/decal/warning_stripes{dir = 4; icon_state = "warning"},/turf/simulated/floor{dir = 4; icon_state = "arrival"},/area/hallway/secondary/entry)
"aZd" = (/obj/effect/decal/warning_stripes{tag = "icon-loading_area (EAST)"; icon_state = "loading_area"; dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor,/area/hallway/secondary/entry)
diff --git a/maps/randomvaults/ironchef.dmm b/maps/randomvaults/ironchef.dmm
index 54c4dd6bf9b..8c61bcd73de 100644
--- a/maps/randomvaults/ironchef.dmm
+++ b/maps/randomvaults/ironchef.dmm
@@ -71,7 +71,7 @@
"bs" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHEAST)"; icon_state = "warning"; dir = 5},/turf/simulated/floor{blocks_air = 0; icon_state = "dark"},/area/vault/ironchef)
"bt" = (/obj/structure/disposalpipe/segment,/obj/effect/decal/warning_stripes{tag = "icon-warning (NORTHWEST)"; icon_state = "warning"; dir = 9},/turf/simulated/floor{blocks_air = 0; icon_state = "dark"},/area/vault/ironchef)
"bu" = (/obj/machinery/processor,/obj/machinery/light{dir = 4},/turf/simulated/floor{blocks_air = 0; icon_state = "dark"},/area/vault/ironchef)
-"bv" = (/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/vault/ironchef)
+"bv" = (/mob/living/simple_animal/mouse/common,/turf/simulated/floor/plating,/area/vault/ironchef)
"bw" = (/obj/machinery/cooking/candy,/turf/simulated/floor{blocks_air = 0; icon_state = "dark"},/area/vault/ironchef)
"bx" = (/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/item/weapon/reagent_containers/food/condiment/saltshaker{pixel_x = -3},/obj/item/weapon/reagent_containers/food/condiment/peppermill,/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/beaker{pixel_x = 5},/obj/item/weapon/reagent_containers/dropper/baster,/turf/simulated/floor{blocks_air = 0; icon_state = "dark"},/area/vault/ironchef)
"by" = (/obj/item/weapon/kitchen/rollingpin,/obj/item/weapon/kitchen/utensil/knife/large/butch/meatcleaver,/obj/structure/table/reinforced,/turf/simulated/floor{blocks_air = 0; icon_state = "dark"},/area/vault/ironchef)
diff --git a/maps/test_box.dmm b/maps/test_box.dmm
index 0fa9b3f7fb6..59e07a9b888 100644
--- a/maps/test_box.dmm
+++ b/maps/test_box.dmm
@@ -1188,7 +1188,7 @@
"awR" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"awS" = (/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"awT" = (/obj/machinery/portable_atmospherics/scrubber,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
-"awU" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/mob/living/simple_animal/mouse/gray,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
+"awU" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/mob/living/simple_animal/mouse/common/gray,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"awV" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"awW" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"awX" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
@@ -1893,7 +1893,7 @@
"aKu" = (/obj/machinery/suit_storage_unit/security,/turf/simulated/floor{icon_state = "dark-markings"; dir = 8},/area/ai_monitored/storage/eva)
"aKv" = (/turf/simulated/floor{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/fore)
"aKw" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor{icon_state = "bluecorner"},/area/hallway/primary/fore)
-"aKx" = (/mob/living/simple_animal/mouse/brown/Tom,/turf/simulated/floor/plating,/area/maintenance/fsmaint)
+"aKx" = (/mob/living/simple_animal/mouse/common/brown/Tom,/turf/simulated/floor/plating,/area/maintenance/fsmaint)
"aKy" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/crew_quarters/sleep)
"aKz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "neutralcorner"},/area/crew_quarters/sleep)
"aKA" = (/obj/machinery/power/apc{pixel_y = -24},/obj/structure/cable,/turf/simulated/floor{icon_state = "neutral"},/area/crew_quarters/sleep)
@@ -1961,7 +1961,7 @@
"aLK" = (/obj/structure/plasticflaps{opacity = 1},/obj/machinery/navbeacon{codes_txt = "delivery;dir=2"; freq = 1400; location = "Bar"},/turf/simulated/floor/plating,/area/crew_quarters/bar)
"aLL" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"aLM" = (/obj/effect/decal/cleanable/spiderling_remains,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
-"aLN" = (/obj/structure/grille/broken,/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
+"aLN" = (/obj/structure/grille/broken,/mob/living/simple_animal/mouse/common,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"aLO" = (/obj/structure/grille,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"aLP" = (/obj/structure/window/barricade/full/block,/turf/simulated/floor/plating,/area/maintenance/ghettotheatre)
"aLQ" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/turf/simulated/floor/plating,/area/maintenance/ghettotheatre)
@@ -2620,7 +2620,7 @@
"aYt" = (/obj/structure/table/woodentable,/obj/item/device/megaphone,/obj/machinery/newscaster{pixel_x = 32},/obj/item/device/soundsynth,/obj/machinery/light{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/theatre)
"aYu" = (/obj/structure/closet/secure_closet/freezer/meat,/obj/machinery/light/small{dir = 8},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
"aYv" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
-"aYw" = (/mob/living/simple_animal/mouse/black/dessert,/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
+"aYw" = (/mob/living/simple_animal/mouse/common/black/dessert,/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
"aYx" = (/obj/machinery/chem_master/snackbar_machine,/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
"aYy" = (/obj/structure/closet/crate/hydroponics,/obj/item/weapon/pickaxe/shovel/spade,/obj/item/weapon/wrench,/obj/item/weapon/screwdriver,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/paper/hydroponics,/obj/item/weapon/book/manual/hydroponics_beekeeping,/obj/item/device/eftpos{eftpos_name = "Botany EFTPOS scanner"},/obj/item/weapon/book/manual/hydroponics_pod_people,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
"aYz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
@@ -3842,7 +3842,7 @@
"bvT" = (/obj/item/weapon/screwdriver,/turf/simulated/floor/plating,/area/maintenance/port)
"bvU" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port)
"bvV" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port)
-"bvW" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/port)
+"bvW" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/mob/living/simple_animal/mouse/common,/turf/simulated/floor/plating,/area/maintenance/port)
"bvX" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port)
"bvY" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port)
"bvZ" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plating,/area/maintenance/port)
@@ -5324,7 +5324,7 @@
"bYt" = (/obj/structure/closet,/turf/simulated/floor/plating,/area/maintenance/asmaint)
"bYu" = (/turf/simulated/wall/r_wall,/area/science/telescience)
"bYv" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/camera{c_tag = "Toxins Storage"; dir = 4},/obj/machinery/camera{c_tag = "Gas Storage Room"; dir = 4; network = list("RD"); pixel_y = -22},/obj/structure/table,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/item/clothing/mask/gas,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/science/storage)
-"bYw" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/mob/living/simple_animal/mouse/white,/turf/simulated/floor,/area/science/storage)
+"bYw" = (/obj/effect/decal/warning_stripes{tag = "icon-warning (EAST)"; icon_state = "warning"; dir = 4},/mob/living/simple_animal/mouse/common/white,/turf/simulated/floor,/area/science/storage)
"bYx" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor{icon_state = "dark"},/area/science/storage)
"bYy" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/effect/decal/warning_stripes{icon_state = "unloading"},/turf/simulated/floor{icon_state = "dark"},/area/science/storage)
"bYz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/firedoor/border_only{name = "Firelock South"},/turf/simulated/floor{dir = 5; icon_state = "whitehall"},/area/science/hallway)
@@ -6106,7 +6106,7 @@
"cnv" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cnw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/space_heater/air_conditioner,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cnx" = (/obj/structure/table,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
-"cny" = (/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
+"cny" = (/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/mob/living/simple_animal/mouse/common,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cnz" = (/obj/structure/rack,/obj/item/clothing/mask/gas,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cnA" = (/obj/structure/closet/wardrobe/green,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cnB" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
@@ -6417,7 +6417,7 @@
"ctu" = (/obj/machinery/cooking/still,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"ctv" = (/obj/machinery/door/airlock/external{req_access_txt = "13"; req_one_access_txt = "13"},/turf/simulated/floor/plating,/area/maintenance/aft)
"ctw" = (/obj/machinery/light/small,/turf/simulated/floor/plating,/area/maintenance/aft)
-"ctx" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/aft)
+"ctx" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/mob/living/simple_animal/mouse/common,/turf/simulated/floor/plating,/area/maintenance/aft)
"cty" = (/obj/structure/cable/yellow{icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 9},/obj/structure/table,/obj/item/weapon/stock_parts/subspace/transmitter,/obj/item/weapon/stock_parts/subspace/transmitter,/turf/simulated/floor,/area/tcomms/storage)
"ctz" = (/obj/structure/cable/yellow{icon_state = "2-4"},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/binary/pump{icon_state = "intact_on"; name = "Nitrogen Pump"; on = 1},/turf/simulated/floor,/area/tcomms/storage)
"ctA" = (/obj/structure/cable/yellow{icon_state = "1-4"},/obj/structure/cable/yellow{icon_state = "1-8"},/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/space_heater,/turf/simulated/floor,/area/tcomms/storage)
@@ -6502,7 +6502,7 @@
"cvb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall/r_wall,/area/science/xenobiology)
"cvc" = (/obj/structure/grille,/obj/structure/window/barricade/full,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cvd" = (/obj/effect/decal/cleanable/greenglow,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
-"cve" = (/mob/living/simple_animal/mouse/black,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
+"cve" = (/mob/living/simple_animal/mouse/common/black,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cvf" = (/obj/structure/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/scanner/meson,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cvg" = (/obj/machinery/atmospherics/unary/vent,/obj/structure/catwalk,/turf/space,/area)
"cvh" = (/turf/simulated/floor/plating,/area/maintenance/incinerator)
@@ -6850,7 +6850,7 @@
"cBL" = (/obj/machinery/door/airlock/glass{autoclose = 0; frequency = 1449; heat_proof = 1; icon_state = "door_locked"; id_tag = "incinerator_airlock_exterior"; locked = 1; name = "Mixing Room Exterior Airlock"; req_access_txt = "12"},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator)
"cBM" = (/obj/machinery/door/airlock/glass{autoclose = 0; frequency = 1449; heat_proof = 1; icon_state = "door_locked"; id_tag = "incinerator_airlock_interior"; locked = 1; name = "Mixing Room Interior Airlock"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/incinerator)
"cBN" = (/obj/machinery/atmospherics/pipe/simple/insulated/visible,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
-"cBO" = (/mob/living/simple_animal/mouse,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
+"cBO" = (/mob/living/simple_animal/mouse/common,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
"cBP" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/maintenance/incinerator)
"cBQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
"cBR" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/obj/machinery/door/airlock/maintenance{name = "Incinerator"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/incinerator)
diff --git a/maps/tgstation-sec.dmm b/maps/tgstation-sec.dmm
index c1adddf5be8..79991fe9867 100644
--- a/maps/tgstation-sec.dmm
+++ b/maps/tgstation-sec.dmm
@@ -330,7 +330,7 @@
"agr" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/space_heater/air_conditioner,/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"ags" = (/obj/effect/decal/warning_stripes{dir = 2; icon_state = "radiation"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"agt" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = -32},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
-"agu" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/mob/living/simple_animal/mouse/gray,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
+"agu" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/mob/living/simple_animal/mouse/common/gray,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"agv" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"agw" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"agx" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
@@ -999,7 +999,7 @@
"atk" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/ai_monitored/storage/eva)
"atl" = (/turf/simulated/floor{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/fore)
"atm" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor{icon_state = "bluecorner"},/area/hallway/primary/fore)
-"atn" = (/mob/living/simple_animal/mouse/brown/Tom,/turf/simulated/floor/plating,/area/maintenance/fsmaint)
+"atn" = (/mob/living/simple_animal/mouse/common/brown/Tom,/turf/simulated/floor/plating,/area/maintenance/fsmaint)
"ato" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/crew_quarters/sleep)
"atp" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "neutralcorner"},/area/crew_quarters/sleep)
"atq" = (/obj/machinery/power/apc{pixel_y = -24},/obj/structure/cable,/turf/simulated/floor{icon_state = "neutral"},/area/crew_quarters/sleep)
@@ -1705,7 +1705,7 @@
"aGO" = (/obj/structure/table/woodentable,/obj/item/device/megaphone,/obj/machinery/newscaster{pixel_x = 32},/obj/item/device/soundsynth,/obj/machinery/light{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/theatre)
"aGP" = (/obj/structure/closet/secure_closet/freezer/meat,/obj/machinery/light/small{dir = 8},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
"aGQ" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
-"aGR" = (/mob/living/simple_animal/mouse/black/dessert,/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
+"aGR" = (/mob/living/simple_animal/mouse/common/black/dessert,/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
"aGS" = (/obj/machinery/chem_master/snackbar_machine,/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
"aGT" = (/obj/structure/closet/crate/hydroponics,/obj/item/weapon/pickaxe/shovel/spade,/obj/item/weapon/wrench,/obj/item/weapon/screwdriver,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/paper/hydroponics,/obj/item/weapon/book/manual/hydroponics_beekeeping,/obj/item/device/eftpos{eftpos_name = "Botany EFTPOS scanner"},/obj/item/weapon/book/manual/hydroponics_pod_people,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
"aGU" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
@@ -2950,7 +2950,7 @@
"beL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plating,/area/maintenance/port)
"beM" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port)
"beN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port)
-"beO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/port)
+"beO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/mob/living/simple_animal/mouse/common,/turf/simulated/floor/plating,/area/maintenance/port)
"beP" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port)
"beQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port)
"beR" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plating,/area/maintenance/port)
@@ -4949,7 +4949,7 @@
"bTz" = (/obj/structure/table,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"bTA" = (/obj/machinery/light/small{dir = 1; invisibility = 0},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"bTB" = (/obj/structure/rack,/obj/item/clothing/mask/gas,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
-"bTC" = (/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
+"bTC" = (/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/mob/living/simple_animal/mouse/common,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"bTD" = (/obj/structure/closet/wardrobe/green,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"bTE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"bTF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
@@ -5226,7 +5226,7 @@
"bYT" = (/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"bYU" = (/obj/machinery/cooking/still,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"bYV" = (/obj/machinery/power/apc{dir = 8; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/maintenance/aft)
-"bYW" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/aft)
+"bYW" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/mob/living/simple_animal/mouse/common,/turf/simulated/floor/plating,/area/maintenance/aft)
"bYX" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{current_temperature = 60; dir = 4; on = 1},/turf/simulated/floor{icon_state = "dark"},/area/tcomms/storage)
"bYY" = (/obj/effect/decal/cleanable/blood/oil,/obj/machinery/atmospherics/pipe/manifold/insulated/visible/blue,/turf/simulated/floor{icon_state = "dark"},/area/tcomms/storage)
"bYZ" = (/obj/machinery/atmospherics/pipe/simple/insulated/visible/blue{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/meter,/turf/simulated/floor{icon_state = "dark"},/area/tcomms/storage)
@@ -5318,7 +5318,7 @@
"caH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall/r_wall,/area/science/xenobiology)
"caI" = (/obj/structure/grille,/obj/structure/window/barricade/full,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"caJ" = (/obj/effect/decal/cleanable/greenglow,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
-"caK" = (/mob/living/simple_animal/mouse/black,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
+"caK" = (/mob/living/simple_animal/mouse/common/black,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"caL" = (/obj/structure/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/scanner/meson,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"caM" = (/obj/machinery/atmospherics/unary/vent,/obj/structure/catwalk,/turf/space,/area)
"caN" = (/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
@@ -5575,7 +5575,7 @@
"cfF" = (/obj/machinery/door/airlock/glass{autoclose = 0; frequency = 1449; heat_proof = 1; icon_state = "door_locked"; id_tag = "incinerator_airlock_exterior"; locked = 1; name = "Mixing Room Exterior Airlock"; req_access_txt = "12"},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator)
"cfH" = (/obj/machinery/door/airlock/glass{autoclose = 0; frequency = 1449; heat_proof = 1; icon_state = "door_locked"; id_tag = "incinerator_airlock_interior"; locked = 1; name = "Mixing Room Interior Airlock"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/incinerator)
"cfI" = (/obj/machinery/atmospherics/pipe/simple/insulated/visible,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
-"cfJ" = (/mob/living/simple_animal/mouse,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
+"cfJ" = (/mob/living/simple_animal/mouse/common,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
"cfK" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/maintenance/incinerator)
"cfL" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
"cfM" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/obj/machinery/door/airlock/maintenance{name = "Incinerator"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/incinerator)
@@ -10139,7 +10139,7 @@
"dPB" = (/obj/structure/transit_tube{icon_state = "N-SW"},/turf/unsimulated/mineral,/area/mine/explored)
"dPC" = (/obj/machinery/power/apc{dir = 8; pixel_x = -24},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/obj/structure/cable{d2 = 2; icon_state = "0-2"; pixel_y = 0},/turf/simulated/floor{icon_state = "floorgrime"},/area/research_outpost/maintstore1{icon_state = "toxstorage"; name = "Toxins Storage"})
"dPD" = (/turf/simulated/floor{icon_state = "floorgrime"},/area/research_outpost/maintstore1{icon_state = "toxstorage"; name = "Toxins Storage"})
-"dPE" = (/mob/living/simple_animal/mouse/white,/turf/simulated/floor,/area/research_outpost/maintstore1{icon_state = "toxstorage"; name = "Toxins Storage"})
+"dPE" = (/mob/living/simple_animal/mouse/common/white,/turf/simulated/floor,/area/research_outpost/maintstore1{icon_state = "toxstorage"; name = "Toxins Storage"})
"dPF" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{icon_state = "floorgrime"},/area/research_outpost/maintstore1{icon_state = "toxstorage"; name = "Toxins Storage"})
"dPG" = (/obj/structure/transit_tube{icon_state = "D-NE"},/turf/space,/area)
"dPH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/science/test_area)
diff --git a/maps/tgstation-snow.dmm b/maps/tgstation-snow.dmm
index e0ebda68141..152b3571159 100644
--- a/maps/tgstation-snow.dmm
+++ b/maps/tgstation-snow.dmm
@@ -1183,7 +1183,7 @@
"awM" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/space_heater/air_conditioner,/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"awN" = (/obj/effect/decal/warning_stripes{dir = 2; icon_state = "radiation"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"awO" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = -32},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
-"awP" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/mob/living/simple_animal/mouse/gray,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
+"awP" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/mob/living/simple_animal/mouse/common/gray,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"awQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"awR" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"awS" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
@@ -1856,7 +1856,7 @@
"aJJ" = (/obj/machinery/suit_storage_unit/security,/turf/simulated/floor{icon_state = "dark-markings"; dir = 8},/area/ai_monitored/storage/eva)
"aJK" = (/turf/simulated/floor{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/fore)
"aJL" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor{icon_state = "bluecorner"},/area/hallway/primary/fore)
-"aJM" = (/mob/living/simple_animal/mouse/brown/Tom,/turf/simulated/floor/plating,/area/maintenance/fsmaint)
+"aJM" = (/mob/living/simple_animal/mouse/common/brown/Tom,/turf/simulated/floor/plating,/area/maintenance/fsmaint)
"aJN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/crew_quarters/sleep)
"aJO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "neutralcorner"},/area/crew_quarters/sleep)
"aJP" = (/obj/machinery/power/apc{pixel_y = -24},/obj/structure/cable,/turf/simulated/floor{icon_state = "neutral"},/area/crew_quarters/sleep)
@@ -2562,7 +2562,7 @@
"aXn" = (/obj/structure/table/woodentable,/obj/item/device/megaphone,/obj/machinery/newscaster{pixel_x = 32},/obj/item/device/soundsynth,/obj/machinery/light{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/theatre)
"aXo" = (/obj/structure/closet/secure_closet/freezer/meat,/obj/machinery/light/small{dir = 8},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
"aXp" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
-"aXq" = (/mob/living/simple_animal/mouse/black/dessert,/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
+"aXq" = (/mob/living/simple_animal/mouse/common/black/dessert,/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
"aXr" = (/obj/machinery/chem_master/snackbar_machine,/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
"aXs" = (/obj/structure/closet/crate/hydroponics,/obj/item/weapon/pickaxe/shovel/spade,/obj/item/weapon/wrench,/obj/item/weapon/screwdriver,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/paper/hydroponics,/obj/item/weapon/book/manual/hydroponics_beekeeping,/obj/item/device/eftpos{eftpos_name = "Botany EFTPOS scanner"},/obj/item/weapon/book/manual/hydroponics_pod_people,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
"aXt" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
@@ -3807,7 +3807,7 @@
"bvk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plating,/area/maintenance/port)
"bvl" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port)
"bvm" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port)
-"bvn" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/port)
+"bvn" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/mob/living/simple_animal/mouse/common,/turf/simulated/floor/plating,/area/maintenance/port)
"bvo" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port)
"bvp" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port)
"bvq" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plating,/area/maintenance/port)
@@ -5927,7 +5927,7 @@
"cjY" = (/obj/structure/table,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cjZ" = (/obj/machinery/light/small{dir = 1; invisibility = 0},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cka" = (/obj/structure/rack,/obj/item/clothing/mask/gas,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
-"ckb" = (/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
+"ckb" = (/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/mob/living/simple_animal/mouse/common,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"ckc" = (/obj/structure/closet/wardrobe/green,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"ckd" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cke" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
@@ -6207,7 +6207,7 @@
"cps" = (/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cpt" = (/obj/machinery/cooking/still,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cpu" = (/obj/machinery/power/apc{dir = 8; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/maintenance/aft)
-"cpv" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/aft)
+"cpv" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/mob/living/simple_animal/mouse/common,/turf/simulated/floor/plating,/area/maintenance/aft)
"cpw" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{current_temperature = 60; dir = 4; on = 1},/turf/simulated/floor{icon_state = "dark"},/area/tcomms/storage)
"cpx" = (/obj/effect/decal/cleanable/blood/oil,/obj/machinery/atmospherics/pipe/manifold/insulated/visible/blue,/turf/simulated/floor{icon_state = "dark"},/area/tcomms/storage)
"cpy" = (/obj/machinery/atmospherics/pipe/simple/insulated/visible/blue{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/meter,/turf/simulated/floor{icon_state = "dark"},/area/tcomms/storage)
@@ -6299,7 +6299,7 @@
"crg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall/r_wall,/area/science/xenobiology)
"crh" = (/obj/structure/grille,/obj/structure/window/barricade/full,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cri" = (/obj/effect/decal/cleanable/greenglow,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
-"crj" = (/mob/living/simple_animal/mouse/black,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
+"crj" = (/mob/living/simple_animal/mouse/common/black,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"crk" = (/obj/structure/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/scanner/meson,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"crl" = (/obj/machinery/atmospherics/unary/vent,/obj/structure/catwalk,/turf/unsimulated/floor/snow,/area)
"crm" = (/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
@@ -6557,7 +6557,7 @@
"cwe" = (/obj/effect/decal/cleanable/soot,/turf/simulated/floor/plating,/area/maintenance/incinerator)
"cwf" = (/obj/machinery/door/airlock/glass{autoclose = 0; frequency = 1449; heat_proof = 1; icon_state = "door_locked"; id_tag = "incinerator_airlock_interior"; locked = 1; name = "Mixing Room Interior Airlock"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/incinerator)
"cwg" = (/obj/machinery/atmospherics/pipe/simple/insulated/visible,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
-"cwh" = (/mob/living/simple_animal/mouse,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
+"cwh" = (/mob/living/simple_animal/mouse/common,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
"cwi" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/maintenance/incinerator)
"cwj" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
"cwk" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/obj/machinery/door/airlock/maintenance{name = "Incinerator"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/incinerator)
@@ -11124,7 +11124,7 @@
"efV" = (/obj/structure/transit_tube{icon_state = "N-SW"},/turf/unsimulated/mineral/snow,/area/mine/explored)
"efW" = (/obj/machinery/power/apc{dir = 8; pixel_x = -24},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/obj/structure/cable{d2 = 2; icon_state = "0-2"; pixel_y = 0},/turf/simulated/floor{icon_state = "floorgrime"},/area/research_outpost/maintstore1{icon_state = "toxstorage"; name = "Toxins Storage"})
"efX" = (/turf/simulated/floor{icon_state = "floorgrime"},/area/research_outpost/maintstore1{icon_state = "toxstorage"; name = "Toxins Storage"})
-"efY" = (/mob/living/simple_animal/mouse/white,/turf/simulated/floor,/area/research_outpost/maintstore1{icon_state = "toxstorage"; name = "Toxins Storage"})
+"efY" = (/mob/living/simple_animal/mouse/common/white,/turf/simulated/floor,/area/research_outpost/maintstore1{icon_state = "toxstorage"; name = "Toxins Storage"})
"efZ" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{icon_state = "floorgrime"},/area/research_outpost/maintstore1{icon_state = "toxstorage"; name = "Toxins Storage"})
"ega" = (/obj/structure/transit_tube{icon_state = "D-NE"},/turf/unsimulated/floor/snow,/area)
"egb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/science/test_area)
diff --git a/maps/tgstation.dmm b/maps/tgstation.dmm
index c4c99e892a9..804d71c061b 100644
--- a/maps/tgstation.dmm
+++ b/maps/tgstation.dmm
@@ -1178,7 +1178,7 @@
"awH" = (/obj/item/weapon/stool,/turf/simulated/floor/plating,/area/maintenance/fsmaint)
"awI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"awJ" = (/obj/structure/rack,/obj/item/weapon/cell/crap,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
-"awK" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/mob/living/simple_animal/mouse/gray,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
+"awK" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/mob/living/simple_animal/mouse/common/gray,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"awL" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = -32},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"awM" = (/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
"awN" = (/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
@@ -1887,7 +1887,7 @@
"aKo" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor{icon_state = "white"},/area/security/medical)
"aKp" = (/turf/simulated/floor{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/fore)
"aKq" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor{icon_state = "bluecorner"},/area/hallway/primary/fore)
-"aKr" = (/mob/living/simple_animal/mouse/brown/Tom,/turf/simulated/floor/plating,/area/maintenance/fsmaint)
+"aKr" = (/mob/living/simple_animal/mouse/common/brown/Tom,/turf/simulated/floor/plating,/area/maintenance/fsmaint)
"aKs" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/crew_quarters/sleep)
"aKt" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "neutralcorner"},/area/crew_quarters/sleep)
"aKu" = (/obj/machinery/power/apc{pixel_y = -24},/obj/structure/cable,/turf/simulated/floor{icon_state = "neutral"},/area/crew_quarters/sleep)
@@ -2602,7 +2602,7 @@
"aYc" = (/obj/structure/table/woodentable,/obj/item/device/megaphone,/obj/machinery/newscaster{pixel_x = 32},/obj/item/device/soundsynth,/obj/machinery/light{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/theatre)
"aYd" = (/obj/structure/closet/secure_closet/freezer/meat,/obj/machinery/light/small{dir = 8},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
"aYe" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
-"aYf" = (/mob/living/simple_animal/mouse/black/dessert,/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
+"aYf" = (/mob/living/simple_animal/mouse/common/black/dessert,/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
"aYg" = (/obj/machinery/chem_master/snackbar_machine,/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen)
"aYh" = (/obj/structure/closet/crate/hydroponics,/obj/item/weapon/pickaxe/shovel/spade,/obj/item/weapon/wrench,/obj/item/weapon/screwdriver,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/paper/hydroponics,/obj/item/weapon/book/manual/hydroponics_beekeeping,/obj/item/device/eftpos{eftpos_name = "Botany EFTPOS scanner"},/obj/item/weapon/book/manual/hydroponics_pod_people,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
"aYi" = (/obj/machinery/seed_extractor,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/hydroponics)
@@ -3824,7 +3824,7 @@
"bvC" = (/obj/item/weapon/screwdriver,/turf/simulated/floor/plating,/area/maintenance/port)
"bvD" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port)
"bvE" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port)
-"bvF" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/port)
+"bvF" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/mob/living/simple_animal/mouse/common,/turf/simulated/floor/plating,/area/maintenance/port)
"bvG" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port)
"bvH" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port)
"bvI" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plating,/area/maintenance/port)
@@ -5492,7 +5492,7 @@
"cbG" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{dir = 8; icon_state = "darkpurple"; tag = "icon-dark floor stripe (NORTH)"},/area/science/breakroom)
"cbH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{dir = 5; icon_state = "whitehall"},/area/science/hallway)
"cbI" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{icon_state = "white"},/area/science/hallway)
-"cbJ" = (/mob/living/simple_animal/mouse/white,/turf/simulated/floor,/area/research_outpost/maintstore1{icon_state = "toxstorage"; name = "Toxins Storage"})
+"cbJ" = (/mob/living/simple_animal/mouse/common/white,/turf/simulated/floor,/area/research_outpost/maintstore1{icon_state = "toxstorage"; name = "Toxins Storage"})
"cbK" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor{icon_state = "floorgrime"},/area/research_outpost/maintstore1{icon_state = "toxstorage"; name = "Toxins Storage"})
"cbL" = (/obj/machinery/light_switch{pixel_x = -27; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{icon_state = "floorgrime"},/area/research_outpost/maintstore1{icon_state = "toxstorage"; name = "Toxins Storage"})
"cbM" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor{icon_state = "floorgrime"},/area/research_outpost/maintstore1{icon_state = "toxstorage"; name = "Toxins Storage"})
@@ -6087,7 +6087,7 @@
"cnd" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cne" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/research_outpost/dorm2{icon_state = "toxlab"; name = "Toxins"})
"cnf" = (/obj/structure/table,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
-"cng" = (/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
+"cng" = (/obj/machinery/power/apc{dir = 1; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/mob/living/simple_animal/mouse/common,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cnh" = (/obj/structure/rack,/obj/item/clothing/mask/gas,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cni" = (/obj/structure/closet/wardrobe/green,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cnj" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
@@ -6483,7 +6483,7 @@
"cuJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall/r_wall,/area/science/xenobiology)
"cuK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1; pixel_y = 1},/obj/structure/window/reinforced{dir = 4; one_way = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint)
"cuL" = (/obj/effect/decal/cleanable/greenglow,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
-"cuM" = (/mob/living/simple_animal/mouse/black,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
+"cuM" = (/mob/living/simple_animal/mouse/common/black,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cuN" = (/obj/structure/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/scanner/meson,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
"cuO" = (/obj/machinery/atmospherics/unary/vent,/obj/structure/catwalk,/turf/space,/area)
"cuP" = (/turf/simulated/floor/plating,/area/maintenance/incinerator)
@@ -6831,7 +6831,7 @@
"cBt" = (/obj/machinery/door/airlock/glass{autoclose = 0; frequency = 1449; heat_proof = 1; icon_state = "door_locked"; id_tag = "incinerator_airlock_exterior"; locked = 1; name = "Mixing Room Exterior Airlock"; req_access_txt = "12"},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator)
"cBu" = (/obj/machinery/door/airlock/glass{autoclose = 0; frequency = 1449; heat_proof = 1; icon_state = "door_locked"; id_tag = "incinerator_airlock_interior"; locked = 1; name = "Mixing Room Interior Airlock"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/incinerator)
"cBv" = (/obj/machinery/atmospherics/pipe/simple/insulated/visible,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
-"cBw" = (/mob/living/simple_animal/mouse,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
+"cBw" = (/mob/living/simple_animal/mouse/common,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
"cBx" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/maintenance/incinerator)
"cBy" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator)
"cBz" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/obj/machinery/door/airlock/maintenance{name = "Incinerator"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/incinerator)
@@ -12933,7 +12933,7 @@
"ePD" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/maintenance/aft)
"ePE" = (/obj/item/stack/rods,/turf/simulated/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/maintenance/aft)
"ePF" = (/obj/structure/grille/broken,/obj/item/weapon/shard,/obj/item/tape/engineering{icon_state = "engineering_door"},/obj/structure/window/reinforced/tinted{dir = 1},/turf/simulated/floor/plating,/area/tcomms/storage)
-"ePG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/maintenance/aft)
+"ePG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/mob/living/simple_animal/mouse/common,/turf/simulated/floor/plating,/area/maintenance/aft)
"ePH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/fpmaint)
"ePI" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/fpmaint)
"ePJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/obj/structure/grille/broken,/turf/simulated/floor/plating,/area/maintenance/fpmaint)