diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index 21bdd8d8075..c4aae6e3200 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -58,7 +58,7 @@
#define RESPIRATION_OXYGEN (1 << 0)
#define RESPIRATION_N2 (1 << 1)
#define RESPIRATION_PLASMA (1 << 2)
-#define DEFAULT_BODYPART_ICON_ORGANIC 'icons/mob/species/human/bodyparts_greyscale.dmi'
+#define DEFAULT_BODYPART_ICON_ORGANIC 'icons/mob/human/bodyparts_greyscale.dmi'
#define DEFAULT_BODYPART_ICON_ROBOTIC 'icons/mob/augmentation/augments.dmi'
#define MONKEY_BODYPART "monkey"
diff --git a/code/datums/bodypart_overlays/emote_bodypart_overlay.dm b/code/datums/bodypart_overlays/emote_bodypart_overlay.dm
index 4143efb67db..524dd176056 100644
--- a/code/datums/bodypart_overlays/emote_bodypart_overlay.dm
+++ b/code/datums/bodypart_overlays/emote_bodypart_overlay.dm
@@ -1,6 +1,6 @@
///Variant of bodypart_overlay for displaying emote overlays. See [/datum/emote/living/blush/run_emote] for an example on how to use one of these.
/datum/bodypart_overlay/simple/emote
- icon = 'icons/mob/species/human/emote_visuals.dmi'
+ icon = 'icons/mob/human/emote_visuals.dmi'
///The body zone to attach the overlay to, overlay won't be added if no bodypart can be found with this
var/attached_body_zone = BODY_ZONE_CHEST
///The feature key used to figure out what specific bodily feature we offset this to follow
diff --git a/code/datums/bodypart_overlays/simple_bodypart_overlay.dm b/code/datums/bodypart_overlays/simple_bodypart_overlay.dm
index 00df41a89e3..72fef44b2d4 100644
--- a/code/datums/bodypart_overlays/simple_bodypart_overlay.dm
+++ b/code/datums/bodypart_overlays/simple_bodypart_overlay.dm
@@ -4,7 +4,7 @@
///Icon state of the overlay
var/icon_state
///Icon of the overlay
- var/icon = 'icons/mob/species/misc/bodypart_overlay_simple.dmi'
+ var/icon = 'icons/mob/human/species/misc/bodypart_overlay_simple.dmi'
///Color we apply to our overlay (none by default)
var/draw_color
diff --git a/code/datums/sprite_accessories.dm b/code/datums/sprite_accessories.dm
index 31ad5684de8..b6efb687014 100644
--- a/code/datums/sprite_accessories.dm
+++ b/code/datums/sprite_accessories.dm
@@ -84,7 +84,7 @@
// Hair Definitions //
//////////////////////
/datum/sprite_accessory/hair
- icon = 'icons/mob/species/human/human_face.dmi' // default icon for all hairs
+ icon = 'icons/mob/human/human_face.dmi' // default icon for all hairs
// please make sure they're sorted alphabetically and, where needed, categorized
// try to capitalize the names please~
@@ -832,7 +832,7 @@
*/
/datum/sprite_accessory/gradient
- icon = 'icons/mob/species/hair_gradients.dmi'
+ icon = 'icons/mob/human/species/hair_gradients.dmi'
///whether this gradient applies to hair and/or beards. Some gradients do not work well on beards.
var/gradient_category = GRADIENT_APPLIES_TO_HAIR|GRADIENT_APPLIES_TO_FACIAL_HAIR
@@ -923,7 +923,7 @@
/////////////////////////////
/datum/sprite_accessory/facial_hair
- icon = 'icons/mob/species/human/human_face.dmi'
+ icon = 'icons/mob/human/human_face.dmi'
gender = MALE // barf (unless you're a dorf, dorfs dig chix w/ beards :P)
em_block = TRUE
@@ -1720,7 +1720,7 @@
/////////////////////////////
/datum/sprite_accessory/body_markings
- icon = 'icons/mob/species/lizard/lizard_misc.dmi'
+ icon = 'icons/mob/human/species/lizard/lizard_misc.dmi'
/datum/sprite_accessory/body_markings/none
name = "None"
@@ -1745,7 +1745,7 @@
em_block = TRUE
/datum/sprite_accessory/tails/lizard
- icon = 'icons/mob/species/lizard/lizard_tails.dmi'
+ icon = 'icons/mob/human/species/lizard/lizard_tails.dmi'
/datum/sprite_accessory/tails/lizard/smooth
name = "Smooth"
@@ -1765,18 +1765,18 @@
/datum/sprite_accessory/tails/human/cat
name = "Cat"
- icon = 'icons/mob/species/human/cat_features.dmi'
+ icon = 'icons/mob/human/cat_features.dmi'
icon_state = "default"
color_src = HAIR_COLOR
/datum/sprite_accessory/tails/monkey
name = "Monkey"
- icon = 'icons/mob/species/monkey/monkey_tail.dmi'
+ icon = 'icons/mob/human/species/monkey/monkey_tail.dmi'
icon_state = "monkey"
color_src = FALSE
/datum/sprite_accessory/pod_hair
- icon = 'icons/mob/species/podperson_hair.dmi'
+ icon = 'icons/mob/human/species/podperson_hair.dmi'
em_block = TRUE
/datum/sprite_accessory/pod_hair/ivy
@@ -1820,7 +1820,7 @@
icon_state = "hibiscus"
/datum/sprite_accessory/snouts
- icon = 'icons/mob/species/lizard/lizard_misc.dmi'
+ icon = 'icons/mob/human/species/lizard/lizard_misc.dmi'
em_block = TRUE
/datum/sprite_accessory/snouts/sharp
@@ -1840,7 +1840,7 @@
icon_state = "roundlight"
/datum/sprite_accessory/horns
- icon = 'icons/mob/species/lizard/lizard_misc.dmi'
+ icon = 'icons/mob/human/species/lizard/lizard_misc.dmi'
em_block = TRUE
/datum/sprite_accessory/horns/none
@@ -1880,7 +1880,7 @@
icon_state = "lbroken"
/datum/sprite_accessory/ears
- icon = 'icons/mob/species/human/cat_features.dmi'
+ icon = 'icons/mob/human/cat_features.dmi'
em_block = TRUE
/datum/sprite_accessory/ears/none
@@ -1894,7 +1894,7 @@
color_src = HAIR_COLOR
/datum/sprite_accessory/ears/fox
- icon = 'icons/mob/species/human/fox_features.dmi'
+ icon = 'icons/mob/human/fox_features.dmi'
name = "Fox"
icon_state = "fox"
hasinner = TRUE
@@ -1906,11 +1906,11 @@
icon_state = "none"
/datum/sprite_accessory/wings
- icon = 'icons/mob/species/wings.dmi'
+ icon = 'icons/mob/human/species/wings.dmi'
em_block = TRUE
/datum/sprite_accessory/wings_open
- icon = 'icons/mob/species/wings.dmi'
+ icon = 'icons/mob/human/species/wings.dmi'
em_block = TRUE
/datum/sprite_accessory/wings/angel
@@ -2031,7 +2031,7 @@
dimension_y = 32
/datum/sprite_accessory/frills
- icon = 'icons/mob/species/lizard/lizard_misc.dmi'
+ icon = 'icons/mob/human/species/lizard/lizard_misc.dmi'
/datum/sprite_accessory/frills/none
name = "None"
@@ -2050,11 +2050,11 @@
icon_state = "aqua"
/datum/sprite_accessory/spines
- icon = 'icons/mob/species/lizard/lizard_spines.dmi'
+ icon = 'icons/mob/human/species/lizard/lizard_spines.dmi'
em_block = TRUE
/datum/sprite_accessory/spines_animated
- icon = 'icons/mob/species/lizard/lizard_spines.dmi'
+ icon = 'icons/mob/human/species/lizard/lizard_spines.dmi'
em_block = TRUE
/datum/sprite_accessory/spines/none
@@ -2116,7 +2116,7 @@
name = DIGITIGRADE_LEGS
/datum/sprite_accessory/caps
- icon = 'icons/mob/species/mush_cap.dmi'
+ icon = 'icons/mob/human/species/mush_cap.dmi'
color_src = HAIR_COLOR
em_block = TRUE
@@ -2132,7 +2132,7 @@
/datum/sprite_accessory/moth_wings
- icon = 'icons/mob/species/moth/moth_wings.dmi'
+ icon = 'icons/mob/human/species/moth/moth_wings.dmi'
color_src = null
em_block = TRUE
@@ -2234,7 +2234,7 @@
icon_state = "moffra"
/datum/sprite_accessory/moth_antennae //Finally splitting the sprite
- icon = 'icons/mob/species/moth/moth_antennae.dmi'
+ icon = 'icons/mob/human/species/moth/moth_antennae.dmi'
color_src = null
/datum/sprite_accessory/moth_antennae/plain
@@ -2321,7 +2321,7 @@
icon_state = "moffra"
/datum/sprite_accessory/moth_markings // the markings that moths can have. finally something other than the boring tan
- icon = 'icons/mob/species/moth/moth_markings.dmi'
+ icon = 'icons/mob/human/species/moth/moth_markings.dmi'
color_src = null
/datum/sprite_accessory/moth_markings/none
diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm
index df989cdb1bc..fc07a229251 100644
--- a/code/game/objects/effects/decals/cleanable/humans.dm
+++ b/code/game/objects/effects/decals/cleanable/humans.dm
@@ -314,11 +314,11 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache)
if(species == "unknown")
. += "Some feet."
else if(species == SPECIES_MONKEY)
- . += "[icon2html('icons/mob/species/human/human.dmi', user, "monkey")] Some monkey feet."
+ . += "[icon2html('icons/mob/human/human.dmi', user, "monkey")] Some monkey feet."
else if(species == SPECIES_HUMAN)
- . += "[icon2html('icons/mob/species/human/bodyparts.dmi', user, "default_human_l_leg")] Some human feet."
+ . += "[icon2html('icons/mob/human/bodyparts.dmi', user, "default_human_l_leg")] Some human feet."
else
- . += "[icon2html('icons/mob/species/human/bodyparts.dmi', user, "[species]_l_leg")] Some [species] feet."
+ . += "[icon2html('icons/mob/human/bodyparts.dmi', user, "[species]_l_leg")] Some [species] feet."
/obj/effect/decal/cleanable/blood/footprints/replace_decal(obj/effect/decal/cleanable/C)
if(blood_state != C.blood_state) //We only replace footprints of the same type as us
diff --git a/code/game/objects/items/stacks/golem_food/golem_status_effects.dm b/code/game/objects/items/stacks/golem_food/golem_status_effects.dm
index 54d6f1c39cb..5ed7fcd4682 100644
--- a/code/game/objects/items/stacks/golem_food/golem_status_effects.dm
+++ b/code/game/objects/items/stacks/golem_food/golem_status_effects.dm
@@ -99,7 +99,7 @@
/// Body part overlays applied by golem status effects
/datum/bodypart_overlay/simple/golem_overlay
- icon = 'icons/mob/species/golems.dmi'
+ icon = 'icons/mob/human/species/golems.dmi'
layers = ALL_EXTERNAL_OVERLAYS
///The bodypart that the overlay is currently applied to
var/datum/weakref/attached_bodypart
diff --git a/code/game/objects/structures/mannequin.dm b/code/game/objects/structures/mannequin.dm
index c568c0a1261..ad9588d5aa8 100644
--- a/code/game/objects/structures/mannequin.dm
+++ b/code/game/objects/structures/mannequin.dm
@@ -6,7 +6,7 @@
/obj/structure/mannequin
name = "mannequin"
desc = "Oh, so this is a dress-up game now."
- icon = 'icons/mob/species/human/mannequin.dmi'
+ icon = 'icons/mob/human/mannequin.dmi'
icon_state = "mannequin_wood_male"
density = TRUE
resistance_flags = FLAMMABLE
diff --git a/code/modules/client/preferences/clothing.dm b/code/modules/client/preferences/clothing.dm
index df71be9a6b1..fae46b31be9 100644
--- a/code/modules/client/preferences/clothing.dm
+++ b/code/modules/client/preferences/clothing.dm
@@ -2,7 +2,7 @@
var/icon/lower_half = icon('icons/blanks/32x32.dmi', "nothing")
for (var/icon in icons)
- lower_half.Blend(icon('icons/mob/species/human/bodyparts_greyscale.dmi', icon), ICON_OVERLAY)
+ lower_half.Blend(icon('icons/mob/human/bodyparts_greyscale.dmi', icon), ICON_OVERLAY)
var/list/values = list()
@@ -95,13 +95,13 @@
should_generate_icons = TRUE
/datum/preference/choiced/undershirt/init_possible_values()
- var/icon/body = icon('icons/mob/species/human/bodyparts_greyscale.dmi', "human_r_leg")
- body.Blend(icon('icons/mob/species/human/bodyparts_greyscale.dmi', "human_l_leg"), ICON_OVERLAY)
- body.Blend(icon('icons/mob/species/human/bodyparts_greyscale.dmi', "human_r_arm"), ICON_OVERLAY)
- body.Blend(icon('icons/mob/species/human/bodyparts_greyscale.dmi', "human_l_arm"), ICON_OVERLAY)
- body.Blend(icon('icons/mob/species/human/bodyparts_greyscale.dmi', "human_r_hand"), ICON_OVERLAY)
- body.Blend(icon('icons/mob/species/human/bodyparts_greyscale.dmi', "human_l_hand"), ICON_OVERLAY)
- body.Blend(icon('icons/mob/species/human/bodyparts_greyscale.dmi', "human_chest_m"), ICON_OVERLAY)
+ var/icon/body = icon('icons/mob/human/bodyparts_greyscale.dmi', "human_r_leg")
+ body.Blend(icon('icons/mob/human/bodyparts_greyscale.dmi', "human_l_leg"), ICON_OVERLAY)
+ body.Blend(icon('icons/mob/human/bodyparts_greyscale.dmi', "human_r_arm"), ICON_OVERLAY)
+ body.Blend(icon('icons/mob/human/bodyparts_greyscale.dmi', "human_l_arm"), ICON_OVERLAY)
+ body.Blend(icon('icons/mob/human/bodyparts_greyscale.dmi', "human_r_hand"), ICON_OVERLAY)
+ body.Blend(icon('icons/mob/human/bodyparts_greyscale.dmi', "human_l_hand"), ICON_OVERLAY)
+ body.Blend(icon('icons/mob/human/bodyparts_greyscale.dmi', "human_chest_m"), ICON_OVERLAY)
var/list/values = list()
diff --git a/code/modules/client/preferences/species_features/basic.dm b/code/modules/client/preferences/species_features/basic.dm
index da49610a930..5cf0fc5905f 100644
--- a/code/modules/client/preferences/species_features/basic.dm
+++ b/code/modules/client/preferences/species_features/basic.dm
@@ -1,7 +1,7 @@
/proc/generate_possible_values_for_sprite_accessories_on_head(accessories)
var/list/values = possible_values_for_sprite_accessory_list(accessories)
- var/icon/head_icon = icon('icons/mob/species/human/bodyparts_greyscale.dmi', "human_head_m")
+ var/icon/head_icon = icon('icons/mob/human/bodyparts_greyscale.dmi', "human_head_m")
head_icon.Blend(skintone2hex("caucasian1"), ICON_MULTIPLY)
for (var/name in values)
diff --git a/code/modules/client/preferences/species_features/ethereal.dm b/code/modules/client/preferences/species_features/ethereal.dm
index 56fe5089589..ba0f3d3a202 100644
--- a/code/modules/client/preferences/species_features/ethereal.dm
+++ b/code/modules/client/preferences/species_features/ethereal.dm
@@ -8,12 +8,12 @@
/datum/preference/choiced/ethereal_color/init_possible_values()
var/list/values = list()
- var/icon/ethereal_base = icon('icons/mob/species/ethereal/bodyparts.dmi', "ethereal_head")
- ethereal_base.Blend(icon('icons/mob/species/ethereal/bodyparts.dmi', "ethereal_chest"), ICON_OVERLAY)
- ethereal_base.Blend(icon('icons/mob/species/ethereal/bodyparts.dmi', "ethereal_l_arm"), ICON_OVERLAY)
- ethereal_base.Blend(icon('icons/mob/species/ethereal/bodyparts.dmi', "ethereal_r_arm"), ICON_OVERLAY)
+ var/icon/ethereal_base = icon('icons/mob/human/species/ethereal/bodyparts.dmi', "ethereal_head")
+ ethereal_base.Blend(icon('icons/mob/human/species/ethereal/bodyparts.dmi', "ethereal_chest"), ICON_OVERLAY)
+ ethereal_base.Blend(icon('icons/mob/human/species/ethereal/bodyparts.dmi', "ethereal_l_arm"), ICON_OVERLAY)
+ ethereal_base.Blend(icon('icons/mob/human/species/ethereal/bodyparts.dmi', "ethereal_r_arm"), ICON_OVERLAY)
- var/icon/eyes = icon('icons/mob/species/human/human_face.dmi', "eyes")
+ var/icon/eyes = icon('icons/mob/human/human_face.dmi', "eyes")
eyes.Blend(COLOR_BLACK, ICON_MULTIPLY)
ethereal_base.Blend(eyes, ICON_OVERLAY)
diff --git a/code/modules/client/preferences/species_features/lizard.dm b/code/modules/client/preferences/species_features/lizard.dm
index e49349a5ff3..9c0b6e36519 100644
--- a/code/modules/client/preferences/species_features/lizard.dm
+++ b/code/modules/client/preferences/species_features/lizard.dm
@@ -2,13 +2,13 @@
/proc/generate_lizard_side_shots(list/sprite_accessories, key, include_snout = TRUE)
var/list/values = list()
- var/icon/lizard = icon('icons/mob/species/lizard/bodyparts.dmi', "lizard_head", EAST)
- var/icon/eyes = icon('icons/mob/species/human/human_face.dmi', "eyes", EAST)
+ var/icon/lizard = icon('icons/mob/human/species/lizard/bodyparts.dmi', "lizard_head", EAST)
+ var/icon/eyes = icon('icons/mob/human/human_face.dmi', "eyes", EAST)
eyes.Blend(COLOR_GRAY, ICON_MULTIPLY)
lizard.Blend(eyes, ICON_OVERLAY)
if (include_snout)
- lizard.Blend(icon('icons/mob/species/lizard/lizard_misc.dmi', "m_snout_round_ADJ", EAST), ICON_OVERLAY)
+ lizard.Blend(icon('icons/mob/human/species/lizard/lizard_misc.dmi', "m_snout_round_ADJ", EAST), ICON_OVERLAY)
for (var/name in sprite_accessories)
var/datum/sprite_accessory/sprite_accessory = sprite_accessories[name]
@@ -38,7 +38,7 @@
/datum/preference/choiced/lizard_body_markings/init_possible_values()
var/list/values = list()
- var/icon/lizard = icon('icons/mob/species/lizard/bodyparts.dmi', "lizard_chest_m")
+ var/icon/lizard = icon('icons/mob/human/species/lizard/bodyparts.dmi', "lizard_chest_m")
for (var/name in GLOB.body_markings_list)
var/datum/sprite_accessory/sprite_accessory = GLOB.body_markings_list[name]
@@ -47,7 +47,7 @@
if (sprite_accessory.icon_state != "none")
var/icon/body_markings_icon = icon(
- 'icons/mob/species/lizard/lizard_misc.dmi',
+ 'icons/mob/human/species/lizard/lizard_misc.dmi',
"m_body_markings_[sprite_accessory.icon_state]_ADJ",
)
diff --git a/code/modules/client/preferences/species_features/moth.dm b/code/modules/client/preferences/species_features/moth.dm
index fac52d29bde..ba80ad56b1d 100644
--- a/code/modules/client/preferences/species_features/moth.dm
+++ b/code/modules/client/preferences/species_features/moth.dm
@@ -9,8 +9,8 @@
/datum/preference/choiced/moth_antennae/init_possible_values()
var/list/values = list()
- var/icon/moth_head = icon('icons/mob/species/moth/bodyparts.dmi', "moth_head")
- moth_head.Blend(icon('icons/mob/species/human/human_face.dmi', "motheyes"), ICON_OVERLAY)
+ var/icon/moth_head = icon('icons/mob/human/species/moth/bodyparts.dmi', "moth_head")
+ moth_head.Blend(icon('icons/mob/human/human_face.dmi', "motheyes"), ICON_OVERLAY)
for (var/antennae_name in GLOB.moth_antennae_list)
var/datum/sprite_accessory/antennae = GLOB.moth_antennae_list[antennae_name]
@@ -42,7 +42,7 @@
var/icon/moth_body = icon('icons/blanks/32x32.dmi', "nothing")
- moth_body.Blend(icon('icons/mob/species/moth/moth_wings.dmi', "m_moth_wings_plain_BEHIND"), ICON_OVERLAY)
+ moth_body.Blend(icon('icons/mob/human/species/moth/moth_wings.dmi', "m_moth_wings_plain_BEHIND"), ICON_OVERLAY)
var/list/body_parts = list(
/obj/item/bodypart/head/moth,
@@ -53,9 +53,9 @@
for (var/obj/item/bodypart/body_part in body_parts)
var/gender = (initial(body_part.is_dimorphic)) ? "_m" : ""
- moth_body.Blend(icon('icons/mob/species/moth/bodyparts.dmi', "moth_[body_part][gender]"), ICON_OVERLAY)
+ moth_body.Blend(icon('icons/mob/human/species/moth/bodyparts.dmi', "moth_[body_part][gender]"), ICON_OVERLAY)
- moth_body.Blend(icon('icons/mob/species/human/human_face.dmi', "motheyes"), ICON_OVERLAY)
+ moth_body.Blend(icon('icons/mob/human/human_face.dmi', "motheyes"), ICON_OVERLAY)
for (var/markings_name in GLOB.moth_markings_list)
var/datum/sprite_accessory/markings = GLOB.moth_markings_list[markings_name]
@@ -69,8 +69,8 @@
body_part_icon.Crop(1, 1, 32, 32)
icon_with_markings.Blend(body_part_icon, ICON_OVERLAY)
- icon_with_markings.Blend(icon('icons/mob/species/moth/moth_wings.dmi', "m_moth_wings_plain_FRONT"), ICON_OVERLAY)
- icon_with_markings.Blend(icon('icons/mob/species/moth/moth_antennae.dmi', "m_moth_antennae_plain_FRONT"), ICON_OVERLAY)
+ icon_with_markings.Blend(icon('icons/mob/human/species/moth/moth_wings.dmi', "m_moth_wings_plain_FRONT"), ICON_OVERLAY)
+ icon_with_markings.Blend(icon('icons/mob/human/species/moth/moth_antennae.dmi', "m_moth_antennae_plain_FRONT"), ICON_OVERLAY)
// Zoom in on the top of the head and the chest
icon_with_markings.Scale(64, 64)
diff --git a/code/modules/client/preferences/species_features/pod.dm b/code/modules/client/preferences/species_features/pod.dm
index 8c623836ba2..c5315d95380 100644
--- a/code/modules/client/preferences/species_features/pod.dm
+++ b/code/modules/client/preferences/species_features/pod.dm
@@ -10,7 +10,7 @@
/datum/preference/choiced/pod_hair/init_possible_values()
var/list/values = list()
- var/icon/pod_head = icon('icons/mob/species/human/bodyparts_greyscale.dmi', "pod_head_m")
+ var/icon/pod_head = icon('icons/mob/human/bodyparts_greyscale.dmi', "pod_head_m")
for (var/pod_name in GLOB.pod_hair_list)
var/datum/sprite_accessory/pod_hair = GLOB.pod_hair_list[pod_name]
diff --git a/code/modules/clothing/head/wig.dm b/code/modules/clothing/head/wig.dm
index 486dde4a891..b692c1383c5 100644
--- a/code/modules/clothing/head/wig.dm
+++ b/code/modules/clothing/head/wig.dm
@@ -1,7 +1,7 @@
/obj/item/clothing/head/wig
name = "wig"
desc = "A bunch of hair without a head attached."
- icon = 'icons/mob/species/human/human_face.dmi' // default icon for all hairs
+ icon = 'icons/mob/human/human_face.dmi' // default icon for all hairs
worn_icon = 'icons/mob/clothing/head/costume.dmi'
icon_state = "hair_vlong"
inhand_icon_state = "pwig"
diff --git a/code/modules/food_and_drinks/restaurant/customers/_customer.dm b/code/modules/food_and_drinks/restaurant/customers/_customer.dm
index 93b2470e50a..c5a7f809586 100644
--- a/code/modules/food_and_drinks/restaurant/customers/_customer.dm
+++ b/code/modules/food_and_drinks/restaurant/customers/_customer.dm
@@ -314,7 +314,7 @@
var/datum/sprite_accessory/moth_wings/wings = get_wings(customer)
- var/mutable_appearance/wings_behind = mutable_appearance(icon = 'icons/mob/species/moth/moth_wings.dmi', icon_state = "m_moth_wings_[wings.icon_state]_BEHIND")
+ var/mutable_appearance/wings_behind = mutable_appearance(icon = 'icons/mob/human/species/moth/moth_wings.dmi', icon_state = "m_moth_wings_[wings.icon_state]_BEHIND")
wings_behind.appearance_flags = RESET_COLOR
underlays += wings_behind
@@ -325,7 +325,7 @@
var/datum/sprite_accessory/moth_wings/wings = get_wings(customer)
- var/mutable_appearance/wings_front = mutable_appearance(icon = 'icons/mob/species/moth/moth_wings.dmi', icon_state = "m_moth_wings_[wings.icon_state]_FRONT")
+ var/mutable_appearance/wings_front = mutable_appearance(icon = 'icons/mob/human/species/moth/moth_wings.dmi', icon_state = "m_moth_wings_[wings.icon_state]_FRONT")
wings_front.appearance_flags = RESET_COLOR
overlays += wings_front
diff --git a/code/modules/hallucination/body.dm b/code/modules/hallucination/body.dm
index cec96f9f828..5167b63c5ee 100644
--- a/code/modules/hallucination/body.dm
+++ b/code/modules/hallucination/body.dm
@@ -58,7 +58,7 @@
/datum/hallucination/body/husk
random_hallucination_weight = 8
- body_image_file = 'icons/mob/species/human/human.dmi'
+ body_image_file = 'icons/mob/human/human.dmi'
body_image_state = "husk"
/datum/hallucination/body/husk/sideways
diff --git a/code/modules/hallucination/delusions.dm b/code/modules/hallucination/delusions.dm
index 3a5e1798823..312972f5c9a 100644
--- a/code/modules/hallucination/delusions.dm
+++ b/code/modules/hallucination/delusions.dm
@@ -141,7 +141,7 @@
delusion_name = "???"
/datum/hallucination/delusion/preset/monkey
- delusion_icon_file = 'icons/mob/species/human/human.dmi'
+ delusion_icon_file = 'icons/mob/human/human.dmi'
delusion_icon_state = "monkey"
delusion_name = "monkey"
@@ -160,12 +160,12 @@
delusion_name = "carp"
/datum/hallucination/delusion/preset/skeleton
- delusion_icon_file = 'icons/mob/species/human/human.dmi'
+ delusion_icon_file = 'icons/mob/human/human.dmi'
delusion_icon_state = "skeleton"
delusion_name = "skeleton"
/datum/hallucination/delusion/preset/zombie
- delusion_icon_file = 'icons/mob/species/human/human.dmi'
+ delusion_icon_file = 'icons/mob/human/human.dmi'
delusion_icon_state = "zombie"
delusion_name = "zombie"
diff --git a/code/modules/hallucination/shock.dm b/code/modules/hallucination/shock.dm
index 32fc17fce1d..99db2530d85 100644
--- a/code/modules/hallucination/shock.dm
+++ b/code/modules/hallucination/shock.dm
@@ -2,7 +2,7 @@
/datum/hallucination/shock
random_hallucination_weight = 1
- var/electrocution_icon = 'icons/mob/species/human/human.dmi'
+ var/electrocution_icon = 'icons/mob/human/human.dmi'
var/electrocution_icon_state = "electrocuted_base"
var/image/shock_image
var/image/electrocution_skeleton_anim
diff --git a/code/modules/holodeck/mobs.dm b/code/modules/holodeck/mobs.dm
index c683905e33e..7a7e7c22d9e 100644
--- a/code/modules/holodeck/mobs.dm
+++ b/code/modules/holodeck/mobs.dm
@@ -5,7 +5,7 @@
/mob/living/simple_animal/holodeck_monkey
name = "monkey"
desc = "A holographic creature fond of bananas."
- icon = 'icons/mob/species/human/human.dmi'
+ icon = 'icons/mob/human/human.dmi'
icon_state = "monkey"
icon_living = "monkey"
icon_dead = "monkey_dead"
diff --git a/code/modules/mob/living/basic/space_fauna/ghost.dm b/code/modules/mob/living/basic/space_fauna/ghost.dm
index 9a4f476f42b..058c2d2cd3f 100644
--- a/code/modules/mob/living/basic/space_fauna/ghost.dm
+++ b/code/modules/mob/living/basic/space_fauna/ghost.dm
@@ -72,14 +72,14 @@
if(!isnull(ghost_hairstyle) && ghost_hairstyle != "Bald") //Bald hairstyle and the Shaved facial hairstyle lack an associated sprite and will not properly generate hair, and just cause runtimes.
var/datum/sprite_accessory/hair_style = GLOB.hairstyles_list[ghost_hairstyle] //We use the hairstyle name to get the sprite accessory, which we copy the icon_state from.
- ghost_hair = mutable_appearance('icons/mob/species/human/human_face.dmi', "[hair_style.icon_state]", -HAIR_LAYER)
+ ghost_hair = mutable_appearance('icons/mob/human/human_face.dmi', "[hair_style.icon_state]", -HAIR_LAYER)
ghost_hair.alpha = 200
ghost_hair.color = ghost_hair_color
add_overlay(ghost_hair)
if(!isnull(ghost_facial_hairstyle) && ghost_facial_hairstyle != "Shaved")
var/datum/sprite_accessory/facial_hair_style = GLOB.facial_hairstyles_list[ghost_facial_hairstyle]
- ghost_facial_hair = mutable_appearance('icons/mob/species/human/human_face.dmi', "[facial_hair_style.icon_state]", -HAIR_LAYER)
+ ghost_facial_hair = mutable_appearance('icons/mob/human/human_face.dmi', "[facial_hair_style.icon_state]", -HAIR_LAYER)
ghost_facial_hair.alpha = 200
ghost_facial_hair.color = ghost_facial_hair_color
add_overlay(ghost_facial_hair)
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 6ae444ea362..de6280b0050 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -41,7 +41,7 @@
/datum/emote/living/carbon/human/glasses/run_emote(mob/user, params, type_override, intentional)
. = ..()
- var/image/emote_animation = image('icons/mob/species/human/emote_visuals.dmi', user, "glasses")
+ var/image/emote_animation = image('icons/mob/human/emote_visuals.dmi', user, "glasses")
flick_overlay_global(emote_animation, GLOB.clients, 1.6 SECONDS)
/datum/emote/living/carbon/human/grumble
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 56ee7dad220..2655d342e99 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -2,7 +2,7 @@
/mob/living/carbon/human
name = "Unknown"
real_name = "Unknown"
- icon = 'icons/mob/species/human/human.dmi'
+ icon = 'icons/mob/human/human.dmi'
icon_state = "human_basic"
appearance_flags = KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE|LONG_GLIDE
hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPCHEM_HUD,IMPTRACK_HUD,ANTAG_HUD,GLAND_HUD,SENTIENT_DISEASE_HUD,FAN_HUD,PERMIT_HUD) //SKYRAT EDIT: ADD PERMIT_HUD
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index c4c0157478b..356438ed536 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -379,7 +379,7 @@
. = ..()
if(!ishuman(user))
return
- var/image/emote_animation = image('icons/mob/species/human/emote_visuals.dmi', user, "sigh")
+ var/image/emote_animation = image('icons/mob/human/emote_visuals.dmi', user, "sigh")
flick_overlay_global(emote_animation, GLOB.clients, 2.0 SECONDS)
/datum/emote/living/sit
diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
index f23c2b71857..43d393cc849 100644
--- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
@@ -383,7 +383,7 @@
duration = 300
/datum/status_effect/spookcookie/on_apply()
- var/image/I = image(icon = 'icons/mob/species/human/human.dmi', icon_state = "skeleton", layer = ABOVE_MOB_LAYER, loc = owner)
+ var/image/I = image(icon = 'icons/mob/human/human.dmi', icon_state = "skeleton", layer = ABOVE_MOB_LAYER, loc = owner)
I.override = 1
owner.add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/everyone, "spookyscary", I)
return ..()
diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
index 1cbaa170efa..04fb0f9093e 100644
--- a/code/modules/surgery/bodyparts/_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -4,16 +4,16 @@
force = 3
throwforce = 3
w_class = WEIGHT_CLASS_SMALL
- icon = 'icons/mob/species/human/bodyparts.dmi'
+ icon = 'icons/mob/human/bodyparts.dmi'
icon_state = "" //Leave this blank! Bodyparts are built using overlays
/// The icon for Organic limbs using greyscale
VAR_PROTECTED/icon_greyscale = DEFAULT_BODYPART_ICON_ORGANIC
///The icon for non-greyscale limbs
- VAR_PROTECTED/icon_static = 'icons/mob/species/human/bodyparts.dmi'
+ VAR_PROTECTED/icon_static = 'icons/mob/human/bodyparts.dmi'
///The icon for husked limbs
- VAR_PROTECTED/icon_husk = 'icons/mob/species/human/bodyparts.dmi'
+ VAR_PROTECTED/icon_husk = 'icons/mob/human/bodyparts.dmi'
///The icon for invisible limbs
- VAR_PROTECTED/icon_invisible = 'icons/mob/species/human/bodyparts.dmi'
+ VAR_PROTECTED/icon_invisible = 'icons/mob/human/bodyparts.dmi'
///The type of husk for building an iconstate
var/husk_type = "humanoid"
layer = BELOW_MOB_LAYER //so it isn't hidden behind objects when on the floor
diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm
index 1ab9cfb1821..0872ccbebb5 100644
--- a/code/modules/surgery/bodyparts/head.dm
+++ b/code/modules/surgery/bodyparts/head.dm
@@ -1,7 +1,7 @@
/obj/item/bodypart/head
name = BODY_ZONE_HEAD
desc = "Didn't make sense not to live for fun, your brain gets smart but your head gets dumb."
- icon = 'icons/mob/species/human/bodyparts.dmi'
+ icon = 'icons/mob/human/bodyparts.dmi'
icon_state = "default_human_head"
max_damage = 250 //SKYRAT EDIT CHANGE: max_damage = 200
body_zone = BODY_ZONE_HEAD
@@ -206,8 +206,8 @@
if(dropped)
// This is a bit of copy/paste code from eyes.dm:generate_body_overlay
if(eyes?.eye_icon_state && (head_flags & HEAD_EYESPRITES))
- var/image/eye_left = image('icons/mob/species/human/human_face.dmi', "[eyes.eye_icon_state]_l", -BODY_LAYER, SOUTH)
- var/image/eye_right = image('icons/mob/species/human/human_face.dmi', "[eyes.eye_icon_state]_r", -BODY_LAYER, SOUTH)
+ var/image/eye_left = image('icons/mob/human/human_face.dmi', "[eyes.eye_icon_state]_l", -BODY_LAYER, SOUTH)
+ var/image/eye_right = image('icons/mob/human/human_face.dmi', "[eyes.eye_icon_state]_r", -BODY_LAYER, SOUTH)
if(head_flags & HEAD_EYECOLOR)
if(eyes.eye_color_left)
eye_left.color = eyes.eye_color_left
@@ -248,7 +248,7 @@
. += eye_left
. += eye_right
else if(!eyes && (head_flags & HEAD_EYEHOLES))
- var/image/no_eyes = image('icons/mob/species/human/human_face.dmi', "eyes_missing", -BODY_LAYER, SOUTH)
+ var/image/no_eyes = image('icons/mob/human/human_face.dmi', "eyes_missing", -BODY_LAYER, SOUTH)
worn_face_offset?.apply_offset(no_eyes)
. += no_eyes
@@ -266,9 +266,9 @@
return "The head of [real_name]"
/obj/item/bodypart/head/monkey
- icon = 'icons/mob/species/monkey/bodyparts.dmi'
- icon_static = 'icons/mob/species/monkey/bodyparts.dmi'
- icon_husk = 'icons/mob/species/monkey/bodyparts.dmi'
+ icon = 'icons/mob/human/species/monkey/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/monkey/bodyparts.dmi'
+ icon_husk = 'icons/mob/human/species/monkey/bodyparts.dmi'
husk_type = "monkey"
icon_state = "default_monkey_head"
limb_id = SPECIES_MONKEY
@@ -279,8 +279,8 @@
head_flags = HEAD_LIPS|HEAD_DEBRAIN
/obj/item/bodypart/head/alien
- icon = 'icons/mob/species/alien/bodyparts.dmi'
- icon_static = 'icons/mob/species/alien/bodyparts.dmi'
+ icon = 'icons/mob/human/species/alien/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/alien/bodyparts.dmi'
icon_state = "alien_head"
limb_id = BODYPART_ID_ALIEN
is_dimorphic = FALSE
@@ -292,8 +292,8 @@
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ALIEN | BODYTYPE_ORGANIC
/obj/item/bodypart/head/larva
- icon = 'icons/mob/species/alien/bodyparts.dmi'
- icon_static = 'icons/mob/species/alien/bodyparts.dmi'
+ icon = 'icons/mob/human/species/alien/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/alien/bodyparts.dmi'
icon_state = "larva_head"
limb_id = BODYPART_ID_LARVA
is_dimorphic = FALSE
diff --git a/code/modules/surgery/bodyparts/head_hair_and_lips.dm b/code/modules/surgery/bodyparts/head_hair_and_lips.dm
index a93eb88f9a7..e29a2b8b657 100644
--- a/code/modules/surgery/bodyparts/head_hair_and_lips.dm
+++ b/code/modules/surgery/bodyparts/head_hair_and_lips.dm
@@ -88,7 +88,7 @@
if(!facial_hair_hidden && lip_style && (head_flags & HEAD_LIPS))
//not a sprite accessory, don't ask
//Overlay
- var/image/lip_overlay = image('icons/mob/species/human/human_face.dmi', "lips_[lip_style]", -BODY_LAYER, image_dir)
+ var/image/lip_overlay = image('icons/mob/human/human_face.dmi', "lips_[lip_style]", -BODY_LAYER, image_dir)
lip_overlay.color = lip_color
//Emissive blocker
if(blocks_emissive != EMISSIVE_BLOCK_NONE)
@@ -172,16 +172,16 @@
/// Returns an appropriate debrained overlay
/obj/item/bodypart/head/proc/get_debrain_overlay(can_rotate = TRUE)
RETURN_TYPE(/image)
- var/debrain_icon = 'icons/mob/species/human/human_face.dmi'
+ var/debrain_icon = 'icons/mob/human/human_face.dmi'
var/debrain_icon_state = "debrained"
if(bodytype & BODYTYPE_ALIEN)
- debrain_icon = 'icons/mob/species/alien/bodyparts.dmi'
+ debrain_icon = 'icons/mob/human/species/alien/bodyparts.dmi'
debrain_icon_state = "debrained_alien"
else if(bodytype & BODYTYPE_LARVA_PLACEHOLDER)
- debrain_icon = 'icons/mob/species/alien/bodyparts.dmi'
+ debrain_icon = 'icons/mob/human/species/alien/bodyparts.dmi'
debrain_icon_state = "debrained_larva"
else if(bodytype & BODYTYPE_GOLEM)
- debrain_icon = 'icons/mob/species/golems.dmi'
+ debrain_icon = 'icons/mob/human/species/golems.dmi'
debrain_icon_state = "debrained"
var/image/debrain_overlay
@@ -195,7 +195,7 @@
/// Returns an appropriate missing eyes overlay
/obj/item/bodypart/head/proc/get_eyeless_overlay(can_rotate = TRUE)
RETURN_TYPE(/image)
- var/eyeless_icon = 'icons/mob/species/human/human_face.dmi'
+ var/eyeless_icon = 'icons/mob/human/human_face.dmi'
var/eyeless_icon_state = "eyes_missing"
var/image/eyeless_overlay
diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm
index d45ada1c36f..cbe533de54d 100644
--- a/code/modules/surgery/bodyparts/parts.dm
+++ b/code/modules/surgery/bodyparts/parts.dm
@@ -56,9 +56,9 @@
..()
/obj/item/bodypart/chest/monkey
- icon = 'icons/mob/species/monkey/bodyparts.dmi'
- icon_static = 'icons/mob/species/monkey/bodyparts.dmi'
- icon_husk = 'icons/mob/species/monkey/bodyparts.dmi'
+ icon = 'icons/mob/human/species/monkey/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/monkey/bodyparts.dmi'
+ icon_husk = 'icons/mob/human/species/monkey/bodyparts.dmi'
husk_type = "monkey"
top_offset = -5
icon_state = "default_monkey_chest"
@@ -71,8 +71,8 @@
dmg_overlay_type = SPECIES_MONKEY
/obj/item/bodypart/chest/alien
- icon = 'icons/mob/species/alien/bodyparts.dmi'
- icon_static = 'icons/mob/species/alien/bodyparts.dmi'
+ icon = 'icons/mob/human/species/alien/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/alien/bodyparts.dmi'
icon_state = "alien_chest"
limb_id = BODYPART_ID_ALIEN
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ALIEN | BODYTYPE_ORGANIC
@@ -83,8 +83,8 @@
acceptable_bodytype = BODYTYPE_HUMANOID
/obj/item/bodypart/chest/larva
- icon = 'icons/mob/species/alien/bodyparts.dmi'
- icon_static = 'icons/mob/species/alien/bodyparts.dmi'
+ icon = 'icons/mob/human/species/alien/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/alien/bodyparts.dmi'
icon_state = "larva_chest"
limb_id = BODYPART_ID_LARVA
is_dimorphic = FALSE
@@ -194,9 +194,9 @@
/obj/item/bodypart/arm/left/monkey
- icon = 'icons/mob/species/monkey/bodyparts.dmi'
- icon_static = 'icons/mob/species/monkey/bodyparts.dmi'
- icon_husk = 'icons/mob/species/monkey/bodyparts.dmi'
+ icon = 'icons/mob/human/species/monkey/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/monkey/bodyparts.dmi'
+ icon_husk = 'icons/mob/human/species/monkey/bodyparts.dmi'
husk_type = "monkey"
icon_state = "default_monkey_l_arm"
limb_id = SPECIES_MONKEY
@@ -211,8 +211,8 @@
unarmed_stun_threshold = 3
/obj/item/bodypart/arm/left/alien
- icon = 'icons/mob/species/alien/bodyparts.dmi'
- icon_static = 'icons/mob/species/alien/bodyparts.dmi'
+ icon = 'icons/mob/human/species/alien/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/alien/bodyparts.dmi'
icon_state = "alien_l_arm"
limb_id = BODYPART_ID_ALIEN
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ALIEN | BODYTYPE_ORGANIC
@@ -297,9 +297,9 @@
/obj/item/bodypart/arm/right/monkey
- icon = 'icons/mob/species/monkey/bodyparts.dmi'
- icon_static = 'icons/mob/species/monkey/bodyparts.dmi'
- icon_husk = 'icons/mob/species/monkey/bodyparts.dmi'
+ icon = 'icons/mob/human/species/monkey/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/monkey/bodyparts.dmi'
+ icon_husk = 'icons/mob/human/species/monkey/bodyparts.dmi'
husk_type = "monkey"
icon_state = "default_monkey_r_arm"
limb_id = SPECIES_MONKEY
@@ -314,8 +314,8 @@
unarmed_stun_threshold = 3
/obj/item/bodypart/arm/right/alien
- icon = 'icons/mob/species/alien/bodyparts.dmi'
- icon_static = 'icons/mob/species/alien/bodyparts.dmi'
+ icon = 'icons/mob/human/species/alien/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/alien/bodyparts.dmi'
icon_state = "alien_r_arm"
limb_id = BODYPART_ID_ALIEN
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ALIEN | BODYTYPE_ORGANIC
@@ -412,9 +412,9 @@
owner.set_usable_legs(owner.usable_legs + 1)
/obj/item/bodypart/leg/left/monkey
- icon = 'icons/mob/species/monkey/bodyparts.dmi'
- icon_static = 'icons/mob/species/monkey/bodyparts.dmi'
- icon_husk = 'icons/mob/species/monkey/bodyparts.dmi'
+ icon = 'icons/mob/human/species/monkey/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/monkey/bodyparts.dmi'
+ icon_husk = 'icons/mob/human/species/monkey/bodyparts.dmi'
husk_type = "monkey"
top_offset = -3
icon_state = "default_monkey_l_leg"
@@ -429,8 +429,8 @@
unarmed_stun_threshold = 4
/obj/item/bodypart/leg/left/alien
- icon = 'icons/mob/species/alien/bodyparts.dmi'
- icon_static = 'icons/mob/species/alien/bodyparts.dmi'
+ icon = 'icons/mob/human/species/alien/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/alien/bodyparts.dmi'
icon_state = "alien_l_leg"
limb_id = BODYPART_ID_ALIEN
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ALIEN | BODYTYPE_ORGANIC
@@ -506,9 +506,9 @@
owner.set_usable_legs(owner.usable_legs + 1)
/obj/item/bodypart/leg/right/monkey
- icon = 'icons/mob/species/monkey/bodyparts.dmi'
- icon_static = 'icons/mob/species/monkey/bodyparts.dmi'
- icon_husk = 'icons/mob/species/monkey/bodyparts.dmi'
+ icon = 'icons/mob/human/species/monkey/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/monkey/bodyparts.dmi'
+ icon_husk = 'icons/mob/human/species/monkey/bodyparts.dmi'
husk_type = "monkey"
top_offset = -3
icon_state = "default_monkey_r_leg"
@@ -523,8 +523,8 @@
unarmed_stun_threshold = 4
/obj/item/bodypart/leg/right/alien
- icon = 'icons/mob/species/alien/bodyparts.dmi'
- icon_static = 'icons/mob/species/alien/bodyparts.dmi'
+ icon = 'icons/mob/human/species/alien/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/alien/bodyparts.dmi'
icon_state = "alien_r_leg"
limb_id = BODYPART_ID_ALIEN
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ALIEN | BODYTYPE_ORGANIC
diff --git a/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm
index ab11c69d66c..2215b388320 100644
--- a/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm
@@ -1,5 +1,5 @@
/obj/item/bodypart/head/ethereal
- icon_greyscale = 'icons/mob/species/ethereal/bodyparts.dmi'
+ icon_greyscale = 'icons/mob/human/species/ethereal/bodyparts.dmi'
limb_id = SPECIES_ETHEREAL
is_dimorphic = FALSE
dmg_overlay_type = null
@@ -17,7 +17,7 @@
species_color = eth_holder.current_color
/obj/item/bodypart/chest/ethereal
- icon_greyscale = 'icons/mob/species/ethereal/bodyparts.dmi'
+ icon_greyscale = 'icons/mob/human/species/ethereal/bodyparts.dmi'
limb_id = SPECIES_ETHEREAL
is_dimorphic = FALSE
dmg_overlay_type = null
@@ -31,7 +31,7 @@
species_color = eth_holder.current_color
/obj/item/bodypart/arm/left/ethereal
- icon_greyscale = 'icons/mob/species/ethereal/bodyparts.dmi'
+ icon_greyscale = 'icons/mob/human/species/ethereal/bodyparts.dmi'
limb_id = SPECIES_ETHEREAL
dmg_overlay_type = null
attack_type = BURN //burn bish
@@ -48,7 +48,7 @@
species_color = eth_holder.current_color
/obj/item/bodypart/arm/right/ethereal
- icon_greyscale = 'icons/mob/species/ethereal/bodyparts.dmi'
+ icon_greyscale = 'icons/mob/human/species/ethereal/bodyparts.dmi'
limb_id = SPECIES_ETHEREAL
dmg_overlay_type = null
attack_type = BURN // bish buzz
@@ -65,7 +65,7 @@
species_color = eth_holder.current_color
/obj/item/bodypart/leg/left/ethereal
- icon_greyscale = 'icons/mob/species/ethereal/bodyparts.dmi'
+ icon_greyscale = 'icons/mob/human/species/ethereal/bodyparts.dmi'
limb_id = SPECIES_ETHEREAL
dmg_overlay_type = null
attack_type = BURN // bish buzz
@@ -81,7 +81,7 @@
species_color = eth_holder.current_color
/obj/item/bodypart/leg/right/ethereal
- icon_greyscale = 'icons/mob/species/ethereal/bodyparts.dmi'
+ icon_greyscale = 'icons/mob/human/species/ethereal/bodyparts.dmi'
limb_id = SPECIES_ETHEREAL
dmg_overlay_type = null
attack_type = BURN // bish buzz
diff --git a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm
index 5138b19aec4..b5b306aaf67 100644
--- a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm
@@ -1,16 +1,16 @@
/obj/item/bodypart/head/lizard
- icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi'
+ icon_greyscale = 'icons/mob/human/species/lizard/bodyparts.dmi'
limb_id = SPECIES_LIZARD
is_dimorphic = FALSE
head_flags = HEAD_LIPS|HEAD_EYESPRITES|HEAD_EYECOLOR|HEAD_EYEHOLES|HEAD_DEBRAIN
/obj/item/bodypart/chest/lizard
- icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi'
+ icon_greyscale = 'icons/mob/human/species/lizard/bodyparts.dmi'
limb_id = SPECIES_LIZARD
is_dimorphic = TRUE
/obj/item/bodypart/arm/left/lizard
- icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi'
+ icon_greyscale = 'icons/mob/human/species/lizard/bodyparts.dmi'
limb_id = SPECIES_LIZARD
unarmed_attack_verb = "slash"
unarmed_attack_effect = ATTACK_EFFECT_CLAW
@@ -18,7 +18,7 @@
unarmed_miss_sound = 'sound/weapons/slashmiss.ogg'
/obj/item/bodypart/arm/right/lizard
- icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi'
+ icon_greyscale = 'icons/mob/human/species/lizard/bodyparts.dmi'
limb_id = SPECIES_LIZARD
unarmed_attack_verb = "slash"
unarmed_attack_effect = ATTACK_EFFECT_CLAW
@@ -32,16 +32,16 @@
bodypart_traits = list(TRAIT_CHUNKYFINGERS)
/obj/item/bodypart/leg/left/lizard
- icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi'
+ icon_greyscale = 'icons/mob/human/species/lizard/bodyparts.dmi'
limb_id = SPECIES_LIZARD
/obj/item/bodypart/leg/right/lizard
- icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi'
+ icon_greyscale = 'icons/mob/human/species/lizard/bodyparts.dmi'
limb_id = SPECIES_LIZARD
/* SKYRAT EDIT REMOVAL - MOVED TO MODULAR MUTANT_BODYPARTS.DM
/obj/item/bodypart/leg/left/digitigrade
- icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi'
+ icon_greyscale = 'icons/mob/human/species/lizard/bodyparts.dmi'
limb_id = BODYPART_ID_DIGITIGRADE
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ORGANIC | BODYTYPE_DIGITIGRADE
@@ -67,7 +67,7 @@
limb_id = SPECIES_LIZARD
/obj/item/bodypart/leg/right/digitigrade
- icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi'
+ icon_greyscale = 'icons/mob/human/species/lizard/bodyparts.dmi'
limb_id = BODYPART_ID_DIGITIGRADE
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ORGANIC | BODYTYPE_DIGITIGRADE
diff --git a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
index b92c7e1b42a..e57c014c02b 100644
--- a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
@@ -411,8 +411,8 @@
//GOLEM
/obj/item/bodypart/head/golem
- icon = 'icons/mob/species/golems.dmi'
- icon_static = 'icons/mob/species/golems.dmi'
+ icon = 'icons/mob/human/species/golems.dmi'
+ icon_static = 'icons/mob/human/species/golems.dmi'
icon_state = "golem_head"
biological_state = BIO_INORGANIC
bodytype = BODYTYPE_GOLEM | BODYTYPE_ORGANIC
@@ -448,8 +448,8 @@
return ..()
/obj/item/bodypart/chest/golem
- icon = 'icons/mob/species/golems.dmi'
- icon_static = 'icons/mob/species/golems.dmi'
+ icon = 'icons/mob/human/species/golems.dmi'
+ icon_static = 'icons/mob/human/species/golems.dmi'
icon_state = "golem_chest"
biological_state = BIO_INORGANIC
acceptable_bodytype = BODYTYPE_GOLEM
@@ -469,8 +469,8 @@
return ..()
/obj/item/bodypart/arm/left/golem
- icon = 'icons/mob/species/golems.dmi'
- icon_static = 'icons/mob/species/golems.dmi'
+ icon = 'icons/mob/human/species/golems.dmi'
+ icon_static = 'icons/mob/human/species/golems.dmi'
icon_state = "golem_l_arm"
biological_state = BIO_INORGANIC
bodytype = BODYTYPE_GOLEM | BODYTYPE_ORGANIC
@@ -503,8 +503,8 @@
old_owner.RemoveComponentSource(REF(src), /datum/component/shovel_hands)
/obj/item/bodypart/arm/right/golem
- icon = 'icons/mob/species/golems.dmi'
- icon_static = 'icons/mob/species/golems.dmi'
+ icon = 'icons/mob/human/species/golems.dmi'
+ icon_static = 'icons/mob/human/species/golems.dmi'
icon_state = "golem_r_arm"
biological_state = BIO_INORGANIC
bodytype = BODYTYPE_GOLEM | BODYTYPE_ORGANIC
@@ -537,8 +537,8 @@
old_owner.RemoveComponentSource(REF(src), /datum/component/shovel_hands)
/obj/item/bodypart/leg/left/golem
- icon = 'icons/mob/species/golems.dmi'
- icon_static = 'icons/mob/species/golems.dmi'
+ icon = 'icons/mob/human/species/golems.dmi'
+ icon_static = 'icons/mob/human/species/golems.dmi'
icon_state = "golem_l_leg"
biological_state = BIO_INORGANIC
bodytype = BODYTYPE_GOLEM | BODYTYPE_ORGANIC
@@ -550,8 +550,8 @@
unarmed_stun_threshold = 11
/obj/item/bodypart/leg/right/golem
- icon = 'icons/mob/species/golems.dmi'
- icon_static = 'icons/mob/species/golems.dmi'
+ icon = 'icons/mob/human/species/golems.dmi'
+ icon_static = 'icons/mob/human/species/golems.dmi'
icon_state = "golem_r_leg"
biological_state = BIO_INORGANIC
bodytype = BODYTYPE_GOLEM | BODYTYPE_ORGANIC
diff --git a/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm
index 007e0ca66d4..8b091ed34b9 100644
--- a/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm
@@ -1,25 +1,25 @@
/* SKYRAT EDIT REMOVAL - Moved to modular_skyrat\master_files\code\modules\surgery\bodyparts\species_parts\moth_bodyparts.dm
/obj/item/bodypart/head/moth
- icon = 'icons/mob/species/moth/bodyparts.dmi'
+ icon = 'icons/mob/human/species/moth/bodyparts.dmi'
icon_state = "moth_head"
- icon_static = 'icons/mob/species/moth/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/moth/bodyparts.dmi'
limb_id = SPECIES_MOTH
is_dimorphic = FALSE
should_draw_greyscale = FALSE
head_flags = HEAD_LIPS|HEAD_EYESPRITES|HEAD_EYEHOLES|HEAD_DEBRAIN //what the fuck, moths have lips?
/obj/item/bodypart/chest/moth
- icon = 'icons/mob/species/moth/bodyparts.dmi'
+ icon = 'icons/mob/human/species/moth/bodyparts.dmi'
icon_state = "moth_chest_m"
- icon_static = 'icons/mob/species/moth/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/moth/bodyparts.dmi'
limb_id = SPECIES_MOTH
is_dimorphic = TRUE
should_draw_greyscale = FALSE
/obj/item/bodypart/arm/left/moth
- icon = 'icons/mob/species/moth/bodyparts.dmi'
+ icon = 'icons/mob/human/species/moth/bodyparts.dmi'
icon_state = "moth_l_arm"
- icon_static = 'icons/mob/species/moth/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/moth/bodyparts.dmi'
limb_id = SPECIES_MOTH
should_draw_greyscale = FALSE
unarmed_attack_verb = "slash"
@@ -28,11 +28,9 @@
unarmed_miss_sound = 'sound/weapons/slashmiss.ogg'
/obj/item/bodypart/arm/right/moth
- icon = 'icons/mob/species/moth/bodyparts.dmi'
- icon_state = "moth_l_leg"
- icon = 'icons/mob/species/moth/bodyparts.dmi'
+ icon = 'icons/mob/human/species/moth/bodyparts.dmi'
icon_state = "moth_r_arm"
- icon_static = 'icons/mob/species/moth/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/moth/bodyparts.dmi'
limb_id = SPECIES_MOTH
should_draw_greyscale = FALSE
unarmed_attack_verb = "slash"
@@ -41,16 +39,16 @@
unarmed_miss_sound = 'sound/weapons/slashmiss.ogg'
/obj/item/bodypart/leg/left/moth
- icon = 'icons/mob/species/moth/bodyparts.dmi'
+ icon = 'icons/mob/human/species/moth/bodyparts.dmi'
icon_state = "moth_l_leg"
- icon_static = 'icons/mob/species/moth/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/moth/bodyparts.dmi'
limb_id = SPECIES_MOTH
should_draw_greyscale = FALSE
/obj/item/bodypart/leg/right/moth
- icon = 'icons/mob/species/moth/bodyparts.dmi'
+ icon = 'icons/mob/human/species/moth/bodyparts.dmi'
icon_state = "moth_r_leg"
- icon_static = 'icons/mob/species/moth/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/moth/bodyparts.dmi'
limb_id = SPECIES_MOTH
should_draw_greyscale = FALSE
*/ // SKYRAT EDIT END
diff --git a/code/modules/surgery/bodyparts/species_parts/plasmaman_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/plasmaman_bodyparts.dm
index d9bbee1ea03..85eea7edba0 100644
--- a/code/modules/surgery/bodyparts/species_parts/plasmaman_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/plasmaman_bodyparts.dm
@@ -1,7 +1,7 @@
/obj/item/bodypart/head/plasmaman
- icon = 'icons/mob/species/plasmaman/bodyparts.dmi'
+ icon = 'icons/mob/human/species/plasmaman/bodyparts.dmi'
icon_state = "plasmaman_head"
- icon_static = 'icons/mob/species/plasmaman/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/plasmaman/bodyparts.dmi'
biological_state = BIO_BONE
limb_id = SPECIES_PLASMAMAN
is_dimorphic = FALSE
@@ -12,9 +12,9 @@
head_flags = HEAD_EYESPRITES
/obj/item/bodypart/chest/plasmaman
- icon = 'icons/mob/species/plasmaman/bodyparts.dmi'
+ icon = 'icons/mob/human/species/plasmaman/bodyparts.dmi'
icon_state = "plasmaman_chest"
- icon_static = 'icons/mob/species/plasmaman/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/plasmaman/bodyparts.dmi'
biological_state = BIO_BONE
limb_id = SPECIES_PLASMAMAN
is_dimorphic = FALSE
@@ -24,9 +24,9 @@
burn_modifier = 1.5 //Plasmemes are weak
/obj/item/bodypart/arm/left/plasmaman
- icon = 'icons/mob/species/plasmaman/bodyparts.dmi'
+ icon = 'icons/mob/human/species/plasmaman/bodyparts.dmi'
icon_state = "plasmaman_l_arm"
- icon_static = 'icons/mob/species/plasmaman/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/plasmaman/bodyparts.dmi'
biological_state = BIO_BONE
limb_id = SPECIES_PLASMAMAN
should_draw_greyscale = FALSE
@@ -35,9 +35,9 @@
burn_modifier = 1.5 //Plasmemes are weak
/obj/item/bodypart/arm/right/plasmaman
- icon = 'icons/mob/species/plasmaman/bodyparts.dmi'
+ icon = 'icons/mob/human/species/plasmaman/bodyparts.dmi'
icon_state = "plasmaman_r_arm"
- icon_static = 'icons/mob/species/plasmaman/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/plasmaman/bodyparts.dmi'
biological_state = BIO_BONE
limb_id = SPECIES_PLASMAMAN
should_draw_greyscale = FALSE
@@ -46,9 +46,9 @@
burn_modifier = 1.5 //Plasmemes are weak
/obj/item/bodypart/leg/left/plasmaman
- icon = 'icons/mob/species/plasmaman/bodyparts.dmi'
+ icon = 'icons/mob/human/species/plasmaman/bodyparts.dmi'
icon_state = "plasmaman_l_leg"
- icon_static = 'icons/mob/species/plasmaman/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/plasmaman/bodyparts.dmi'
biological_state = BIO_BONE
limb_id = SPECIES_PLASMAMAN
should_draw_greyscale = FALSE
@@ -57,9 +57,9 @@
burn_modifier = 1.5 //Plasmemes are weak
/obj/item/bodypart/leg/right/plasmaman
- icon = 'icons/mob/species/plasmaman/bodyparts.dmi'
+ icon = 'icons/mob/human/species/plasmaman/bodyparts.dmi'
icon_state = "plasmaman_r_leg"
- icon_static = 'icons/mob/species/plasmaman/bodyparts.dmi'
+ icon_static = 'icons/mob/human/species/plasmaman/bodyparts.dmi'
biological_state = BIO_BONE
limb_id = SPECIES_PLASMAMAN
should_draw_greyscale = FALSE
diff --git a/code/modules/surgery/organs/internal/eyes/_eyes.dm b/code/modules/surgery/organs/internal/eyes/_eyes.dm
index 5103aa00248..a4e8a524753 100644
--- a/code/modules/surgery/organs/internal/eyes/_eyes.dm
+++ b/code/modules/surgery/organs/internal/eyes/_eyes.dm
@@ -129,10 +129,10 @@
if(isnull(eye_icon_state))
return list()
- var/eye_icon = parent.dna?.species.eyes_icon || 'icons/mob/species/human/human_face.dmi' // SKYRAT EDIT ADDITION
+ var/eye_icon = parent.dna?.species.eyes_icon || 'icons/mob/human/human_face.dmi' // SKYRAT EDIT ADDITION
- var/mutable_appearance/eye_left = mutable_appearance(eye_icon, "[eye_icon_state]_l", -eyes_layer) // SKYRAT EDIT CHANGE - Customization - ORIGINAL: var/mutable_appearance/eye_left = mutable_appearance('icons/mob/human_face.dmi', "[eye_icon_state]_l", -BODY_LAYER)
- var/mutable_appearance/eye_right = mutable_appearance(eye_icon, "[eye_icon_state]_r", -eyes_layer) // SKYRAT EDIT CHANGE - Customization - ORIGINAL: var/mutable_appearance/eye_right = mutable_appearance('icons/mob/human_face.dmi', "[eye_icon_state]_r", -BODY_LAYER)
+ var/mutable_appearance/eye_left = mutable_appearance(eye_icon, "[eye_icon_state]_l", -eyes_layer) // SKYRAT EDIT CHANGE - Customization - ORIGINAL: var/mutable_appearance/eye_left = mutable_appearance('icons/mob/human/human_face.dmi', "[eye_icon_state]_l", -BODY_LAYER)
+ var/mutable_appearance/eye_right = mutable_appearance(eye_icon, "[eye_icon_state]_r", -eyes_layer) // SKYRAT EDIT CHANGE - Customization - ORIGINAL: var/mutable_appearance/eye_right = mutable_appearance('icons/mob/human/human_face.dmi', "[eye_icon_state]_r", -BODY_LAYER)
var/list/eye_overlays = list(eye_left, eye_right) //SKYRAT EDIT ADDITION - Add all the overlays to this list instead of adding emissive blockers/eye emissives to the eye overlays' overlays
var/obscured = parent.check_obscured_slots(TRUE)
@@ -684,12 +684,12 @@
switch(eye_color_mode)
if(MATCH_LIGHT_COLOR)
- eyes_overlay = emissive_appearance('icons/mob/species/human/human_face.dmi', "eyes_glow_gs", eye_owner, layer = -BODY_LAYER, alpha = owner.alpha)
+ eyes_overlay = emissive_appearance('icons/mob/human/human_face.dmi', "eyes_glow_gs", eye_owner, layer = -BODY_LAYER, alpha = owner.alpha)
eyes_overlay.color = current_color_string
eye_owner.add_overlay(eyes_overlay)
if(USE_CUSTOM_COLOR)
- eyes_overlay_left = emissive_appearance('icons/mob/species/human/human_face.dmi', "eyes_glow_gs_left", eye_owner, layer = -BODY_LAYER, alpha = owner.alpha)
- eyes_overlay_right = emissive_appearance('icons/mob/species/human/human_face.dmi', "eyes_glow_gs_right", eye_owner, layer = -BODY_LAYER, alpha = owner.alpha)
+ eyes_overlay_left = emissive_appearance('icons/mob/human/human_face.dmi', "eyes_glow_gs_left", eye_owner, layer = -BODY_LAYER, alpha = owner.alpha)
+ eyes_overlay_right = emissive_appearance('icons/mob/human/human_face.dmi', "eyes_glow_gs_right", eye_owner, layer = -BODY_LAYER, alpha = owner.alpha)
eyes_overlay_left.color = eye_color_left
eyes_overlay_right.color = eye_color_right
eye_owner.add_overlay(eyes_overlay_left)
diff --git a/icons/mob/species/human/bodyparts.dmi b/icons/mob/human/bodyparts.dmi
similarity index 100%
rename from icons/mob/species/human/bodyparts.dmi
rename to icons/mob/human/bodyparts.dmi
diff --git a/icons/mob/species/human/bodyparts_greyscale.dmi b/icons/mob/human/bodyparts_greyscale.dmi
similarity index 100%
rename from icons/mob/species/human/bodyparts_greyscale.dmi
rename to icons/mob/human/bodyparts_greyscale.dmi
diff --git a/icons/mob/species/human/cat_features.dmi b/icons/mob/human/cat_features.dmi
similarity index 100%
rename from icons/mob/species/human/cat_features.dmi
rename to icons/mob/human/cat_features.dmi
diff --git a/icons/mob/species/human/emote_visuals.dmi b/icons/mob/human/emote_visuals.dmi
similarity index 100%
rename from icons/mob/species/human/emote_visuals.dmi
rename to icons/mob/human/emote_visuals.dmi
diff --git a/icons/mob/species/human/fox_features.dmi b/icons/mob/human/fox_features.dmi
similarity index 100%
rename from icons/mob/species/human/fox_features.dmi
rename to icons/mob/human/fox_features.dmi
diff --git a/icons/mob/human/human.dmi b/icons/mob/human/human.dmi
new file mode 100644
index 00000000000..7532655b527
Binary files /dev/null and b/icons/mob/human/human.dmi differ
diff --git a/icons/mob/species/human/human_face.dmi b/icons/mob/human/human_face.dmi
similarity index 100%
rename from icons/mob/species/human/human_face.dmi
rename to icons/mob/human/human_face.dmi
diff --git a/icons/mob/species/human/mannequin.dmi b/icons/mob/human/mannequin.dmi
similarity index 100%
rename from icons/mob/species/human/mannequin.dmi
rename to icons/mob/human/mannequin.dmi
diff --git a/icons/mob/species/alien/bodyparts.dmi b/icons/mob/human/species/alien/bodyparts.dmi
similarity index 100%
rename from icons/mob/species/alien/bodyparts.dmi
rename to icons/mob/human/species/alien/bodyparts.dmi
diff --git a/icons/mob/species/ethereal/bodyparts.dmi b/icons/mob/human/species/ethereal/bodyparts.dmi
similarity index 100%
rename from icons/mob/species/ethereal/bodyparts.dmi
rename to icons/mob/human/species/ethereal/bodyparts.dmi
diff --git a/icons/mob/species/golems.dmi b/icons/mob/human/species/golems.dmi
similarity index 100%
rename from icons/mob/species/golems.dmi
rename to icons/mob/human/species/golems.dmi
diff --git a/icons/mob/species/hair_gradients.dmi b/icons/mob/human/species/hair_gradients.dmi
similarity index 100%
rename from icons/mob/species/hair_gradients.dmi
rename to icons/mob/human/species/hair_gradients.dmi
diff --git a/icons/mob/species/lizard/bodyparts.dmi b/icons/mob/human/species/lizard/bodyparts.dmi
similarity index 100%
rename from icons/mob/species/lizard/bodyparts.dmi
rename to icons/mob/human/species/lizard/bodyparts.dmi
diff --git a/icons/mob/species/lizard/lizard_misc.dmi b/icons/mob/human/species/lizard/lizard_misc.dmi
similarity index 100%
rename from icons/mob/species/lizard/lizard_misc.dmi
rename to icons/mob/human/species/lizard/lizard_misc.dmi
diff --git a/icons/mob/species/lizard/lizard_spines.dmi b/icons/mob/human/species/lizard/lizard_spines.dmi
similarity index 100%
rename from icons/mob/species/lizard/lizard_spines.dmi
rename to icons/mob/human/species/lizard/lizard_spines.dmi
diff --git a/icons/mob/species/lizard/lizard_tails.dmi b/icons/mob/human/species/lizard/lizard_tails.dmi
similarity index 100%
rename from icons/mob/species/lizard/lizard_tails.dmi
rename to icons/mob/human/species/lizard/lizard_tails.dmi
diff --git a/icons/mob/species/misc/bodypart_overlay_simple.dmi b/icons/mob/human/species/misc/bodypart_overlay_simple.dmi
similarity index 100%
rename from icons/mob/species/misc/bodypart_overlay_simple.dmi
rename to icons/mob/human/species/misc/bodypart_overlay_simple.dmi
diff --git a/icons/mob/species/misc/digitigrade.dmi b/icons/mob/human/species/misc/digitigrade.dmi
similarity index 100%
rename from icons/mob/species/misc/digitigrade.dmi
rename to icons/mob/human/species/misc/digitigrade.dmi
diff --git a/icons/mob/species/monkey/bodyparts.dmi b/icons/mob/human/species/monkey/bodyparts.dmi
similarity index 100%
rename from icons/mob/species/monkey/bodyparts.dmi
rename to icons/mob/human/species/monkey/bodyparts.dmi
diff --git a/icons/mob/species/monkey/monkey_tail.dmi b/icons/mob/human/species/monkey/monkey_tail.dmi
similarity index 100%
rename from icons/mob/species/monkey/monkey_tail.dmi
rename to icons/mob/human/species/monkey/monkey_tail.dmi
diff --git a/icons/mob/species/monkey/uniform.dmi b/icons/mob/human/species/monkey/uniform.dmi
similarity index 100%
rename from icons/mob/species/monkey/uniform.dmi
rename to icons/mob/human/species/monkey/uniform.dmi
diff --git a/icons/mob/species/moth/bodyparts.dmi b/icons/mob/human/species/moth/bodyparts.dmi
similarity index 100%
rename from icons/mob/species/moth/bodyparts.dmi
rename to icons/mob/human/species/moth/bodyparts.dmi
diff --git a/icons/mob/species/moth/moth_antennae.dmi b/icons/mob/human/species/moth/moth_antennae.dmi
similarity index 100%
rename from icons/mob/species/moth/moth_antennae.dmi
rename to icons/mob/human/species/moth/moth_antennae.dmi
diff --git a/icons/mob/species/moth/moth_markings.dmi b/icons/mob/human/species/moth/moth_markings.dmi
similarity index 100%
rename from icons/mob/species/moth/moth_markings.dmi
rename to icons/mob/human/species/moth/moth_markings.dmi
diff --git a/icons/mob/species/moth/moth_wings.dmi b/icons/mob/human/species/moth/moth_wings.dmi
similarity index 100%
rename from icons/mob/species/moth/moth_wings.dmi
rename to icons/mob/human/species/moth/moth_wings.dmi
diff --git a/icons/mob/species/mush_cap.dmi b/icons/mob/human/species/mush_cap.dmi
similarity index 100%
rename from icons/mob/species/mush_cap.dmi
rename to icons/mob/human/species/mush_cap.dmi
diff --git a/icons/mob/species/plasmaman/bodyparts.dmi b/icons/mob/human/species/plasmaman/bodyparts.dmi
similarity index 100%
rename from icons/mob/species/plasmaman/bodyparts.dmi
rename to icons/mob/human/species/plasmaman/bodyparts.dmi
diff --git a/icons/mob/species/podperson_hair.dmi b/icons/mob/human/species/podperson_hair.dmi
similarity index 100%
rename from icons/mob/species/podperson_hair.dmi
rename to icons/mob/human/species/podperson_hair.dmi
diff --git a/icons/mob/species/wings.dmi b/icons/mob/human/species/wings.dmi
similarity index 100%
rename from icons/mob/species/wings.dmi
rename to icons/mob/human/species/wings.dmi
diff --git a/icons/mob/species/human/human.dmi b/icons/mob/species/human/human.dmi
deleted file mode 100644
index 7e576e90404..00000000000
Binary files a/icons/mob/species/human/human.dmi and /dev/null differ
diff --git a/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm b/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm
index 1eb8c7aa682..cffc4ab6d5f 100644
--- a/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm
+++ b/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm
@@ -815,7 +815,7 @@
/datum/preference/choiced/mutant_choice/pod_hair/init_possible_values()
var/list/values = list()
- var/icon/pod_head = icon('icons/mob/species/human/bodyparts_greyscale.dmi', "pod_head_m")
+ var/icon/pod_head = icon('icons/mob/human/bodyparts_greyscale.dmi', "pod_head_m")
pod_head.Blend(COLOR_GREEN, ICON_MULTIPLY)
for (var/pod_name in GLOB.pod_hair_list)
diff --git a/modular_skyrat/master_files/code/modules/client/preferences/species_features/generate_side_shots.dm b/modular_skyrat/master_files/code/modules/client/preferences/species_features/generate_side_shots.dm
index f42ce1fca1d..49fb60a2a0d 100644
--- a/modular_skyrat/master_files/code/modules/client/preferences/species_features/generate_side_shots.dm
+++ b/modular_skyrat/master_files/code/modules/client/preferences/species_features/generate_side_shots.dm
@@ -22,7 +22,7 @@
layer = "BEHIND"
final_icon = icon(sprite_accessory.icon, "m_[key]_[sprite_accessory.icon_state]_[layer]", direction)
else
- final_icon = icon('icons/mob/species/human/bodyparts_greyscale.dmi', "lizard_chest_m", direction)
+ final_icon = icon('icons/mob/human/bodyparts_greyscale.dmi', "lizard_chest_m", direction)
final_icon.Blend(COLOR_VIBRANT_LIME)
diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/tails.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/tails.dm
index f0f07262a69..38b3107d643 100644
--- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/tails.dm
+++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/tails.dm
@@ -56,7 +56,7 @@
/datum/sprite_accessory/tails/monkey/default
name = "Monkey"
icon_state = "monkey"
- icon = 'icons/mob/species/monkey/monkey_tail.dmi'
+ icon = 'icons/mob/human/species/monkey/monkey_tail.dmi'
recommended_species = list(SPECIES_HUMAN, SPECIES_SYNTH, SPECIES_FELINE, SPECIES_MAMMAL, SPECIES_MONKEY, SPECIES_GHOUL)
color_src = FALSE
organ_type = /obj/item/organ/external/tail/monkey
diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/wings.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/wings.dm
index 51979bf66ca..b7b9fa357a2 100644
--- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/wings.dm
+++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/wings.dm
@@ -6,7 +6,7 @@
* Check some of the wings that make use of them for examples on how to make it look decent.
*/
/datum/sprite_accessory/wings
- icon = 'icons/mob/species/wings.dmi'
+ icon = 'icons/mob/human/species/wings.dmi'
generic = "Wings"
key = "wings"
color_src = USE_ONE_COLOR