diff --git a/_maps/map_files/CTF/limbo.dmm b/_maps/map_files/CTF/limbo.dmm index 51f770969f8..20317cb6552 100644 --- a/_maps/map_files/CTF/limbo.dmm +++ b/_maps/map_files/CTF/limbo.dmm @@ -892,12 +892,7 @@ dir = 1 }, /obj/effect/turf_decal/siding/yellow, -/obj/structure/showcase{ - desc = "A historical figure of great importance to the wizard federation. He spent his long life learning magic, stealing artifacts, and harassing idiots with swords. May he rest forever, Rodney."; - icon = 'icons/mob/mob.dmi'; - icon_state = "nim"; - name = "wizard of yendor showcase" - }, +/obj/structure/showcase/wizard, /turf/open/floor/carpet/orange, /area/centcom/ctf) "PO" = ( @@ -912,12 +907,7 @@ /obj/effect/turf_decal/siding/blue{ dir = 1 }, -/obj/structure/showcase{ - desc = "A historical figure of great importance to the wizard federation. He spent his long life learning magic, stealing artifacts, and harassing idiots with swords. May he rest forever, Rodney."; - icon = 'icons/mob/mob.dmi'; - icon_state = "nim"; - name = "wizard of yendor showcase" - }, +/obj/structure/showcase/wizard, /turf/open/floor/carpet/blue, /area/centcom/ctf) "QY" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index bc8c20bc63b..ec0cd11c901 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -39618,12 +39618,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/structure/statue{ - desc = "A lifelike statue of a horrifying monster."; - dir = 8; - icon = 'icons/mob/lavaland/lavaland_monsters.dmi'; - icon_state = "goliath"; - name = "goliath" +/obj/structure/statue/goliath{ + dir = 8 }, /turf/open/floor/iron/white, /area/mine/living_quarters) diff --git a/_maps/map_files/Mafia/mafia_spiderclan.dmm b/_maps/map_files/Mafia/mafia_spiderclan.dmm index d1799e8e0fb..090f2d27efb 100644 --- a/_maps/map_files/Mafia/mafia_spiderclan.dmm +++ b/_maps/map_files/Mafia/mafia_spiderclan.dmm @@ -91,13 +91,7 @@ /turf/open/floor/plating, /area/centcom/mafia) "B" = ( -/obj/structure/showcase{ - density = 0; - desc = "Welp, only one way to recover your honour."; - icon = 'icons/obj/items_and_weapons.dmi'; - icon_state = "katana"; - name = "seppuku katana" - }, +/obj/structure/showcase/katana, /turf/open/misc/beach/sand, /area/centcom/mafia) "S" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 3a48ba97920..ac39996d047 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -6597,21 +6597,11 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/evacuation) "sW" = ( -/obj/structure/showcase{ - desc = "A strange machine supposedly from another world. The Wizard Federation has been meddling with it for years."; - icon = 'icons/obj/machines/telecomms.dmi'; - icon_state = "processor"; - name = "byond random number generator" - }, +/obj/structure/showcase/machinery/rng, /turf/open/floor/engine/cult, /area/centcom/wizard_station) "sX" = ( -/obj/structure/showcase{ - desc = "A historical figure of great importance to the wizard federation. He spent his long life learning magic, stealing artifacts, and harassing idiots with swords. May he rest forever, Rodney."; - icon = 'icons/mob/mob.dmi'; - icon_state = "nim"; - name = "wizard of yendor showcase" - }, +/obj/structure/showcase/wizard, /turf/open/floor/engine/cult, /area/centcom/wizard_station) "sY" = ( diff --git a/_maps/skyrat/xenoarch_base.dmm b/_maps/skyrat/xenoarch_base.dmm index 911e96a2953..b09f5670466 100644 --- a/_maps/skyrat/xenoarch_base.dmm +++ b/_maps/skyrat/xenoarch_base.dmm @@ -2772,13 +2772,8 @@ /obj/effect/turf_decal/bot, /turf/open/floor/engine, /area/mine/xenoarch/maintenance/west) -"OC" = ( -/obj/structure/statue{ - desc = "A lifelike statue of a horrifying monster."; - dir = 8; - icon = 'icons/mob/lavaland/lavaland_monsters.dmi'; - icon_state = "goliath"; - name = "goliath" +/obj/structure/statue/goliath{ + dir = 8 }, /obj/effect/turf_decal/tile/brown/anticorner, /turf/open/floor/iron, diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index e78f0e372be..2f6e0309f30 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -57,7 +57,7 @@ #define ORGAN_ORGANIC 1 #define ORGAN_ROBOTIC 2 -#define DEFAULT_BODYPART_ICON_ORGANIC 'icons/mob/human_parts_greyscale.dmi' +#define DEFAULT_BODYPART_ICON_ORGANIC 'icons/mob/species/human/bodyparts_greyscale.dmi' #define DEFAULT_BODYPART_ICON_ROBOTIC 'icons/mob/augmentation/augments.dmi' #define MONKEY_BODYPART "monkey" diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm index 1193ad2a4bc..1cb4fd688f1 100644 --- a/code/_globalvars/lists/mobs.dm +++ b/code/_globalvars/lists/mobs.dm @@ -67,9 +67,9 @@ GLOBAL_LIST_EMPTY(mob_config_movespeed_type_lookup) GLOBAL_LIST_EMPTY(emote_list) GLOBAL_LIST_INIT(construct_radial_images, list( - CONSTRUCT_JUGGERNAUT = image(icon = 'icons/mob/cult.dmi', icon_state = "juggernaut"), - CONSTRUCT_WRAITH = image(icon = 'icons/mob/cult.dmi', icon_state = "wraith"), - CONSTRUCT_ARTIFICER = image(icon = 'icons/mob/cult.dmi', icon_state = "artificer") + CONSTRUCT_JUGGERNAUT = image(icon = 'icons/mob/nonhuman-player/cult.dmi', icon_state = "juggernaut"), + CONSTRUCT_WRAITH = image(icon = 'icons/mob/nonhuman-player/cult.dmi', icon_state = "wraith"), + CONSTRUCT_ARTIFICER = image(icon = 'icons/mob/nonhuman-player/cult.dmi', icon_state = "artificer") )) /proc/update_config_movespeed_type_lookup(update_mobs = TRUE) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 43c08038eaa..3a17913ba44 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -581,7 +581,7 @@ /atom/movable/screen/healths/guardian name = "summoner health" - icon = 'icons/mob/guardian.dmi' + icon = 'icons/mob/nonhuman-player/guardian.dmi' icon_state = "base" mouse_opacity = MOUSE_OPACITY_TRANSPARENT diff --git a/code/datums/actions/mobs/lava_swoop.dm b/code/datums/actions/mobs/lava_swoop.dm index 92adeba3372..b9aaf6ade79 100644 --- a/code/datums/actions/mobs/lava_swoop.dm +++ b/code/datums/actions/mobs/lava_swoop.dm @@ -201,7 +201,7 @@ duration = 10 /obj/effect/temp_visual/dragon_flight - icon = 'icons/mob/lavaland/64x64megafauna.dmi' + icon = 'icons/mob/simple/lavaland/64x64megafauna.dmi' icon_state = "dragon" layer = ABOVE_ALL_MOB_LAYER plane = GAME_PLANE_UPPER_FOV_HIDDEN diff --git a/code/datums/actions/mobs/small_sprite.dm b/code/datums/actions/mobs/small_sprite.dm index 46ffd26e499..21a2c920ee5 100644 --- a/code/datums/actions/mobs/small_sprite.dm +++ b/code/datums/actions/mobs/small_sprite.dm @@ -10,12 +10,12 @@ var/small_icon_state /datum/action/small_sprite/queen - small_icon = 'icons/mob/alien.dmi' + small_icon = 'icons/mob/nonhuman-player/alien.dmi' small_icon_state = "alienq" /datum/action/small_sprite/megafauna icon_icon = 'icons/mob/actions/actions_xeno.dmi' - small_icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + small_icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' /datum/action/small_sprite/megafauna/drake small_icon_state = "ash_whelp" @@ -30,14 +30,14 @@ small_icon_state = "mega_legion" /datum/action/small_sprite/mega_arachnid - small_icon = 'icons/mob/jungle/arachnid.dmi' + small_icon = 'icons/mob/simple/jungle/arachnid.dmi' small_icon_state = "arachnid_mini" background_icon_state = "bg_demon" /datum/action/small_sprite/space_dragon - small_icon = 'icons/mob/carp.dmi' + small_icon = 'icons/mob/simple/carp.dmi' small_icon_state = "carp" - icon_icon = 'icons/mob/carp.dmi' + icon_icon = 'icons/mob/simple/carp.dmi' button_icon_state = "carp" /datum/action/small_sprite/Trigger(trigger_flags) diff --git a/code/datums/ai/dog/dog_controller.dm b/code/datums/ai/dog/dog_controller.dm index 74058b2226c..2b3ea434c3c 100644 --- a/code/datums/ai/dog/dog_controller.dm +++ b/code/datums/ai/dog/dog_controller.dm @@ -177,7 +177,7 @@ COMMAND_HEEL = image(icon = 'icons/testing/turf_analysis.dmi', icon_state = "red_arrow"), COMMAND_FETCH = image(icon = 'icons/mob/actions/actions_spells.dmi', icon_state = "summons"), COMMAND_ATTACK = image(icon = 'icons/effects/effects.dmi', icon_state = "bite"), - COMMAND_DIE = image(icon = 'icons/mob/pets.dmi', icon_state = "puppy_dead") + COMMAND_DIE = image(icon = 'icons/mob/simple/pets.dmi', icon_state = "puppy_dead") ) var/choice = show_radial_menu(clicker, pawn, commands, custom_check = CALLBACK(src, .proc/check_menu, clicker), tooltips = TRUE) diff --git a/code/datums/brain_damage/imaginary_friend.dm b/code/datums/brain_damage/imaginary_friend.dm index 7b5d6760ec8..349981f5664 100644 --- a/code/datums/brain_damage/imaginary_friend.dm +++ b/code/datums/brain_damage/imaginary_friend.dm @@ -141,11 +141,11 @@ appearance_job = SSjob.GetJob(JOB_ASSISTANT) if(istype(appearance_job, /datum/job/ai)) - human_image = icon('icons/mob/ai.dmi', icon_state = resolve_ai_icon(appearance_from_prefs.read_preference(/datum/preference/choiced/ai_core_display)), dir = SOUTH) + human_image = icon('icons/mob/silicon/ai.dmi', icon_state = resolve_ai_icon(appearance_from_prefs.read_preference(/datum/preference/choiced/ai_core_display)), dir = SOUTH) return if(istype(appearance_job, /datum/job/cyborg)) - human_image = icon('icons/mob/robots.dmi', icon_state = "robot") + human_image = icon('icons/mob/silicon/robots.dmi', icon_state = "robot") return human_image = get_flat_human_icon(null, appearance_job, appearance_from_prefs) @@ -214,7 +214,7 @@ //speech bubble if(owner.client) - var/mutable_appearance/MA = mutable_appearance('icons/mob/talk.dmi', src, "default[say_test(message)]", FLY_LAYER) + var/mutable_appearance/MA = mutable_appearance('icons/mob/effects/talk.dmi', src, "default[say_test(message)]", FLY_LAYER) MA.plane = ABOVE_GAME_PLANE MA.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA INVOKE_ASYNC(GLOBAL_PROC, /proc/flick_overlay, MA, list(owner.client), 30) @@ -319,4 +319,4 @@ /mob/camera/imaginary_friend/trapped/setup_friend() real_name = "[owner.real_name]?" name = real_name - human_image = icon('icons/mob/lavaland/lavaland_monsters.dmi', icon_state = "curseblob") + human_image = icon('icons/mob/simple/lavaland/lavaland_monsters.dmi', icon_state = "curseblob") diff --git a/code/datums/brain_damage/magic.dm b/code/datums/brain_damage/magic.dm index 6bfb4cea22e..70f3fa73497 100644 --- a/code/datums/brain_damage/magic.dm +++ b/code/datums/brain_damage/magic.dm @@ -118,5 +118,5 @@ /obj/effect/hallucination/simple/stalker_phantom name = "???" desc = "It's coming closer..." - image_icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + image_icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' image_state = "curseblob" diff --git a/code/datums/brain_damage/special.dm b/code/datums/brain_damage/special.dm index c3427f53c53..eddf9156af7 100644 --- a/code/datums/brain_damage/special.dm +++ b/code/datums/brain_damage/special.dm @@ -394,7 +394,7 @@ /obj/effect/hallucination/simple/securitron name = "Securitron" desc = "The LAW is coming." - image_icon = 'icons/mob/aibots.dmi' + image_icon = 'icons/mob/silicon/aibots.dmi' image_state = "secbot-c" var/victim diff --git a/code/datums/components/lockon_aiming.dm b/code/datums/components/lockon_aiming.dm index 7e55754ffc8..2fafc7c9be1 100644 --- a/code/datums/components/lockon_aiming.dm +++ b/code/datums/components/lockon_aiming.dm @@ -4,7 +4,7 @@ /datum/component/lockon_aiming dupe_mode = COMPONENT_DUPE_ALLOWED - var/lock_icon = 'icons/mob/cameramob.dmi' + var/lock_icon = 'icons/mob/silicon/cameramob.dmi' var/lock_icon_state = "marker" var/mutable_appearance/lock_appearance var/list/image/lock_images diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm index 104d9fab271..267c7f2354a 100644 --- a/code/datums/dog_fashion.dm +++ b/code/datums/dog_fashion.dm @@ -40,10 +40,10 @@ /datum/dog_fashion/head - icon_file = 'icons/mob/corgi_head.dmi' + icon_file = 'icons/mob/simple/corgi_head.dmi' /datum/dog_fashion/back - icon_file = 'icons/mob/corgi_back.dmi' + icon_file = 'icons/mob/simple/corgi_back.dmi' /datum/dog_fashion/head/helmet name = "Sergeant REAL_NAME" diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm index 36a04e63aae..e7e244ce930 100644 --- a/code/datums/greyscale/config_types/greyscale_configs.dm +++ b/code/datums/greyscale/config_types/greyscale_configs.dm @@ -35,7 +35,7 @@ /datum/greyscale_config/carp name = "Space Carp" - icon_file = 'icons/mob/carp.dmi' + icon_file = 'icons/mob/simple/carp.dmi' json_config = 'code/datums/greyscale/json_configs/carp.json' /datum/greyscale_config/carp/disk_mouth diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index 0ef45139dce..d5013794e25 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -300,7 +300,7 @@ if(ispath(preset_type,/datum/preset_holoimage)) record.entries += list(list(HOLORECORD_PRESET,preset_type)) if(!preset_image_type) - record.caller_image = image('icons/mob/animal.dmi',"old") + record.caller_image = image('icons/mob/simple/animal.dmi',"old") else var/datum/preset_holoimage/H = new preset_image_type record.caller_image = H.build_image() diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index 4d068c7a4d7..e85c539034c 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -305,11 +305,11 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache) if(species == "unknown") . += "Some feet." else if(species == SPECIES_MONKEY) - . += "[icon2html('icons/mob/human.dmi', user, "monkey")] Some monkey feet." + . += "[icon2html('icons/mob/species/human/human.dmi', user, "monkey")] Some monkey feet." else if(species == SPECIES_HUMAN) - . += "[icon2html('icons/mob/human_parts.dmi', user, "default_human_l_leg")] Some human feet." + . += "[icon2html('icons/mob/species/human/bodyparts.dmi', user, "default_human_l_leg")] Some human feet." else - . += "[icon2html('icons/mob/human_parts.dmi', user, "[species]_l_leg")] Some [species] feet." + . += "[icon2html('icons/mob/species/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/effects/decals/cleanable/robots.dm b/code/game/objects/effects/decals/cleanable/robots.dm index fd048e16f99..0ff84590584 100644 --- a/code/game/objects/effects/decals/cleanable/robots.dm +++ b/code/game/objects/effects/decals/cleanable/robots.dm @@ -3,7 +3,7 @@ /obj/effect/decal/cleanable/robot_debris name = "robot debris" desc = "It's a useless heap of junk... or is it?" - icon = 'icons/mob/robots.dmi' + icon = 'icons/mob/silicon/robots.dmi' icon_state = "gib1" layer = LOW_OBJ_LAYER random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7") @@ -72,7 +72,7 @@ /obj/effect/decal/cleanable/oil name = "motor oil" desc = "It's black and greasy. Looks like Beepsky made another mess." - icon = 'icons/mob/robots.dmi' + icon = 'icons/mob/silicon/robots.dmi' icon_state = "floor1" random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7") blood_state = BLOOD_STATE_OIL diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm index ccef2c3b38e..1d633fc7c5f 100644 --- a/code/game/objects/effects/decals/remains.dm +++ b/code/game/objects/effects/decals/remains.dm @@ -26,7 +26,7 @@ /obj/effect/decal/remains/robot desc = "They look like the remains of something mechanical. They have a strange aura about them." - icon = 'icons/mob/robots.dmi' + icon = 'icons/mob/silicon/robots.dmi' icon_state = "remainsrobot" /obj/effect/decal/cleanable/robot_debris/old diff --git a/code/game/objects/effects/spawners/xeno_egg_delivery.dm b/code/game/objects/effects/spawners/xeno_egg_delivery.dm index d0e99d0f903..75d5a26612d 100644 --- a/code/game/objects/effects/spawners/xeno_egg_delivery.dm +++ b/code/game/objects/effects/spawners/xeno_egg_delivery.dm @@ -1,6 +1,6 @@ /obj/effect/spawner/xeno_egg_delivery name = "xeno egg delivery" - icon = 'icons/mob/alien.dmi' + icon = 'icons/mob/nonhuman-player/alien.dmi' icon_state = "egg_growing" var/announcement_time = 1200 diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index c590b2b187c..fea00b885e6 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -84,7 +84,7 @@ /obj/effect/temp_visual/dir_setting/ninja name = "ninja shadow" - icon = 'icons/mob/mob.dmi' + icon = 'icons/mob/simple/mob.dmi' icon_state = "uncloak" duration = 9 @@ -103,7 +103,7 @@ /obj/effect/temp_visual/dir_setting/wraith name = "shadow" - icon = 'icons/mob/cult.dmi' + icon = 'icons/mob/nonhuman-player/cult.dmi' icon_state = "phase_shift2_cult" duration = 0.6 SECONDS @@ -176,7 +176,7 @@ /obj/effect/temp_visual/wizard name = "water" - icon = 'icons/mob/mob.dmi' + icon = 'icons/mob/simple/mob.dmi' icon_state = "reappear" duration = 5 @@ -185,7 +185,7 @@ duration = 12 /obj/effect/temp_visual/monkeyify - icon = 'icons/mob/mob.dmi' + icon = 'icons/mob/simple/mob.dmi' icon_state = "h2monkey" duration = 22 @@ -193,7 +193,7 @@ icon_state = "monkey2h" /obj/effect/temp_visual/borgflash - icon = 'icons/mob/mob.dmi' + icon = 'icons/mob/simple/mob.dmi' icon_state = "blspell" duration = 5 @@ -284,7 +284,7 @@ duration = 9 /obj/effect/temp_visual/gib_animation - icon = 'icons/mob/mob.dmi' + icon = 'icons/mob/simple/mob.dmi' duration = 15 /obj/effect/temp_visual/gib_animation/Initialize(mapload, gib_icon) @@ -292,10 +292,10 @@ . = ..() /obj/effect/temp_visual/gib_animation/animal - icon = 'icons/mob/animal.dmi' + icon = 'icons/mob/simple/animal.dmi' /obj/effect/temp_visual/dust_animation - icon = 'icons/mob/mob.dmi' + icon = 'icons/mob/simple/mob.dmi' duration = 15 /obj/effect/temp_visual/dust_animation/Initialize(mapload, dust_icon) @@ -303,7 +303,7 @@ . = ..() /obj/effect/temp_visual/mummy_animation - icon = 'icons/mob/mob.dmi' + icon = 'icons/mob/simple/mob.dmi' icon_state = "mummy_revive" duration = 20 @@ -401,7 +401,7 @@ /obj/effect/temp_visual/heart name = "heart" - icon = 'icons/mob/animal.dmi' + icon = 'icons/mob/simple/animal.dmi' icon_state = "heart" duration = 25 diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index 666c0f2895d..d52cda06038 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -31,8 +31,8 @@ "Ash Walker" = image(icon = src.icon, icon_state = "cutout_free_antag"), "Deathsquad Officer" = image(icon = src.icon, icon_state = "cutout_deathsquad"), "Ian" = image(icon = src.icon, icon_state = "cutout_ian"), - "Slaughter Demon" = image(icon = 'icons/mob/mob.dmi', icon_state = "daemon"), - "Laughter Demon" = image(icon = 'icons/mob/mob.dmi', icon_state = "bowmon"), + "Slaughter Demon" = image(icon = 'icons/mob/simple/mob.dmi', icon_state = "daemon"), + "Laughter Demon" = image(icon = 'icons/mob/simple/mob.dmi', icon_state = "bowmon"), "Private Security Officer" = image(icon = src.icon, icon_state = "cutout_ntsec") )) @@ -180,12 +180,12 @@ if("Slaughter Demon") name = "slaughter demon" desc = "A cardboard cutout of a slaughter demon." - icon = 'icons/mob/mob.dmi' + icon = 'icons/mob/simple/mob.dmi' icon_state = "daemon" if("Laughter Demon") name = "laughter demon" desc = "A cardboard cutout of a laughter demon." - icon = 'icons/mob/mob.dmi' + icon = 'icons/mob/simple/mob.dmi' icon_state = "bowmon" if("Private Security Officer") name = "Private Security Officer" diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm index ed9b3efbee6..df6a258b209 100644 --- a/code/game/objects/items/dehy_carp.dm +++ b/code/game/objects/items/dehy_carp.dm @@ -27,7 +27,7 @@ visible_message(span_notice("[src] swells up!")) //Animation - icon = 'icons/mob/carp.dmi' + icon = 'icons/mob/simple/carp.dmi' flick("carp_swell", src) //Wait for animation to end sleep(6) @@ -63,7 +63,7 @@ H.spawn_gibs() H.apply_damage(200, def_zone = BODY_ZONE_CHEST) forceMove(get_turf(H)) //we move it back - icon = 'icons/mob/carp.dmi' + icon = 'icons/mob/simple/carp.dmi' flick("carp_swell", src) sleep(6) //let the animation play out diff --git a/code/game/objects/items/hand_items.dm b/code/game/objects/items/hand_items.dm index 53d766992b9..aad4dabb8b8 100644 --- a/code/game/objects/items/hand_items.dm +++ b/code/game/objects/items/hand_items.dm @@ -380,7 +380,7 @@ /obj/item/hand_item/kisser name = "kiss" desc = "I want you all to know, everyone and anyone, to seal it with a kiss." - icon = 'icons/mob/animal.dmi' + icon = 'icons/mob/simple/animal.dmi' icon_state = "heart" inhand_icon_state = "nothing" /// The kind of projectile this version of the kiss blower fires @@ -440,7 +440,7 @@ /obj/projectile/kiss name = "kiss" - icon = 'icons/mob/animal.dmi' + icon = 'icons/mob/simple/animal.dmi' icon_state = "heart" hitsound = 'sound/effects/kiss.ogg' hitsound_wall = 'sound/effects/kiss.ogg' diff --git a/code/game/objects/items/robot/items/generic.dm b/code/game/objects/items/robot/items/generic.dm index 7e683725634..0b2eb4b642d 100644 --- a/code/game/objects/items/robot/items/generic.dm +++ b/code/game/objects/items/robot/items/generic.dm @@ -10,7 +10,7 @@ #define HARM_ALARM_SAFETY_COOLDOWN (20 SECONDS) /obj/item/borg - icon = 'icons/mob/robot_items.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' /obj/item/borg/stun name = "electrically-charged arm" diff --git a/code/game/objects/items/robot/items/storage.dm b/code/game/objects/items/robot/items/storage.dm index 869a2a29cdb..b8cac897969 100644 --- a/code/game/objects/items/robot/items/storage.dm +++ b/code/game/objects/items/robot/items/storage.dm @@ -1,7 +1,7 @@ /obj/item/borg/apparatus name = "unknown storage apparatus" desc = "This device seems nonfunctional." - icon = 'icons/mob/robot_items.dmi' + icon = 'icons/mob/silicon/robot_items.dmi' icon_state = "hugmodule" /// The item stored inside of this apparatus var/obj/item/stored diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 8c07ce60468..3db8b62894f 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -125,7 +125,7 @@ GLOBAL_LIST_INIT(xeno_recipes, list ( \ name = "alien chitin" desc = "A piece of the hide of a terrible creature." singular_name = "alien hide piece" - icon = 'icons/mob/alien.dmi' + icon = 'icons/mob/nonhuman-player/alien.dmi' icon_state = "chitin" novariants = TRUE merge_type = /obj/item/stack/sheet/xenochitin @@ -133,13 +133,13 @@ GLOBAL_LIST_INIT(xeno_recipes, list ( \ /obj/item/xenos_claw name = "alien claw" desc = "The claw of a terrible creature." - icon = 'icons/mob/alien.dmi' + icon = 'icons/mob/nonhuman-player/alien.dmi' icon_state = "claw" /obj/item/weed_extract name = "weed extract" desc = "A piece of slimy, purplish weed." - icon = 'icons/mob/alien.dmi' + icon = 'icons/mob/nonhuman-player/alien.dmi' icon_state = "weed_extract" /obj/item/stack/sheet/hairlesshide diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm index 17499ed8980..da50874df0f 100644 --- a/code/game/objects/structures/ai_core.dm +++ b/code/game/objects/structures/ai_core.dm @@ -4,7 +4,7 @@ density = TRUE anchored = FALSE name = "\improper AI core" - icon = 'icons/mob/ai.dmi' + icon = 'icons/mob/silicon/ai.dmi' icon_state = "0" desc = "The framework for an artificial intelligence core." max_integrity = 500 diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index c80e53b48df..be71d5e72db 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -8,7 +8,7 @@ /obj/structure/alien - icon = 'icons/mob/alien.dmi' + icon = 'icons/mob/nonhuman-player/alien.dmi' max_integrity = 100 /obj/structure/alien/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) diff --git a/code/game/objects/structures/beds_chairs/alien_nest.dm b/code/game/objects/structures/beds_chairs/alien_nest.dm index 5705a8aa634..ca45862b46d 100644 --- a/code/game/objects/structures/beds_chairs/alien_nest.dm +++ b/code/game/objects/structures/beds_chairs/alien_nest.dm @@ -14,7 +14,7 @@ buildstacktype = null flags_1 = NODECONSTRUCT_1 bolts = FALSE - var/static/mutable_appearance/nest_overlay = mutable_appearance('icons/mob/alien.dmi', "nestoverlay", LYING_MOB_LAYER) + var/static/mutable_appearance/nest_overlay = mutable_appearance('icons/mob/nonhuman-player/alien.dmi', "nestoverlay", LYING_MOB_LAYER) /obj/structure/bed/nest/user_unbuckle_mob(mob/living/buckled_mob, mob/living/user) if(has_buckled_mobs()) diff --git a/code/game/objects/structures/hivebot.dm b/code/game/objects/structures/hivebot.dm index f5570c49fd2..d02f2555f3d 100644 --- a/code/game/objects/structures/hivebot.dm +++ b/code/game/objects/structures/hivebot.dm @@ -1,7 +1,7 @@ /obj/structure/hivebot_beacon name = "beacon" desc = "Some odd beacon thing." - icon = 'icons/mob/hivebot.dmi' + icon = 'icons/mob/simple/hivebot.dmi' icon_state = "def_radar-off" anchored = TRUE density = TRUE diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm index d1c28b4834b..ba269b35698 100644 --- a/code/game/objects/structures/icemoon/cave_entrance.dm +++ b/code/game/objects/structures/icemoon/cave_entrance.dm @@ -12,7 +12,7 @@ GLOBAL_LIST_INIT(ore_probability, list( /obj/structure/spawner/ice_moon name = "cave entrance" desc = "A hole in the ground, filled with monsters ready to defend it." - icon = 'icons/mob/nest.dmi' + icon = 'icons/mob/simple/lavaland/nest.dmi' icon_state = "hole" faction = list("mining") max_mobs = 3 @@ -108,7 +108,7 @@ GLOBAL_LIST_INIT(ore_probability, list( name = "collapsing demonic portal" desc = "It's slowly fading!" layer = TABLE_LAYER - icon = 'icons/mob/nest.dmi' + icon = 'icons/mob/simple/lavaland/nest.dmi' icon_state = "nether" anchored = TRUE density = TRUE diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm index f211ace452a..e3c0928bc73 100644 --- a/code/game/objects/structures/lavaland/necropolis_tendril.dm +++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm @@ -3,7 +3,7 @@ name = "necropolis tendril" desc = "A vile tendril of corruption, originating deep underground. Terrible monsters are pouring out of it." - icon = 'icons/mob/nest.dmi' + icon = 'icons/mob/simple/lavaland/nest.dmi' icon_state = "tendril" faction = list("mining") @@ -75,7 +75,7 @@ GLOBAL_LIST_INIT(tendrils, list()) name = "collapsing necropolis tendril" desc = "Get your loot and get clear!" layer = TABLE_LAYER - icon = 'icons/mob/nest.dmi' + icon = 'icons/mob/simple/lavaland/nest.dmi' icon_state = "tendril" anchored = TRUE density = TRUE diff --git a/code/game/objects/structures/showcase.dm b/code/game/objects/structures/showcase.dm index b586695fc65..23a67a08c83 100644 --- a/code/game/objects/structures/showcase.dm +++ b/code/game/objects/structures/showcase.dm @@ -52,7 +52,7 @@ /obj/structure/showcase/cyborg/old name = "Cyborg Statue" desc = "An old, deactivated cyborg. Whilst once actively used to guard against intruders, it now simply intimidates them with its cold, steely gaze." - icon = 'icons/mob/robots.dmi' + icon = 'icons/mob/silicon/robots.dmi' icon_state = "robot_old" density = FALSE @@ -102,7 +102,24 @@ icon = 'icons/obj/machines/telecomms.dmi' icon_state = "processor" +/obj/structure/showcase/wizard + name = "wizard of yendor showcase" + desc = "A historical figure of great importance to the wizard federation. He spent his long life learning magic, stealing artifacts, and harassing idiots with swords. May he rest forever, Rodney." + icon = 'icons/mob/simple/mob.dmi' + icon_state = "nim" +/obj/structure/showcase/machinery/rng + name = "byond random number generator" + desc = "A strange machine supposedly from another world. The Wizard Federation has been meddling with it for years." + icon = 'icons/obj/machines/telecomms.dmi' + icon_state = "processor" + +/obj/structure/showcase/katana + name = "seppuku katana" + density = 0 + desc = "Welp, only one way to recover your honour." + icon = 'icons/obj/weapons/items_and_weapons.dmi' + icon_state = "katana" //Deconstructing //Showcases can be any sprite, so it makes sense that they can't be constructed. diff --git a/code/game/objects/structures/spawner.dm b/code/game/objects/structures/spawner.dm index 855bda19eb6..ffe41225ae6 100644 --- a/code/game/objects/structures/spawner.dm +++ b/code/game/objects/structures/spawner.dm @@ -1,6 +1,6 @@ /obj/structure/spawner name = "monster nest" - icon = 'icons/mob/animal.dmi' + icon = 'icons/mob/simple/animal.dmi' icon_state = "hole" max_integrity = 100 @@ -37,7 +37,7 @@ name = "bone pit" desc = "A pit full of bones, and some still seem to be moving..." icon_state = "hole" - icon = 'icons/mob/nest.dmi' + icon = 'icons/mob/simple/lavaland/nest.dmi' max_integrity = 150 max_mobs = 15 spawn_time = 150 @@ -63,7 +63,7 @@ icon_state = "hole" max_integrity = 200 max_mobs = 3 - icon = 'icons/mob/nest.dmi' + icon = 'icons/mob/simple/lavaland/nest.dmi' spawn_text = "crawls out of" mob_types = list(/mob/living/simple_animal/hostile/asteroid/goldgrub, /mob/living/simple_animal/hostile/asteroid/goliath, /mob/living/simple_animal/hostile/asteroid/hivelord, /mob/living/simple_animal/hostile/asteroid/basilisk, /mob/living/simple_animal/hostile/asteroid/fugu) faction = list("mining") diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index cc64cd38742..4a0f418104b 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -301,9 +301,9 @@ GLOBAL_VAR_INIT(say_disabled, FALSE) var/datum/job/JB = new job switch(JB.title) if(JOB_AI) - final.Insert(icon('icons/mob/ai.dmi', "ai", SOUTH, 1), "AI") + final.Insert(icon('icons/mob/silicon/ai.dmi', "ai", SOUTH, 1), "AI") if(JOB_CYBORG) - final.Insert(icon('icons/mob/robots.dmi', "robot", SOUTH, 1), "Cyborg") + final.Insert(icon('icons/mob/silicon/robots.dmi', "robot", SOUTH, 1), "Cyborg") else for(var/obj/item/I in D) qdel(I) @@ -331,9 +331,9 @@ GLOBAL_VAR_INIT(say_disabled, FALSE) to_chat(world, "Generating icon for job [JB.title]") switch(JB.title) if("AI") - job_key_to_icon["AI"] = icon('icons/mob/ai.dmi', "ai", SOUTH, 1) + job_key_to_icon["AI"] = icon('icons/mob/silicon/ai.dmi', "ai", SOUTH, 1) if("Cyborg") - job_key_to_icon["Cyborg"] = icon('icons/mob/robots.dmi', "robot", SOUTH, 1) + job_key_to_icon["Cyborg"] = icon('icons/mob/silicon/robots.dmi', "robot", SOUTH, 1) else randomize_human(D) if(JB.outfit) diff --git a/code/modules/antagonists/abductor/machinery/camera.dm b/code/modules/antagonists/abductor/machinery/camera.dm index c64b66b9121..604fe94b471 100644 --- a/code/modules/antagonists/abductor/machinery/camera.dm +++ b/code/modules/antagonists/abductor/machinery/camera.dm @@ -22,7 +22,7 @@ /obj/machinery/computer/camera_advanced/abductor/CreateEye() ..() eyeobj.visible_icon = TRUE - eyeobj.icon = 'icons/mob/cameramob.dmi' + eyeobj.icon = 'icons/mob/silicon/cameramob.dmi' eyeobj.icon_state = "abductor_camera" eyeobj.invisibility = INVISIBILITY_OBSERVER diff --git a/code/modules/antagonists/blob/blob.dm b/code/modules/antagonists/blob/blob.dm index 311451bd0c1..c849a5e3ca5 100644 --- a/code/modules/antagonists/blob/blob.dm +++ b/code/modules/antagonists/blob/blob.dm @@ -37,9 +37,9 @@ /datum/antagonist/blob/get_preview_icon() var/datum/blobstrain/reagent/reactive_spines/reactive_spines = /datum/blobstrain/reagent/reactive_spines - var/icon/icon = icon('icons/mob/blob.dmi', "blob_core") + var/icon/icon = icon('icons/mob/nonhuman-player/blob.dmi', "blob_core") icon.Blend(initial(reactive_spines.color), ICON_MULTIPLY) - icon.Blend(icon('icons/mob/blob.dmi', "blob_core_overlay"), ICON_OVERLAY) + icon.Blend(icon('icons/mob/nonhuman-player/blob.dmi', "blob_core_overlay"), ICON_OVERLAY) icon.Scale(ANTAGONIST_PREVIEW_ICON_SIZE, ANTAGONIST_PREVIEW_ICON_SIZE) return icon @@ -62,7 +62,7 @@ /datum/action/innate/blobpop name = "Pop" desc = "Unleash the blob" - icon_icon = 'icons/mob/blob.dmi' + icon_icon = 'icons/mob/nonhuman-player/blob.dmi' button_icon_state = "blob" /// The time taken before this ability is automatically activated. @@ -122,7 +122,7 @@ var/icon/blob_icon = ..() var/datum/blobstrain/reagent/reactive_spines/reactive_spines = /datum/blobstrain/reagent/reactive_spines - var/icon/blob_head = icon('icons/mob/blob.dmi', "blob_head") + var/icon/blob_head = icon('icons/mob/nonhuman-player/blob.dmi', "blob_head") blob_head.Blend(initial(reactive_spines.complementary_color), ICON_MULTIPLY) var/icon/human_icon = render_preview_outfit(/datum/outfit/job/miner) diff --git a/code/modules/antagonists/blob/blob_mobs.dm b/code/modules/antagonists/blob/blob_mobs.dm index 439515f10c1..ee18b25bffc 100644 --- a/code/modules/antagonists/blob/blob_mobs.dm +++ b/code/modules/antagonists/blob/blob_mobs.dm @@ -5,7 +5,7 @@ //Do not spawn /mob/living/simple_animal/hostile/blob - icon = 'icons/mob/blob.dmi' + icon = 'icons/mob/nonhuman-player/blob.dmi' pass_flags = PASSBLOB faction = list(ROLE_BLOB) bubble_icon = "blob" @@ -236,7 +236,7 @@ remove_atom_colour(FIXED_COLOUR_PRIORITY) if(is_zombie) copy_overlays(oldguy, TRUE) - var/mutable_appearance/blob_head_overlay = mutable_appearance('icons/mob/blob.dmi', "blob_head") + var/mutable_appearance/blob_head_overlay = mutable_appearance('icons/mob/nonhuman-player/blob.dmi', "blob_head") if(overmind) blob_head_overlay.color = overmind.blobstrain.complementary_color color = initial(color)//looks better. @@ -323,7 +323,7 @@ if(damagesources) adjustHealth(maxHealth * BLOBMOB_BLOBBERNAUT_HEALTH_DECAY * damagesources * delta_time) //take 2.5% of max health as damage when not near the blob or if the naut has no factory, 5% if both - var/image/I = new('icons/mob/blob.dmi', src, "nautdamage", MOB_LAYER+0.01) + var/image/I = new('icons/mob/nonhuman-player/blob.dmi', src, "nautdamage", MOB_LAYER+0.01) I.appearance_flags = RESET_COLOR if(overmind) I.color = overmind.blobstrain.complementary_color diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm index e2b05f5a64b..f3a6f25b137 100644 --- a/code/modules/antagonists/blob/overmind.dm +++ b/code/modules/antagonists/blob/overmind.dm @@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) name = "Blob Overmind" real_name = "Blob Overmind" desc = "The overmind. It controls the blob." - icon = 'icons/mob/cameramob.dmi' + icon = 'icons/mob/silicon/cameramob.dmi' icon_state = "marker" mouse_opacity = MOUSE_OPACITY_ICON move_on_shuttle = 1 @@ -185,7 +185,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) continue A.color = blobstrain.color A.name = "blob" - A.icon = 'icons/mob/blob.dmi' + A.icon = 'icons/mob/nonhuman-player/blob.dmi' A.icon_state = "blob_shield" A.layer = BELOW_MOB_LAYER A.invisibility = 0 diff --git a/code/modules/antagonists/blob/powers.dm b/code/modules/antagonists/blob/powers.dm index fe893b7373f..f52500fdeb3 100644 --- a/code/modules/antagonists/blob/powers.dm +++ b/code/modules/antagonists/blob/powers.dm @@ -298,7 +298,7 @@ for (var/_ in 1 to BLOB_POWER_REROLL_CHOICES) var/datum/blobstrain/strain = pick_n_take(new_strains) - var/image/strain_icon = image('icons/mob/blob.dmi', "blob_core") + var/image/strain_icon = image('icons/mob/nonhuman-player/blob.dmi', "blob_core") strain_icon.color = initial(strain.color) var/info_text = span_boldnotice("[initial(strain.name)]") diff --git a/code/modules/antagonists/blob/structures/_blob.dm b/code/modules/antagonists/blob/structures/_blob.dm index 4095dc27ce9..73b9753febc 100644 --- a/code/modules/antagonists/blob/structures/_blob.dm +++ b/code/modules/antagonists/blob/structures/_blob.dm @@ -1,7 +1,7 @@ //I will need to recode parts of this but I am way too tired atm //I don't know who left this comment but they never did come back /obj/structure/blob name = "blob" - icon = 'icons/mob/blob.dmi' + icon = 'icons/mob/nonhuman-player/blob.dmi' light_range = 2 desc = "A thick wall of writhing tendrils." density = TRUE diff --git a/code/modules/antagonists/blob/structures/core.dm b/code/modules/antagonists/blob/structures/core.dm index ed4da5c339a..bf3ae12177d 100644 --- a/code/modules/antagonists/blob/structures/core.dm +++ b/code/modules/antagonists/blob/structures/core.dm @@ -1,6 +1,6 @@ /obj/structure/blob/special/core name = "blob core" - icon = 'icons/mob/blob.dmi' + icon = 'icons/mob/nonhuman-player/blob.dmi' icon_state = "blank_blob" desc = "A huge, pulsating yellow mass." max_integrity = BLOB_CORE_MAX_HP @@ -43,11 +43,11 @@ /obj/structure/blob/special/core/update_overlays() . = ..() - var/mutable_appearance/blob_overlay = mutable_appearance('icons/mob/blob.dmi', "blob") + var/mutable_appearance/blob_overlay = mutable_appearance('icons/mob/nonhuman-player/blob.dmi', "blob") if(overmind) blob_overlay.color = overmind.blobstrain.color . += blob_overlay - . += mutable_appearance('icons/mob/blob.dmi', "blob_core_overlay") + . += mutable_appearance('icons/mob/nonhuman-player/blob.dmi', "blob_core_overlay") /obj/structure/blob/special/core/update_icon() . = ..() diff --git a/code/modules/antagonists/blob/structures/factory.dm b/code/modules/antagonists/blob/structures/factory.dm index 4688d3246dd..45a62fd4d20 100644 --- a/code/modules/antagonists/blob/structures/factory.dm +++ b/code/modules/antagonists/blob/structures/factory.dm @@ -1,6 +1,6 @@ /obj/structure/blob/special/factory name = "factory blob" - icon = 'icons/mob/blob.dmi' + icon = 'icons/mob/nonhuman-player/blob.dmi' icon_state = "blob_factory" desc = "A thick spire of tendrils." max_integrity = BLOB_FACTORY_MAX_HP diff --git a/code/modules/antagonists/blob/structures/node.dm b/code/modules/antagonists/blob/structures/node.dm index c9d9fc74335..23af12001cd 100644 --- a/code/modules/antagonists/blob/structures/node.dm +++ b/code/modules/antagonists/blob/structures/node.dm @@ -1,6 +1,6 @@ /obj/structure/blob/special/node name = "blob node" - icon = 'icons/mob/blob.dmi' + icon = 'icons/mob/nonhuman-player/blob.dmi' icon_state = "blank_blob" desc = "A large, pulsating yellow mass." max_integrity = BLOB_NODE_MAX_HP @@ -29,14 +29,14 @@ /obj/structure/blob/special/node/update_overlays() . = ..() - var/mutable_appearance/blob_overlay = mutable_appearance('icons/mob/blob.dmi', "blob") + var/mutable_appearance/blob_overlay = mutable_appearance('icons/mob/nonhuman-player/blob.dmi', "blob") if(overmind) blob_overlay.color = overmind.blobstrain.color var/area/A = get_area(src) if(!(A.area_flags & BLOBS_ALLOWED)) blob_overlay.color = BlendRGB(overmind.blobstrain.color, COLOR_WHITE, 0.5) //lighten it to indicate an off-station blob . += blob_overlay - . += mutable_appearance('icons/mob/blob.dmi', "blob_node_overlay") + . += mutable_appearance('icons/mob/nonhuman-player/blob.dmi', "blob_node_overlay") /obj/structure/blob/special/node/creation_action() if(overmind) diff --git a/code/modules/antagonists/blob/structures/resource.dm b/code/modules/antagonists/blob/structures/resource.dm index 32c3bafb5da..9eb718a3f44 100644 --- a/code/modules/antagonists/blob/structures/resource.dm +++ b/code/modules/antagonists/blob/structures/resource.dm @@ -1,6 +1,6 @@ /obj/structure/blob/special/resource name = "resource blob" - icon = 'icons/mob/blob.dmi' + icon = 'icons/mob/nonhuman-player/blob.dmi' icon_state = "blob_resource" desc = "A thin spire of slightly swaying tendrils." max_integrity = BLOB_RESOURCE_MAX_HP diff --git a/code/modules/antagonists/blob/structures/shield.dm b/code/modules/antagonists/blob/structures/shield.dm index d086050210c..fe720c80d95 100644 --- a/code/modules/antagonists/blob/structures/shield.dm +++ b/code/modules/antagonists/blob/structures/shield.dm @@ -1,6 +1,6 @@ /obj/structure/blob/shield name = "strong blob" - icon = 'icons/mob/blob.dmi' + icon = 'icons/mob/nonhuman-player/blob.dmi' icon_state = "blob_shield" desc = "A solid wall of slightly twitching tendrils." var/damaged_desc = "A wall of twitching tendrils." diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index 686d4292161..75334d31042 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -976,7 +976,7 @@ structure_check() searches for nearby cultist structures required for the invoca if(!IS_CULTIST(M)) sec_hud.hide_from(M) addtimer(CALLBACK(GLOBAL_PROC, .proc/hudFix, M), duration) - var/image/A = image('icons/mob/cult.dmi',M,"cultist", ABOVE_MOB_LAYER) + var/image/A = image('icons/mob/nonhuman-player/cult.dmi',M,"cultist", ABOVE_MOB_LAYER) A.override = 1 add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/noncult, "human_apoc", A, NONE) addtimer(CALLBACK(M,/atom/.proc/remove_alt_appearance,"human_apoc",TRUE), duration) @@ -984,7 +984,7 @@ structure_check() searches for nearby cultist structures required for the invoca SEND_SOUND(M, pick(sound('sound/ambience/antag/bloodcult.ogg'),sound('sound/voice/ghost_whisper.ogg'),sound('sound/misc/ghosty_wind.ogg'))) else var/construct = pick("floater","artificer","behemoth") - var/image/B = image('icons/mob/mob.dmi',M,construct, ABOVE_MOB_LAYER) + var/image/B = image('icons/mob/simple/mob.dmi',M,construct, ABOVE_MOB_LAYER) B.override = 1 add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/noncult, "mob_apoc", B, NONE) addtimer(CALLBACK(M,/atom/.proc/remove_alt_appearance,"mob_apoc",TRUE), duration) diff --git a/code/modules/antagonists/disease/disease_mob.dm b/code/modules/antagonists/disease/disease_mob.dm index 3db4bf3a26c..4fd20975127 100644 --- a/code/modules/antagonists/disease/disease_mob.dm +++ b/code/modules/antagonists/disease/disease_mob.dm @@ -11,7 +11,7 @@ the new instance inside the host to be updated to the template's stats. name = "Sentient Disease" real_name = "Sentient Disease" desc = "" - icon = 'icons/mob/cameramob.dmi' + icon = 'icons/mob/silicon/cameramob.dmi' icon_state = "marker" mouse_opacity = MOUSE_OPACITY_ICON move_on_shuttle = FALSE diff --git a/code/modules/antagonists/heretic/magic/ash_jaunt.dm b/code/modules/antagonists/heretic/magic/ash_jaunt.dm index 9c0d403fb23..f3f3dee8a0b 100644 --- a/code/modules/antagonists/heretic/magic/ash_jaunt.dm +++ b/code/modules/antagonists/heretic/magic/ash_jaunt.dm @@ -30,7 +30,7 @@ /obj/effect/temp_visual/dir_setting/ash_shift name = "ash_shift" - icon = 'icons/mob/mob.dmi' + icon = 'icons/mob/simple/mob.dmi' icon_state = "ash_shift2" duration = 1.3 SECONDS diff --git a/code/modules/antagonists/heretic/mobs/maid_in_mirror.dm b/code/modules/antagonists/heretic/mobs/maid_in_mirror.dm index 2e844e294a1..99d4902d22b 100644 --- a/code/modules/antagonists/heretic/mobs/maid_in_mirror.dm +++ b/code/modules/antagonists/heretic/mobs/maid_in_mirror.dm @@ -3,7 +3,7 @@ name = "Maid in the Mirror" real_name = "Maid in the Mirror" desc = "A floating and flowing wisp of chilled air. Glancing at it causes it to shimmer slightly." - icon = 'icons/mob/mob.dmi' + icon = 'icons/mob/simple/mob.dmi' icon_state = "stand" icon_living = "stand" // Placeholder sprite speak_emote = list("whispers") diff --git a/code/modules/antagonists/malf_ai/datum_malf_ai.dm b/code/modules/antagonists/malf_ai/datum_malf_ai.dm index 8baf8bda46a..231e8e3f172 100644 --- a/code/modules/antagonists/malf_ai/datum_malf_ai.dm +++ b/code/modules/antagonists/malf_ai/datum_malf_ai.dm @@ -274,7 +274,7 @@ return result.Join("
") /datum/antagonist/malf_ai/get_preview_icon() - var/icon/malf_ai_icon = icon('icons/mob/ai.dmi', "ai-red") + var/icon/malf_ai_icon = icon('icons/mob/silicon/ai.dmi', "ai-red") // Crop out the borders of the AI, just the face malf_ai_icon.Crop(5, 27, 28, 6) diff --git a/code/modules/antagonists/morph/morph.dm b/code/modules/antagonists/morph/morph.dm index d95178a852f..8ddb4578310 100644 --- a/code/modules/antagonists/morph/morph.dm +++ b/code/modules/antagonists/morph/morph.dm @@ -4,7 +4,7 @@ desc = "A revolting, pulsating pile of flesh." speak_emote = list("gurgles") emote_hear = list("gurgles") - icon = 'icons/mob/animal.dmi' + icon = 'icons/mob/simple/animal.dmi' icon_state = "morph" icon_living = "morph" icon_dead = "morph_dead" diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm index b578c503d85..3360b374f4b 100644 --- a/code/modules/antagonists/revenant/revenant.dm +++ b/code/modules/antagonists/revenant/revenant.dm @@ -6,7 +6,7 @@ /mob/living/simple_animal/revenant name = "revenant" desc = "A malevolent spirit." - icon = 'icons/mob/mob.dmi' + icon = 'icons/mob/simple/mob.dmi' icon_state = "revenant_idle" var/icon_idle = "revenant_idle" var/icon_reveal = "revenant_revealed" diff --git a/code/modules/antagonists/revenant/revenant_antag.dm b/code/modules/antagonists/revenant/revenant_antag.dm index c575670b471..35c8032a201 100644 --- a/code/modules/antagonists/revenant/revenant_antag.dm +++ b/code/modules/antagonists/revenant/revenant_antag.dm @@ -21,4 +21,4 @@ . = ..() /datum/antagonist/revenant/get_preview_icon() - return finish_preview_icon(icon('icons/mob/mob.dmi', "revenant_idle")) + return finish_preview_icon(icon('icons/mob/simple/mob.dmi', "revenant_idle")) diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index 1181931f0ef..9e277f970e3 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -13,7 +13,7 @@ response_disarm_simple = "flail at" response_harm_continuous = "punches" response_harm_simple = "punch" - icon = 'icons/mob/mob.dmi' + icon = 'icons/mob/simple/mob.dmi' icon_state = "imp" icon_living = "imp" mob_biotypes = MOB_ORGANIC|MOB_HUMANOID diff --git a/code/modules/antagonists/space_dragon/space_dragon.dm b/code/modules/antagonists/space_dragon/space_dragon.dm index 5c570298f95..566d5f4ff69 100644 --- a/code/modules/antagonists/space_dragon/space_dragon.dm +++ b/code/modules/antagonists/space_dragon/space_dragon.dm @@ -62,10 +62,10 @@ return ..() /datum/antagonist/space_dragon/get_preview_icon() - var/icon/icon = icon('icons/mob/spacedragon.dmi', "spacedragon") + var/icon/icon = icon('icons/mob/nonhuman-player/spacedragon.dmi', "spacedragon") icon.Blend(COLOR_STRONG_VIOLET, ICON_MULTIPLY) - icon.Blend(icon('icons/mob/spacedragon.dmi', "overlay_base"), ICON_OVERLAY) + icon.Blend(icon('icons/mob/nonhuman-player/spacedragon.dmi', "overlay_base"), ICON_OVERLAY) icon.Crop(10, 9, 54, 53) icon.Scale(ANTAGONIST_PREVIEW_ICON_SIZE, ANTAGONIST_PREVIEW_ICON_SIZE) diff --git a/code/modules/antagonists/xeno/xeno.dm b/code/modules/antagonists/xeno/xeno.dm index 9e636a40c59..a7863fc0f83 100644 --- a/code/modules/antagonists/xeno/xeno.dm +++ b/code/modules/antagonists/xeno/xeno.dm @@ -33,7 +33,7 @@ return xeno_team /datum/antagonist/xeno/get_preview_icon() - return finish_preview_icon(icon('icons/mob/alien.dmi', "alienh")) + return finish_preview_icon(icon('icons/mob/nonhuman-player/alien.dmi', "alienh")) //XENO /mob/living/carbon/alien/mind_initialize() diff --git a/code/modules/art/statues.dm b/code/modules/art/statues.dm index a580e271f80..87be65224e7 100644 --- a/code/modules/art/statues.dm +++ b/code/modules/art/statues.dm @@ -248,6 +248,14 @@ impressiveness = 100 abstract_type = /obj/structure/statue/elder_atmosian //This one is uncarvable +///////////Goliath////////////////////////////////////////////////// +/obj/structure/statue/goliath + desc = "A lifelike statue of a horrifying monster." + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' + icon_state = "goliath" + name = "goliath" + +///////////Other Stuff////////////////////////////////////////////// /obj/item/chisel name = "chisel" desc = "Breaking and making art since 4000 BC. This one uses advanced technology to allow the creation of lifelike moving statues." diff --git a/code/modules/client/preferences/ai_core_display.dm b/code/modules/client/preferences/ai_core_display.dm index dab61f2b323..72b8219931d 100644 --- a/code/modules/client/preferences/ai_core_display.dm +++ b/code/modules/client/preferences/ai_core_display.dm @@ -8,10 +8,10 @@ /datum/preference/choiced/ai_core_display/init_possible_values() var/list/values = list() - values["Random"] = icon('icons/mob/ai.dmi', "ai-empty") + values["Random"] = icon('icons/mob/silicon/ai.dmi', "ai-empty") for (var/screen in GLOB.ai_core_display_screens - "Portrait" - "Random") - values[screen] = icon('icons/mob/ai.dmi', resolve_ai_icon_sync(screen)) + values[screen] = icon('icons/mob/silicon/ai.dmi', resolve_ai_icon_sync(screen)) return values diff --git a/code/modules/client/preferences/clothing.dm b/code/modules/client/preferences/clothing.dm index a03e236d9c0..3736d16fc16 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/human_parts_greyscale.dmi', icon), ICON_OVERLAY) + lower_half.Blend(icon('icons/mob/species/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/human_parts_greyscale.dmi', "human_r_leg") - body.Blend(icon('icons/mob/human_parts_greyscale.dmi', "human_l_leg"), ICON_OVERLAY) - body.Blend(icon('icons/mob/human_parts_greyscale.dmi', "human_r_arm"), ICON_OVERLAY) - body.Blend(icon('icons/mob/human_parts_greyscale.dmi', "human_l_arm"), ICON_OVERLAY) - body.Blend(icon('icons/mob/human_parts_greyscale.dmi', "human_r_hand"), ICON_OVERLAY) - body.Blend(icon('icons/mob/human_parts_greyscale.dmi', "human_l_hand"), ICON_OVERLAY) - body.Blend(icon('icons/mob/human_parts_greyscale.dmi', "human_chest_m"), ICON_OVERLAY) + 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/list/values = list() diff --git a/code/modules/client/preferences/ghost.dm b/code/modules/client/preferences/ghost.dm index ab191873c1b..ae84249507d 100644 --- a/code/modules/client/preferences/ghost.dm +++ b/code/modules/client/preferences/ghost.dm @@ -74,7 +74,7 @@ var/list/values = list() for (var/ghost_form in ghost_forms) - values[ghost_form] = icon('icons/mob/mob.dmi', ghost_form) + values[ghost_form] = icon('icons/mob/simple/mob.dmi', ghost_form) return values diff --git a/code/modules/client/preferences/species_features/basic.dm b/code/modules/client/preferences/species_features/basic.dm index 057377327e8..c9a4410e44c 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/human_parts_greyscale.dmi', "human_head_m") + var/icon/head_icon = icon('icons/mob/species/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 61818aee2d0..56fe5089589 100644 --- a/code/modules/client/preferences/species_features/ethereal.dm +++ b/code/modules/client/preferences/species_features/ethereal.dm @@ -13,7 +13,7 @@ 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/eyes = icon('icons/mob/human_face.dmi', "eyes") + var/icon/eyes = icon('icons/mob/species/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 2fa3f9de013..e0c9ce9764a 100644 --- a/code/modules/client/preferences/species_features/lizard.dm +++ b/code/modules/client/preferences/species_features/lizard.dm @@ -3,12 +3,12 @@ var/list/values = list() var/icon/lizard = icon('icons/mob/species/lizard/bodyparts.dmi', "lizard_head", EAST) - var/icon/eyes = icon('icons/mob/human_face.dmi', "eyes", EAST) + var/icon/eyes = icon('icons/mob/species/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/mutant_bodyparts.dmi', "m_snout_round_ADJ", EAST), ICON_OVERLAY) + lizard.Blend(icon('icons/mob/species/mutant_bodyparts.dmi', "m_snout_round_ADJ", EAST), ICON_OVERLAY) for (var/name in sprite_accessories) var/datum/sprite_accessory/sprite_accessory = sprite_accessories[name] @@ -47,7 +47,7 @@ if (sprite_accessory.icon_state != "none") var/icon/body_markings_icon = icon( - 'icons/mob/mutant_bodyparts.dmi', + 'icons/mob/species/mutant_bodyparts.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 de67f09a215..87da5b8a4d3 100644 --- a/code/modules/client/preferences/species_features/moth.dm +++ b/code/modules/client/preferences/species_features/moth.dm @@ -10,7 +10,7 @@ var/list/values = list() var/icon/moth_head = icon('icons/mob/species/moth/bodyparts.dmi', "moth_head") - moth_head.Blend(icon('icons/mob/human_face.dmi', "motheyes"), ICON_OVERLAY) + moth_head.Blend(icon('icons/mob/species/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] @@ -40,7 +40,7 @@ var/icon/moth_body = icon('icons/blanks/32x32.dmi', "nothing") - moth_body.Blend(icon('icons/mob/moth_wings.dmi', "m_moth_wings_plain_BEHIND"), ICON_OVERLAY) + moth_body.Blend(icon('icons/mob/species/moth/moth_wings.dmi', "m_moth_wings_plain_BEHIND"), ICON_OVERLAY) var/list/body_parts = list( /obj/item/bodypart/head/moth, @@ -53,7 +53,7 @@ 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_face.dmi', "motheyes"), ICON_OVERLAY) + moth_body.Blend(icon('icons/mob/species/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] @@ -65,8 +65,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/moth_wings.dmi', "m_moth_wings_plain_FRONT"), ICON_OVERLAY) - icon_with_markings.Blend(icon('icons/mob/moth_antennae.dmi', "m_moth_antennae_plain_FRONT"), 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) // 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 118572dc444..7bfcddc40bb 100644 --- a/code/modules/client/preferences/species_features/pod.dm +++ b/code/modules/client/preferences/species_features/pod.dm @@ -8,7 +8,7 @@ /datum/preference/choiced/pod_hair/init_possible_values() var/list/values = list() - var/icon/pod_head = icon('icons/mob/human_parts_greyscale.dmi', "pod_head_m") + var/icon/pod_head = icon('icons/mob/species/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 f99f5cad4e5..00307899410 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/human_face.dmi' // default icon for all hairs + icon = 'icons/mob/species/human/human_face.dmi' // default icon for all hairs icon_state = "hair_vlong" inhand_icon_state = "pwig" worn_icon_state = "wig" diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm index b153b25e2d2..3be449a46ba 100644 --- a/code/modules/clothing/suits/costume.dm +++ b/code/modules/clothing/suits/costume.dm @@ -175,9 +175,9 @@ if(!borghead) borghead = H.head if(istype(borghead, /obj/item/clothing/head/cardborg)) //why is this done this way? because equipped() is called BEFORE THE ITEM IS IN THE SLOT WHYYYY - var/image/I = image(icon = 'icons/mob/robots.dmi' , icon_state = "robot", loc = H) + var/image/I = image(icon = 'icons/mob/silicon/robots.dmi' , icon_state = "robot", loc = H) I.override = 1 - I.add_overlay(mutable_appearance('icons/mob/robots.dmi', "robot_e")) //gotta look realistic + I.add_overlay(mutable_appearance('icons/mob/silicon/robots.dmi', "robot_e")) //gotta look realistic add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/silicons, "standard_borg_disguise", I) //you look like a robot to robots! (including yourself because you're totally a robot) /obj/item/clothing/suit/costume/snowman diff --git a/code/modules/food_and_drinks/restaurant/customers/_customer.dm b/code/modules/food_and_drinks/restaurant/customers/_customer.dm index 4309e8b4e8a..c7ff95cb1ad 100644 --- a/code/modules/food_and_drinks/restaurant/customers/_customer.dm +++ b/code/modules/food_and_drinks/restaurant/customers/_customer.dm @@ -33,7 +33,7 @@ ///Prefix file to uise var/prefix_file = "strings/names/american_prefix.txt" ///Base icon for the customer - var/base_icon = 'icons/mob/tourists.dmi' + var/base_icon = 'icons/mob/simple/tourists.dmi' ///Base icon state for the customer var/base_icon_state = "amerifat" ///Sound to use when this robot type speaks @@ -311,7 +311,7 @@ var/datum/sprite_accessory/moth_wings/wings = get_wings(customer) - var/mutable_appearance/wings_behind = mutable_appearance(icon = 'icons/mob/moth_wings.dmi', icon_state = "m_moth_wings_[wings.icon_state]_BEHIND") + var/mutable_appearance/wings_behind = mutable_appearance(icon = 'icons/mob/species/moth/moth_wings.dmi', icon_state = "m_moth_wings_[wings.icon_state]_BEHIND") wings_behind.appearance_flags = RESET_COLOR underlays += wings_behind @@ -322,7 +322,7 @@ var/datum/sprite_accessory/moth_wings/wings = get_wings(customer) - var/mutable_appearance/wings_front = mutable_appearance(icon = 'icons/mob/moth_wings.dmi', icon_state = "m_moth_wings_[wings.icon_state]_FRONT") + var/mutable_appearance/wings_front = mutable_appearance(icon = 'icons/mob/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/_hallucination.dm b/code/modules/hallucination/_hallucination.dm index 29d3d0d8460..8f54b0b2af8 100644 --- a/code/modules/hallucination/_hallucination.dm +++ b/code/modules/hallucination/_hallucination.dm @@ -94,7 +94,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( var/mob/living/carbon/target = null /obj/effect/hallucination/simple - var/image_icon = 'icons/mob/alien.dmi' + var/image_icon = 'icons/mob/nonhuman-player/alien.dmi' var/image_state = "alienh_pounce" var/px = 0 var/py = 0 diff --git a/code/modules/hallucination/chat.dm b/code/modules/hallucination/chat.dm index 4c9912e5113..0e0bf0ed457 100644 --- a/code/modules/hallucination/chat.dm +++ b/code/modules/hallucination/chat.dm @@ -62,7 +62,7 @@ // Display message if (!is_radio && !target.client?.prefs.read_preference(/datum/preference/toggle/enable_runechat)) - var/image/speech_overlay = image('icons/mob/talk.dmi', person, "default0", layer = ABOVE_MOB_LAYER) + var/image/speech_overlay = image('icons/mob/effects/talk.dmi', person, "default0", layer = ABOVE_MOB_LAYER) INVOKE_ASYNC(GLOBAL_PROC, /proc/flick_overlay, speech_overlay, list(target.client), 30) if (target.client?.prefs.read_preference(/datum/preference/toggle/enable_runechat)) target.create_chat_message(person, understood_language, chosen, spans) diff --git a/code/modules/hallucination/fire.dm b/code/modules/hallucination/fire.dm index 81396caa45c..4566fd884a6 100644 --- a/code/modules/hallucination/fire.dm +++ b/code/modules/hallucination/fire.dm @@ -16,7 +16,7 @@ set waitfor = FALSE ..() target.set_fire_stacks(max(target.fire_stacks, 0.1)) //Placebo flammability - fire_overlay = image('icons/mob/onfire.dmi', target, "human_burning", ABOVE_MOB_LAYER) + fire_overlay = image('icons/mob/effects/onfire.dmi', target, "human_burning", ABOVE_MOB_LAYER) if(target.client) target.client.images += fire_overlay to_chat(target, span_userdanger("You're set on fire!")) diff --git a/code/modules/hallucination/hostile_mob.dm b/code/modules/hallucination/hostile_mob.dm index b6ccf581838..3f4674d0ffa 100644 --- a/code/modules/hallucination/hostile_mob.dm +++ b/code/modules/hallucination/hostile_mob.dm @@ -7,7 +7,7 @@ */ /obj/effect/hallucination/simple/xeno - image_icon = 'icons/mob/alien.dmi' + image_icon = 'icons/mob/nonhuman-player/alien.dmi' image_state = "alienh_pounce" /obj/effect/hallucination/simple/xeno/Initialize(mapload, mob/living/carbon/T) @@ -59,11 +59,11 @@ to_chat(target, span_notice("[xeno.name] begins climbing into the ventilation system...")) stage = XENO_ATTACK_STAGE_FINISH if (XENO_ATTACK_STAGE_LEAP_AT_PUMP to XENO_ATTACK_STAGE_CLIMB) - xeno.update_icon(ALL, "alienh_leap", 'icons/mob/alienleap.dmi', -32, -32) + xeno.update_icon(ALL, "alienh_leap", 'icons/mob/nonhuman-player/alienleap.dmi', -32, -32) xeno.throw_at(pump_location, 7, 1, spin = FALSE, diagonals_first = TRUE) stage = XENO_ATTACK_STAGE_CLIMB if (XENO_ATTACK_STAGE_LEAP_AT_TARGET to XENO_ATTACK_STAGE_LEAP_AT_PUMP) - xeno.update_icon(ALL, "alienh_leap", 'icons/mob/alienleap.dmi', -32, -32) + xeno.update_icon(ALL, "alienh_leap", 'icons/mob/nonhuman-player/alienleap.dmi', -32, -32) xeno.throw_at(target, 7, 1, spin = FALSE, diagonals_first = TRUE) stage = XENO_ATTACK_STAGE_LEAP_AT_PUMP @@ -80,7 +80,7 @@ #undef XENO_ATTACK_STAGE_FINISH /obj/effect/hallucination/simple/clown - image_icon = 'icons/mob/animal.dmi' + image_icon = 'icons/mob/simple/animal.dmi' image_state = "clown" /obj/effect/hallucination/simple/clown/Initialize(mapload, mob/living/carbon/T, duration) @@ -93,7 +93,7 @@ /obj/effect/hallucination/simple/bubblegum name = "Bubblegum" - image_icon = 'icons/mob/lavaland/96x96megafauna.dmi' + image_icon = 'icons/mob/simple/lavaland/96x96megafauna.dmi' image_state = "bubblegum" px = -32 diff --git a/code/modules/hallucination/husk.dm b/code/modules/hallucination/husk.dm index 5bbb94af5b6..abe70b4dcec 100644 --- a/code/modules/hallucination/husk.dm +++ b/code/modules/hallucination/husk.dm @@ -11,15 +11,15 @@ var/turf/open/floor/husk_point = pick(possible_points) switch(rand(1,4)) if(1) - var/image/body = image('icons/mob/human.dmi',husk_point,"husk",TURF_LAYER) + var/image/body = image('icons/mob/species/human/human.dmi',husk_point,"husk",TURF_LAYER) var/matrix/M = matrix() M.Turn(90) body.transform = M halbody = body if(2,3) - halbody = image('icons/mob/human.dmi',husk_point,"husk",TURF_LAYER) + halbody = image('icons/mob/species/human/human.dmi',husk_point,"husk",TURF_LAYER) if(4) - halbody = image('icons/mob/alien.dmi',husk_point,"alienother",TURF_LAYER) + halbody = image('icons/mob/nonhuman-player/alien.dmi',husk_point,"alienother",TURF_LAYER) if(target.client) target.client.images += halbody diff --git a/code/modules/hallucination/polymorph.dm b/code/modules/hallucination/polymorph.dm index 2ad4471f119..4cd6ae1e85d 100644 --- a/code/modules/hallucination/polymorph.dm +++ b/code/modules/hallucination/polymorph.dm @@ -26,22 +26,22 @@ A = image('icons/effects/effects.dmi',H,"nothing") A.name = "..." if("monkey")//Monkey - A = image('icons/mob/human.dmi',H,"monkey") + A = image('icons/mob/species/human/human.dmi',H,"monkey") A.name = "Monkey ([rand(1,999)])" if("carp")//Carp - A = image('icons/mob/carp.dmi',H,"carp") + A = image('icons/mob/simple/carp.dmi',H,"carp") A.name = "Space Carp" if("corgi")//Corgi - A = image('icons/mob/pets.dmi',H,"corgi") + A = image('icons/mob/simple/pets.dmi',H,"corgi") A.name = "Corgi" if("skeleton")//Skeletons - A = image('icons/mob/human.dmi',H,"skeleton") + A = image('icons/mob/species/human/human.dmi',H,"skeleton") A.name = "Skeleton" if("zombie")//Zombies - A = image('icons/mob/human.dmi',H,"zombie") + A = image('icons/mob/species/human/human.dmi',H,"zombie") A.name = "Zombie" if("demon")//Demon - A = image('icons/mob/mob.dmi',H,"daemon") + A = image('icons/mob/simple/mob.dmi',H,"daemon") A.name = "Demon" if("custom") A = image(custom_icon_file, H, custom_icon) @@ -70,19 +70,19 @@ feedback_details += "Type: [kind]" switch(kind) if("monkey")//Monkey - A = image('icons/mob/human.dmi',target,"monkey") + A = image('icons/mob/species/human/human.dmi',target,"monkey") if("carp")//Carp - A = image('icons/mob/animal.dmi',target,"carp") + A = image('icons/mob/simple/animal.dmi',target,"carp") if("corgi")//Corgi - A = image('icons/mob/pets.dmi',target,"corgi") + A = image('icons/mob/simple/pets.dmi',target,"corgi") if("skeleton")//Skeletons - A = image('icons/mob/human.dmi',target,"skeleton") + A = image('icons/mob/species/human/human.dmi',target,"skeleton") if("zombie")//Zombies - A = image('icons/mob/human.dmi',target,"zombie") + A = image('icons/mob/species/human/human.dmi',target,"zombie") if("demon")//Demon - A = image('icons/mob/mob.dmi',target,"daemon") + A = image('icons/mob/simple/mob.dmi',target,"daemon") if("robot")//Cyborg - A = image('icons/mob/robots.dmi',target,"robot") + A = image('icons/mob/silicon/robots.dmi',target,"robot") target.playsound_local(target,'sound/voice/liveagain.ogg', 75, 1) if("custom") A = image(custom_icon_file, target, custom_icon) diff --git a/code/modules/hallucination/shock.dm b/code/modules/hallucination/shock.dm index eb8a4257366..e38057036a8 100644 --- a/code/modules/hallucination/shock.dm +++ b/code/modules/hallucination/shock.dm @@ -9,7 +9,7 @@ shock_image.appearance_flags |= KEEP_APART shock_image.color = rgb(0,0,0) shock_image.override = TRUE - electrocution_skeleton_anim = image('icons/mob/human.dmi', target, icon_state = "electrocuted_base", layer=ABOVE_MOB_LAYER) + electrocution_skeleton_anim = image('icons/mob/species/human/human.dmi', target, icon_state = "electrocuted_base", layer=ABOVE_MOB_LAYER) electrocution_skeleton_anim.appearance_flags |= RESET_COLOR|KEEP_APART to_chat(target, span_userdanger("You feel a powerful shock course through your body!")) if(target.client) diff --git a/code/modules/holodeck/mobs.dm b/code/modules/holodeck/mobs.dm index 479f26857d8..c683905e33e 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/human.dmi' + icon = 'icons/mob/species/human/human.dmi' icon_state = "monkey" icon_living = "monkey" icon_dead = "monkey_dead" diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm index 137a2d39a4f..9fc1a88c295 100644 --- a/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm +++ b/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm @@ -3,7 +3,7 @@ /obj/structure/lavaland/ash_walker name = "necropolis tendril nest" desc = "A vile tendril of corruption. It's surrounded by a nest of rapidly growing eggs..." - icon = 'icons/mob/nest.dmi' + icon = 'icons/mob/simple/lavaland/nest.dmi' icon_state = "ash_walker_nest" move_resist=INFINITY // just killing it tears a massive hole in the ground, let's not move it diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm index 147ac42967a..666dfbaa9f8 100644 --- a/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm @@ -91,7 +91,7 @@ anchored = TRUE density = TRUE icon_state = "blob" - icon = 'icons/mob/blob.dmi' + icon = 'icons/mob/nonhuman-player/blob.dmi' color = rgb(145, 150, 0) /obj/effect/gluttony/CanAllowThrough(atom/movable/mover, border_dir)//So bullets will fly over and stuff. diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index ffc9adb6318..14d47fb2b67 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -6,7 +6,7 @@ name = "\improper Nanotrasen minebot" desc = "The instructions printed on the side read: This is a small robot used to support miners, can be set to search and collect loose ore, or to help fend off wildlife." gender = NEUTER - icon = 'icons/mob/aibots.dmi' + icon = 'icons/mob/silicon/aibots.dmi' icon_state = "mining_drone" icon_living = "mining_drone" status_flags = CANSTUN|CANKNOCKDOWN|CANPUSH diff --git a/code/modules/mining/voucher_sets.dm b/code/modules/mining/voucher_sets.dm index c35f399ceb0..3044d134894 100644 --- a/code/modules/mining/voucher_sets.dm +++ b/code/modules/mining/voucher_sets.dm @@ -59,7 +59,7 @@ /datum/voucher_set/minebot_kit name = "Minebot Kit" description = "Contains a little minebot companion that helps you in storing ore and hunting wildlife. Also comes with an upgraded industrial welding tool (80u), a welding mask and a KA modkit that allows shots to pass through the minebot." - icon = 'icons/mob/aibots.dmi' + icon = 'icons/mob/silicon/aibots.dmi' icon_state = "mining_drone" set_items = list( /mob/living/simple_animal/hostile/mining_drone, diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm index 6c88a864acd..24add57d6cb 100644 --- a/code/modules/mob/dead/new_player/preferences_setup.dm +++ b/code/modules/mob/dead/new_player/preferences_setup.dm @@ -95,9 +95,9 @@ if(preview_job) // Silicons only need a very basic preview since there is no customization for them. if (istype(preview_job,/datum/job/ai)) - return image('icons/mob/ai.dmi', icon_state = resolve_ai_icon(read_preference(/datum/preference/choiced/ai_core_display)), dir = SOUTH) + return image('icons/mob/silicon/ai.dmi', icon_state = resolve_ai_icon(read_preference(/datum/preference/choiced/ai_core_display)), dir = SOUTH) if (istype(preview_job,/datum/job/cyborg)) - return image('icons/mob/robots.dmi', icon_state = "robot", dir = SOUTH) + return image('icons/mob/silicon/robots.dmi', icon_state = "robot", dir = SOUTH) // Set up the dummy for its photoshoot apply_prefs_to(mannequin, TRUE) diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm index 1e9127987a8..3571841180b 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -88,7 +88,7 @@ // Hair Definitions // ////////////////////// /datum/sprite_accessory/hair - icon = 'icons/mob/human_face.dmi' // default icon for all hairs + icon = 'icons/mob/species/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~ @@ -812,7 +812,7 @@ */ /datum/sprite_accessory/gradient - icon = 'icons/mob/hair_gradients.dmi' + icon = 'icons/mob/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 @@ -903,7 +903,7 @@ ///////////////////////////// /datum/sprite_accessory/facial_hair - icon = 'icons/mob/human_face.dmi' + icon = 'icons/mob/species/human/human_face.dmi' gender = MALE // barf (unless you're a dorf, dorfs dig chix w/ beards :P) em_block = TRUE @@ -1680,7 +1680,7 @@ ///////////////////////////// /datum/sprite_accessory/body_markings - icon = 'icons/mob/mutant_bodyparts.dmi' + icon = 'icons/mob/species/mutant_bodyparts.dmi' /datum/sprite_accessory/body_markings/none name = "None" @@ -1702,7 +1702,7 @@ gender_specific = 1 /datum/sprite_accessory/tails - icon = 'icons/mob/mutant_bodyparts.dmi' + icon = 'icons/mob/species/mutant_bodyparts.dmi' em_block = TRUE /datum/sprite_accessory/tails/lizard/smooth @@ -1732,7 +1732,7 @@ color_src = FALSE /datum/sprite_accessory/pod_hair - icon = 'icons/mob/podperson_hair.dmi' + icon = 'icons/mob/species/podperson_hair.dmi' em_block = TRUE /datum/sprite_accessory/pod_hair/ivy @@ -1776,7 +1776,7 @@ icon_state = "hibiscus" /datum/sprite_accessory/snouts - icon = 'icons/mob/mutant_bodyparts.dmi' + icon = 'icons/mob/species/mutant_bodyparts.dmi' em_block = TRUE /datum/sprite_accessory/snouts/sharp @@ -1796,7 +1796,7 @@ icon_state = "roundlight" /datum/sprite_accessory/horns - icon = 'icons/mob/mutant_bodyparts.dmi' + icon = 'icons/mob/species/mutant_bodyparts.dmi' em_block = TRUE /datum/sprite_accessory/horns/none @@ -1836,7 +1836,7 @@ icon_state = "lbroken" /datum/sprite_accessory/ears - icon = 'icons/mob/mutant_bodyparts.dmi' + icon = 'icons/mob/species/mutant_bodyparts.dmi' em_block = TRUE /datum/sprite_accessory/ears/none @@ -1979,7 +1979,7 @@ dimension_y = 32 /datum/sprite_accessory/frills - icon = 'icons/mob/mutant_bodyparts.dmi' + icon = 'icons/mob/species/mutant_bodyparts.dmi' /datum/sprite_accessory/frills/none name = "None" @@ -1998,11 +1998,11 @@ icon_state = "aqua" /datum/sprite_accessory/spines - icon = 'icons/mob/mutant_bodyparts.dmi' + icon = 'icons/mob/species/mutant_bodyparts.dmi' em_block = TRUE /datum/sprite_accessory/spines_animated - icon = 'icons/mob/mutant_bodyparts.dmi' + icon = 'icons/mob/species/mutant_bodyparts.dmi' em_block = TRUE /datum/sprite_accessory/spines/none @@ -2064,7 +2064,7 @@ name = "Digitigrade Legs" /datum/sprite_accessory/caps - icon = 'icons/mob/mutant_bodyparts.dmi' + icon = 'icons/mob/species/mutant_bodyparts.dmi' color_src = HAIR em_block = TRUE @@ -2080,7 +2080,7 @@ /datum/sprite_accessory/moth_wings - icon = 'icons/mob/moth_wings.dmi' + icon = 'icons/mob/species/moth/moth_wings.dmi' color_src = null em_block = TRUE @@ -2178,7 +2178,7 @@ icon_state = "plasmafire" /datum/sprite_accessory/moth_antennae //Finally splitting the sprite - icon = 'icons/mob/moth_antennae.dmi' + icon = 'icons/mob/species/moth/moth_antennae.dmi' color_src = null /datum/sprite_accessory/moth_antennae/plain @@ -2261,7 +2261,7 @@ icon_state = "plasmafire" /datum/sprite_accessory/moth_markings // the markings that moths can have. finally something other than the boring tan - icon = 'icons/mob/moth_markings.dmi' + icon = 'icons/mob/species/moth/moth_markings.dmi' color_src = null /datum/sprite_accessory/moth_markings/none diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index db15bda7cd0..3c703979696 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -6,7 +6,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) /mob/dead/observer name = "ghost" desc = "It's a g-g-g-g-ghooooost!" //jinkies! - icon = 'icons/mob/mob.dmi' + icon = 'icons/mob/simple/mob.dmi' icon_state = "ghost" plane = GHOST_PLANE stat = DEAD diff --git a/code/modules/mob/living/basic/basic.dm b/code/modules/mob/living/basic/basic.dm index 7c1615e75c5..aaba82030c1 100644 --- a/code/modules/mob/living/basic/basic.dm +++ b/code/modules/mob/living/basic/basic.dm @@ -1,7 +1,7 @@ ///Simple animals 2.0, This time, let's really try to keep it simple. This basetype should purely be used as a base-level for implementing simplified behaviours for things such as damage and attacks. Everything else should be in components or AI behaviours. /mob/living/basic name = "basic mob" - icon = 'icons/mob/animal.dmi' + icon = 'icons/mob/simple/animal.dmi' health = 20 maxHealth = 20 gender = PLURAL diff --git a/code/modules/mob/living/basic/farm_animals/cow/_cow.dm b/code/modules/mob/living/basic/farm_animals/cow/_cow.dm index 168a2f7544a..9250e418e3b 100644 --- a/code/modules/mob/living/basic/farm_animals/cow/_cow.dm +++ b/code/modules/mob/living/basic/farm_animals/cow/_cow.dm @@ -2,7 +2,7 @@ /mob/living/basic/cow name = "cow" desc = "Known for their milk, just don't tip them over." - icon = 'icons/mob/cows.dmi' + icon = 'icons/mob/simple/cows.dmi' icon_state = "cow" icon_living = "cow" icon_dead = "cow_dead" diff --git a/code/modules/mob/living/basic/farm_animals/sheep.dm b/code/modules/mob/living/basic/farm_animals/sheep.dm index bdc6f508566..54580063066 100644 --- a/code/modules/mob/living/basic/farm_animals/sheep.dm +++ b/code/modules/mob/living/basic/farm_animals/sheep.dm @@ -1,7 +1,7 @@ /mob/living/basic/sheep name = "sheep" desc = "Known for their soft wool and use in sacrifical rituals. Big fan of grass." - icon = 'icons/mob/sheep.dmi' + icon = 'icons/mob/simple/sheep.dmi' icon_state = "sheep" icon_dead = "sheep_dead" base_icon_state = "sheep" diff --git a/code/modules/mob/living/basic/lavaland/bileworm/_bileworm.dm b/code/modules/mob/living/basic/lavaland/bileworm/_bileworm.dm index 7df646c9736..2234dc6f930 100644 --- a/code/modules/mob/living/basic/lavaland/bileworm/_bileworm.dm +++ b/code/modules/mob/living/basic/lavaland/bileworm/_bileworm.dm @@ -1,7 +1,7 @@ /mob/living/basic/bileworm name = "bileworm" desc = "Bileworms are dangerous detritivores that attack with the highly acidic bile they produce from consuming detritus." - icon = 'icons/mob/lavaland/bileworm.dmi' + icon = 'icons/mob/simple/lavaland/bileworm.dmi' icon_state = "bileworm" icon_living = "bileworm" icon_dead = "bileworm_dead" diff --git a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_instrument.dm b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_instrument.dm index f63e360c345..fcfde8707d4 100644 --- a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_instrument.dm +++ b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_instrument.dm @@ -2,7 +2,7 @@ name = "bilehorn" desc = "Bits of bileworm anatomy rearranged to produce wonderful music, not bile. Keeps the name though, because for an instrument, it is quite vile." force = 5 - icon = 'icons/mob/lavaland/bileworm.dmi' + icon = 'icons/mob/simple/lavaland/bileworm.dmi' icon_state = "bilehorn" allowed_instrument_ids = "bilehorn" inhand_icon_state = "bilehorn" diff --git a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_loot.dm b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_loot.dm index 6bf2c50d4cb..fa5f99ee70c 100644 --- a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_loot.dm +++ b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_loot.dm @@ -5,7 +5,7 @@ name = "bileworm skin" desc = "The slushy, squishy and slightly shiny skin of a postmortem bileworm." singular_name = "bileworm skin piece" - icon = 'icons/mob/lavaland/bileworm.dmi' + icon = 'icons/mob/simple/lavaland/bileworm.dmi' icon_state = "sheet-bileworm" inhand_icon_state = "sheet-bileworm" merge_type = /obj/item/stack/sheet/animalhide/bileworm @@ -14,7 +14,7 @@ /obj/item/crusher_trophy/bileworm_spewlet name = "bileworm spewlet" - icon = 'icons/mob/lavaland/bileworm.dmi' + icon = 'icons/mob/simple/lavaland/bileworm.dmi' icon_state = "bileworm_spewlet" desc = "A baby bileworm. Suitable as a trophy for a kinetic crusher." denied_type = /obj/item/crusher_trophy/bileworm_spewlet diff --git a/code/modules/mob/living/basic/vermin/mothroach.dm b/code/modules/mob/living/basic/vermin/mothroach.dm index 59ce9df0a2c..4525fe6d978 100644 --- a/code/modules/mob/living/basic/vermin/mothroach.dm +++ b/code/modules/mob/living/basic/vermin/mothroach.dm @@ -5,9 +5,9 @@ icon_living = "mothroach" icon_dead = "mothroach_dead" held_state = "mothroach" - held_lh = 'icons/mob/animal_item_lh.dmi' - held_rh = 'icons/mob/animal_item_rh.dmi' - head_icon = 'icons/mob/animal_item_head.dmi' + held_lh = 'icons/mob/inhands/animal_item_lh.dmi' + held_rh = 'icons/mob/inhands/animal_item_rh.dmi' + head_icon = 'icons/mob/clothing/head/animal_item_head.dmi' butcher_results = list(/obj/item/food/meat/slab/mothroach = 3, /obj/item/stack/sheet/animalhide/mothroach = 1) mob_biotypes = MOB_ORGANIC|MOB_BUG mob_size = MOB_SIZE_SMALL diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index ef9bf741963..f35c2f6bc1b 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -1,6 +1,6 @@ /mob/living/carbon/alien name = "alien" - icon = 'icons/mob/alien.dmi' + icon = 'icons/mob/nonhuman-player/alien.dmi' gender = FEMALE //All xenos are girls!! dna = null faction = list(ROLE_ALIEN) @@ -93,7 +93,7 @@ Des: Gives the client of the alien an image on each infected mob. if(HAS_TRAIT(L, TRAIT_XENO_HOST)) var/obj/item/organ/internal/body_egg/alien_embryo/A = L.getorgan(/obj/item/organ/internal/body_egg/alien_embryo) if(A) - var/I = image('icons/mob/alien.dmi', loc = L, icon_state = "infected[A.stage]") + var/I = image('icons/mob/nonhuman-player/alien.dmi', loc = L, icon_state = "infected[A.stage]") client.images += I return diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 074535b6cb0..3912c46aa7c 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -9,7 +9,7 @@ melee_damage_upper = 20 max_grab = GRAB_AGGRESSIVE var/caste = "" - var/alt_icon = 'icons/mob/alienleap.dmi' //used to switch between the two alien icon files. + var/alt_icon = 'icons/mob/nonhuman-player/alienleap.dmi' //used to switch between the two alien icon files. var/leap_on_click = 0 var/pounce_cooldown = 0 var/pounce_cooldown_time = 30 diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm index 6cef8d716c1..e7d6be07caa 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm @@ -59,11 +59,11 @@ /mob/living/carbon/alien/humanoid/update_worn_handcuffs() remove_overlay(HANDCUFF_LAYER) var/cuff_icon = "aliencuff" - var/dmi_file = 'icons/mob/alien.dmi' + var/dmi_file = 'icons/mob/nonhuman-player/alien.dmi' if(mob_size == MOB_SIZE_LARGE) cuff_icon = "aliencuff_[caste]" - dmi_file = 'icons/mob/alienqueen.dmi' + dmi_file = 'icons/mob/nonhuman-player/alienqueen.dmi' if(handcuffed) var/mutable_appearance/handcuff_overlay = mutable_appearance(dmi_file, cuff_icon, -HANDCUFF_LAYER) diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index a520ed1ff21..7c8e300e297 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -1,6 +1,6 @@ /mob/living/carbon/alien/humanoid/royal //Common stuffs for Praetorian and Queen - icon = 'icons/mob/alienqueen.dmi' + icon = 'icons/mob/nonhuman-player/alienqueen.dmi' status_flags = 0 pixel_x = -16 base_pixel_x = -16 @@ -13,7 +13,7 @@ pressure_resistance = 200 //Because big, stompy xenos should not be blown around like paper. butcher_results = list(/obj/item/food/meat/slab/xeno = 20, /obj/item/stack/sheet/animalhide/xeno = 3) - var/alt_inhands_file = 'icons/mob/alienqueen.dmi' + var/alt_inhands_file = 'icons/mob/nonhuman-player/alienqueen.dmi' /mob/living/carbon/alien/humanoid/royal/Initialize(mapload) . = ..() @@ -136,7 +136,7 @@ desc = "Inject this into one of your grown children to promote her to a Praetorian!" icon_state = "alien_medal" item_flags = NOBLUDGEON | ABSTRACT | DROPDEL - icon = 'icons/mob/alien.dmi' + icon = 'icons/mob/nonhuman-player/alien.dmi' /obj/item/queen_promotion/attack(mob/living/to_promote, mob/living/carbon/alien/humanoid/queen) . = ..() diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm index 7e77d40c0b5..c31dc6e60c9 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -2,7 +2,7 @@ // It functions almost identically (see code/datums/diseases/alien_embryo.dm) /obj/item/organ/internal/body_egg/alien_embryo name = "alien embryo" - icon = 'icons/mob/alien.dmi' + icon = 'icons/mob/nonhuman-player/alien.dmi' icon_state = "larva0_dead" food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/toxin/acid = 10) ///What stage of growth the embryo is at. Developed embryos give the host symptoms suggesting that an embryo is inside them. @@ -94,7 +94,7 @@ var/mob/dead/observer/ghost = pick(candidates) - var/mutable_appearance/overlay = mutable_appearance('icons/mob/alien.dmi', "burst_lie") + var/mutable_appearance/overlay = mutable_appearance('icons/mob/nonhuman-player/alien.dmi', "burst_lie") owner.add_overlay(overlay) var/atom/xeno_loc = get_turf(owner) @@ -142,7 +142,7 @@ Des: Adds the infection image to all aliens for this embryo ----------------------------------------*/ /obj/item/organ/internal/body_egg/alien_embryo/AddInfectionImages() for(var/mob/living/carbon/alien/alien in GLOB.player_list) - var/I = image('icons/mob/alien.dmi', loc = owner, icon_state = "infected[stage]") + var/I = image('icons/mob/nonhuman-player/alien.dmi', loc = owner, icon_state = "infected[stage]") alien.client?.images += I /*---------------------------------------- diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index f51afff6461..22eeb16e8dd 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -11,7 +11,7 @@ /obj/item/clothing/mask/facehugger name = "alien" desc = "It has some sort of a tube at the end of its tail." - icon = 'icons/mob/alien.dmi' + icon = 'icons/mob/nonhuman-player/alien.dmi' icon_state = "facehugger" base_icon_state = "facehugger" inhand_icon_state = "facehugger" diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 59773aa4f32..85504812f74 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -1408,7 +1408,7 @@ var/fire_icon = "generic_burning[suffix]" if(!GLOB.fire_appearances[fire_icon]) - var/mutable_appearance/new_fire_overlay = mutable_appearance('icons/mob/onfire.dmi', fire_icon, -FIRE_LAYER) + var/mutable_appearance/new_fire_overlay = mutable_appearance('icons/mob/effects/onfire.dmi', fire_icon, -FIRE_LAYER) new_fire_overlay.appearance_flags = RESET_COLOR GLOB.fire_appearances[fire_icon] = new_fire_overlay diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm index e65e3d538a8..5efae7bad94 100644 --- a/code/modules/mob/living/carbon/carbon_update_icons.dm +++ b/code/modules/mob/living/carbon/carbon_update_icons.dm @@ -124,7 +124,7 @@ var/fire_icon = "[dna?.species.fire_overlay || "human"]_[stacks > MOB_BIG_FIRE_STACK_THRESHOLD ? "big_fire" : "small_fire"][suffix]" if(!GLOB.fire_appearances[fire_icon]) - GLOB.fire_appearances[fire_icon] = mutable_appearance('icons/mob/onfire.dmi', fire_icon, -FIRE_LAYER, appearance_flags = RESET_COLOR) + GLOB.fire_appearances[fire_icon] = mutable_appearance('icons/mob/effects/onfire.dmi', fire_icon, -FIRE_LAYER, appearance_flags = RESET_COLOR) if((stacks > 0 && on_fire) || HAS_TRAIT(src, TRAIT_PERMANENTLY_ONFIRE)) if(fire_icon == last_icon_state) @@ -145,7 +145,7 @@ /mob/living/carbon/update_damage_overlays() remove_overlay(DAMAGE_LAYER) - var/mutable_appearance/damage_overlay = mutable_appearance('icons/mob/dam_mob.dmi', "blank", -DAMAGE_LAYER) + var/mutable_appearance/damage_overlay = mutable_appearance('icons/mob/effects/dam_mob.dmi', "blank", -DAMAGE_LAYER) overlays_standing[DAMAGE_LAYER] = damage_overlay for(var/obj/item/bodypart/iter_part as anything in bodyparts) @@ -160,7 +160,7 @@ /mob/living/carbon/update_wound_overlays() remove_overlay(WOUND_LAYER) - var/mutable_appearance/wound_overlay = mutable_appearance('icons/mob/bleed_overlays.dmi', "blank", -WOUND_LAYER) + var/mutable_appearance/wound_overlay = mutable_appearance('icons/mob/effects/bleed_overlays.dmi', "blank", -WOUND_LAYER) overlays_standing[WOUND_LAYER] = wound_overlay for(var/obj/item/bodypart/iter_part as anything in bodyparts) @@ -245,7 +245,7 @@ /mob/living/carbon/update_worn_handcuffs() remove_overlay(HANDCUFF_LAYER) if(handcuffed && !(handcuffed.item_flags & ABSTRACT)) //SKYRAT EDIT ADDED !(handcuffed.item_flags & ABSTRACT) - var/mutable_appearance/handcuff_overlay = mutable_appearance('icons/mob/mob.dmi', "handcuff1", -HANDCUFF_LAYER) + var/mutable_appearance/handcuff_overlay = mutable_appearance('icons/mob/simple/mob.dmi', "handcuff1", -HANDCUFF_LAYER) if(handcuffed.blocks_emissive) handcuff_overlay.overlays += emissive_blocker(handcuff_overlay.icon, handcuff_overlay.icon_state, alpha = handcuff_overlay.alpha) diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 77cf4fd1229..0e6ffb5be01 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/human.dmi' + icon = 'icons/mob/species/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/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index 50d78a6960e..626eec5d31f 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -158,7 +158,7 @@ There are several things that need to be remembered: var/icon_file if(!icon_exists(icon_file, RESOLVE_ICON_STATE(worn_item))) - icon_file = 'icons/mob/mob.dmi' + icon_file = 'icons/mob/simple/mob.dmi' id_overlay = wear_id.build_worn_icon(default_layer = ID_LAYER, default_icon_file = icon_file) @@ -630,7 +630,7 @@ There are several things that need to be remembered: remove_overlay(LEGCUFF_LAYER) clear_alert("legcuffed") if(legcuffed) - overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/mob.dmi', "legcuff1", -LEGCUFF_LAYER) + overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/simple/mob.dmi', "legcuff1", -LEGCUFF_LAYER) apply_overlay(LEGCUFF_LAYER) throw_alert("legcuffed", /atom/movable/screen/alert/restrained/legcuffed, new_master = src.legcuffed) @@ -902,7 +902,7 @@ taur_bodytype: The taur bodytype associated to the item we're trying to wear. Ca if(HD && !(HAS_TRAIT(src, TRAIT_HUSK))) // lipstick if(lip_style && (LIPS in dna.species.species_traits)) - var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/human_face.dmi', "lips_[lip_style]", -BODY_LAYER) + var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/species/human/human_face.dmi', "lips_[lip_style]", -BODY_LAYER) lip_overlay.color = lip_color if(OFFSET_FACE in dna.species.offset_features) lip_overlay.pixel_x += dna.species.offset_features[OFFSET_FACE][1] @@ -915,14 +915,14 @@ taur_bodytype: The taur bodytype associated to the item we're trying to wear. Ca if(parent_eyes) add_overlay(parent_eyes.generate_body_overlay(src)) else - var/mutable_appearance/missing_eyes = mutable_appearance('icons/mob/human_face.dmi', "eyes_missing", -BODY_LAYER) + var/mutable_appearance/missing_eyes = mutable_appearance('icons/mob/species/human/human_face.dmi', "eyes_missing", -BODY_LAYER) if(OFFSET_FACE in dna.species.offset_features) missing_eyes.pixel_x += dna.species.offset_features[OFFSET_FACE][1] missing_eyes.pixel_y += dna.species.offset_features[OFFSET_FACE][2] add_overlay(missing_eyes) //SKYRAT EDIT ADDITION if (parent_eyes && parent_eyes.is_emissive) - var/mutable_appearance/emissive_appearance = emissive_appearance('icons/mob/human_face.dmi', parent_eyes ? parent_eyes.eye_icon_state : "eyes_missing", -BODY_LAYER) + var/mutable_appearance/emissive_appearance = emissive_appearance('icons/mob/species/human/human_face.dmi', parent_eyes ? parent_eyes.eye_icon_state : "eyes_missing", -BODY_LAYER) emissive_appearance.appearance_flags &= ~RESET_TRANSFORM if(OFFSET_FACE in dna.species.offset_features) emissive_appearance.pixel_x += dna.species.offset_features[OFFSET_FACE][1] diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 94484c40d6a..dabac510796 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -575,7 +575,7 @@ GLOBAL_LIST_EMPTY(features_by_species) if(noggin && !(HAS_TRAIT(species_human, TRAIT_HUSK))) // lipstick if(species_human.lip_style && (LIPS in species_traits)) - var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/human_face.dmi', "lips_[species_human.lip_style]", -BODY_LAYER) + var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/species/human/human_face.dmi', "lips_[species_human.lip_style]", -BODY_LAYER) lip_overlay.color = species_human.lip_color if(OFFSET_FACE in species_human.dna.species.offset_features) lip_overlay.pixel_x += species_human.dna.species.offset_features[OFFSET_FACE][1] @@ -597,7 +597,7 @@ GLOBAL_LIST_EMPTY(features_by_species) add_pixel_y = species_human.dna.species.offset_features[OFFSET_FACE][2] if(!eye_organ) - no_eyeslay = mutable_appearance('icons/mob/human_face.dmi', "eyes_missing", -BODY_LAYER) + no_eyeslay = mutable_appearance('icons/mob/species/human/human_face.dmi', "eyes_missing", -BODY_LAYER) no_eyeslay.pixel_x += add_pixel_x no_eyeslay.pixel_y += add_pixel_y standing += no_eyeslay diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index b063efc3ee4..75da7e6357e 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -1272,7 +1272,7 @@ playsound(get_turf(owner),'sound/magic/RATTLEMEBONES2.ogg', 100) if(ishuman(owner)) var/mob/living/carbon/human/H = owner - var/mutable_appearance/badtime = mutable_appearance('icons/mob/human_parts.dmi', "b_golem_eyes", -FIRE_LAYER-0.5) + var/mutable_appearance/badtime = mutable_appearance('icons/mob/species/human/bodyparts.dmi', "b_golem_eyes", -FIRE_LAYER-0.5) badtime.appearance_flags = RESET_COLOR H.overlays_standing[FIRE_LAYER+0.5] = badtime H.apply_overlay(FIRE_LAYER+0.5) diff --git a/code/modules/mob/living/inhand_holder.dm b/code/modules/mob/living/inhand_holder.dm index efd58c27ec8..ed9a9b4fe6a 100644 --- a/code/modules/mob/living/inhand_holder.dm +++ b/code/modules/mob/living/inhand_holder.dm @@ -116,7 +116,7 @@ var/mob/living/simple_animal/drone/D = L if(!D) return ..() - icon = 'icons/mob/drone.dmi' + icon = 'icons/mob/silicon/drone.dmi' icon_state = "[D.visualAppearance]_hat" /obj/item/clothing/head/mob_holder/destructible diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 40576875698..bcf4d377d55 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -186,11 +186,11 @@ //this stuff is here to make it simple for admins to mess with custom held sprites ///left hand icon for holding mobs - var/icon/held_lh = 'icons/mob/pets_held_lh.dmi' + var/icon/held_lh = 'icons/mob/inhands/pets_held_lh.dmi' ///right hand icon for holding mobs - var/icon/held_rh = 'icons/mob/pets_held_rh.dmi' + var/icon/held_rh = 'icons/mob/inhands/pets_held_rh.dmi' ///what it looks like when the mob is held on your head - var/icon/head_icon = 'icons/mob/pets_held.dmi' + var/icon/head_icon = 'icons/mob/clothing/head/pets_held.dmi' /// icon_state for holding mobs. var/held_state = "" diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm index 048d9f28a50..245c01ac532 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -410,7 +410,7 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list( for(var/mob/M in listening) if(M.client && (!M.client.prefs.read_preference(/datum/preference/toggle/enable_runechat) || (SSlag_switch.measures[DISABLE_RUNECHAT] && !HAS_TRAIT(src, TRAIT_BYPASS_MEASURES)))) speech_bubble_recipients.Add(M.client) - var/image/I = image('icons/mob/talk.dmi', src, "[bubble_type][say_test(message)]", FLY_LAYER) + var/image/I = image('icons/mob/effects/talk.dmi', src, "[bubble_type][say_test(message)]", FLY_LAYER) I.plane = ABOVE_GAME_PLANE I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA INVOKE_ASYNC(GLOBAL_PROC, /.proc/flick_overlay, I, speech_bubble_recipients, 30) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 7c882634fc6..8ba7d02b16d 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -15,7 +15,7 @@ /mob/living/silicon/ai name = "AI" real_name = "AI" - icon = 'icons/mob/ai.dmi' + icon = 'icons/mob/silicon/ai.dmi' icon_state = "ai" move_resist = MOVE_FORCE_OVERPOWERING density = TRUE @@ -163,7 +163,7 @@ INVOKE_ASYNC(src, .proc/set_core_display_icon) - holo_icon = getHologramIcon(icon('icons/mob/ai.dmi',"default")) + holo_icon = getHologramIcon(icon('icons/mob/silicon/ai.dmi',"default")) spark_system = new /datum/effect_system/spark_spread() spark_system.set_up(5, 0, src) @@ -695,19 +695,19 @@ if("Animal") var/list/icon_list = list( - "bear" = 'icons/mob/animal.dmi', - "carp" = 'icons/mob/carp.dmi', - "chicken" = 'icons/mob/animal.dmi', - "corgi" = 'icons/mob/pets.dmi', - "cow" = 'icons/mob/animal.dmi', - "crab" = 'icons/mob/animal.dmi', - "fox" = 'icons/mob/pets.dmi', - "goat" = 'icons/mob/animal.dmi', - "cat" = 'icons/mob/pets.dmi', - "cat2" = 'icons/mob/pets.dmi', - "poly" = 'icons/mob/animal.dmi', - "pug" = 'icons/mob/pets.dmi', - "spider" = 'icons/mob/animal.dmi' + "bear" = 'icons/mob/simple/animal.dmi', + "carp" = 'icons/mob/simple/carp.dmi', + "chicken" = 'icons/mob/simple/animal.dmi', + "corgi" = 'icons/mob/simple/pets.dmi', + "cow" = 'icons/mob/simple/animal.dmi', + "crab" = 'icons/mob/simple/animal.dmi', + "fox" = 'icons/mob/simple/pets.dmi', + "goat" = 'icons/mob/simple/animal.dmi', + "cat" = 'icons/mob/simple/pets.dmi', + "cat2" = 'icons/mob/simple/pets.dmi', + "poly" = 'icons/mob/simple/animal.dmi', + "pug" = 'icons/mob/simple/pets.dmi', + "spider" = 'icons/mob/simple/animal.dmi' ) input = tgui_input_list(usr, "Select a hologram", "Hologram", sort_list(icon_list)) @@ -727,11 +727,11 @@ holo_icon = getHologramIcon(icon(icon_list[input], input)) else var/list/icon_list = list( - "default" = 'icons/mob/ai.dmi', - "floating face" = 'icons/mob/ai.dmi', - "xeno queen" = 'icons/mob/alien.dmi', - "horror" = 'icons/mob/ai.dmi', - "clock" = 'icons/mob/ai.dmi' + "default" = 'icons/mob/silicon/ai.dmi', + "floating face" = 'icons/mob/silicon/ai.dmi', + "xeno queen" = 'icons/mob/nonhuman-player/alien.dmi', + "horror" = 'icons/mob/silicon/ai.dmi', + "clock" = 'icons/mob/silicon/ai.dmi' ) input = tgui_input_list(usr, "Select a hologram", "Hologram", sort_list(icon_list)) diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm index 5d4557ecd1a..04f7944a4b0 100644 --- a/code/modules/mob/living/silicon/ai/freelook/eye.dm +++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm @@ -6,7 +6,7 @@ name = "Inactive AI Eye" icon_state = "ai_camera" - icon = 'icons/mob/cameramob.dmi' + icon = 'icons/mob/silicon/cameramob.dmi' invisibility = INVISIBILITY_MAXIMUM hud_possible = list(ANTAG_HUD, AI_DETECT_HUD = HUD_LIST_LIST) var/list/visibleCameraChunks = list() diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 0a93a4cd591..3b416890241 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1014,7 +1014,7 @@ var/fire_icon = "generic_fire[suffix]" if(!GLOB.fire_appearances[fire_icon]) - var/mutable_appearance/new_fire_overlay = mutable_appearance('icons/mob/onfire.dmi', fire_icon, -FIRE_LAYER) + var/mutable_appearance/new_fire_overlay = mutable_appearance('icons/mob/effects/onfire.dmi', fire_icon, -FIRE_LAYER) new_fire_overlay.appearance_flags = RESET_COLOR GLOB.fire_appearances[fire_icon] = new_fire_overlay diff --git a/code/modules/mob/living/silicon/robot/robot_defines.dm b/code/modules/mob/living/silicon/robot/robot_defines.dm index 7ec4e43dfc1..4a89976d9b5 100644 --- a/code/modules/mob/living/silicon/robot/robot_defines.dm +++ b/code/modules/mob/living/silicon/robot/robot_defines.dm @@ -8,7 +8,7 @@ /mob/living/silicon/robot name = "Cyborg" real_name = "Cyborg" - icon = 'icons/mob/robots.dmi' //SKYRAT EDIT - Modified in modular_skyrat\modules\altborgs\code\robot_defines.dm (to allow for custom transformation animations) + icon = 'icons/mob/silicon/robots.dmi' //SKYRAT EDIT - Modified in modular_skyrat\modules\altborgs\code\robot_defines.dm (to allow for custom transformation animations) icon_state = "robot" maxHealth = 100 health = 100 diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm index e3daa712a88..974ef9b3137 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -208,7 +208,7 @@ var/list/reskin_icons = list() for(var/skin in borg_skins) var/list/details = borg_skins[skin] - reskin_icons[skin] = image(icon = details[SKIN_ICON] || 'icons/mob/robots.dmi', icon_state = details[SKIN_ICON_STATE]) + reskin_icons[skin] = image(icon = details[SKIN_ICON] || 'icons/mob/silicon/robots.dmi', icon_state = details[SKIN_ICON_STATE]) //SKYRAT EDIT ADDITION BEGIN - ALTBORGS if (!isnull(details[SKIN_FEATURES])) if (R_TRAIT_WIDE in details[SKIN_FEATURES]) diff --git a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm index e8314bead7e..4cf6896e7dc 100644 --- a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm +++ b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/bot/secbot/grievous //This bot is powerful. If you managed to get 4 eswords somehow, you deserve this horror. Emag him for best results. name = "General Beepsky" desc = "Is that a secbot with four eswords in its arms...?" - icon = 'icons/mob/aibots.dmi' + icon = 'icons/mob/silicon/aibots.dmi' icon_state = "grievous" health = 150 maxHealth = 150 diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 9b19526aac1..1429c9549e7 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -1,6 +1,6 @@ // AI (i.e. game AI, not the AI player) controlled bots /mob/living/simple_animal/bot - icon = 'icons/mob/aibots.dmi' + icon = 'icons/mob/silicon/aibots.dmi' layer = MOB_LAYER gender = NEUTER mob_biotypes = MOB_ROBOTIC @@ -105,7 +105,7 @@ ///The type of data HUD the bot uses. Diagnostic by default. var/data_hud_type = DATA_HUD_DIAGNOSTIC_BASIC var/datum/atom_hud/data/bot_path/path_hud - var/path_image_icon = 'icons/mob/aibots.dmi' + var/path_image_icon = 'icons/mob/silicon/aibots.dmi' var/path_image_icon_state = "path_indicator" var/path_image_color = "#FFFFFF" var/reset_access_timer_id diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index da5c157f331..49246c6fbb2 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -2,7 +2,7 @@ /mob/living/simple_animal/bot/cleanbot name = "\improper Cleanbot" desc = "A little cleaning robot, he looks so excited!" - icon = 'icons/mob/aibots.dmi' + icon = 'icons/mob/silicon/aibots.dmi' icon_state = "cleanbot0" pass_flags = PASSMOB | PASSFLAPS density = FALSE diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm index db44d5c608f..840d266def1 100644 --- a/code/modules/mob/living/simple_animal/bot/construction.dm +++ b/code/modules/mob/living/simple_animal/bot/construction.dm @@ -1,7 +1,7 @@ //Bot Construction /obj/item/bot_assembly - icon = 'icons/mob/aibots.dmi' + icon = 'icons/mob/silicon/aibots.dmi' w_class = WEIGHT_CLASS_NORMAL force = 3 throw_speed = 2 diff --git a/code/modules/mob/living/simple_animal/bot/firebot.dm b/code/modules/mob/living/simple_animal/bot/firebot.dm index 3ecf62295f6..e3cb673b642 100644 --- a/code/modules/mob/living/simple_animal/bot/firebot.dm +++ b/code/modules/mob/living/simple_animal/bot/firebot.dm @@ -7,7 +7,7 @@ /mob/living/simple_animal/bot/firebot name = "\improper Firebot" desc = "A little fire extinguishing bot. He looks rather anxious." - icon = 'icons/mob/aibots.dmi' + icon = 'icons/mob/silicon/aibots.dmi' icon_state = "firebot" density = FALSE anchored = FALSE diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index fe8e6471973..258ef5502f2 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -2,7 +2,7 @@ /mob/living/simple_animal/bot/floorbot name = "\improper Floorbot" desc = "A little floor repairing robot, he looks so excited!" - icon = 'icons/mob/aibots.dmi' + icon = 'icons/mob/silicon/aibots.dmi' icon_state = "floorbot0" density = FALSE health = 25 diff --git a/code/modules/mob/living/simple_animal/bot/hygienebot.dm b/code/modules/mob/living/simple_animal/bot/hygienebot.dm index f4527a55902..df2e0802375 100644 --- a/code/modules/mob/living/simple_animal/bot/hygienebot.dm +++ b/code/modules/mob/living/simple_animal/bot/hygienebot.dm @@ -2,7 +2,7 @@ /mob/living/simple_animal/bot/hygienebot name = "\improper Hygienebot" desc = "A flying cleaning robot, he'll chase down people who can't shower properly!" - icon = 'icons/mob/aibots.dmi' + icon = 'icons/mob/silicon/aibots.dmi' icon_state = "hygienebot" base_icon_state = "hygienebot" pass_flags = PASSMOB | PASSFLAPS | PASSTABLE diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index 72bf417a5b1..d4128c8c760 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -16,7 +16,7 @@ /mob/living/simple_animal/bot/medbot name = "\improper Medibot" desc = "A little medical robot. He looks somewhat underwhelmed." - icon = 'icons/mob/aibots.dmi' + icon = 'icons/mob/silicon/aibots.dmi' icon_state = "medibot0" base_icon_state = "medibot" density = FALSE diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index de8f5f4d1d8..9396aded170 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -846,7 +846,7 @@ . = ..() if(!isobserver(load)) return - var/mutable_appearance/ghost_overlay = mutable_appearance('icons/mob/mob.dmi', "ghost", layer + 0.01) //use a generic ghost icon, otherwise you can metagame who's dead if they have a custom ghost set + var/mutable_appearance/ghost_overlay = mutable_appearance('icons/mob/simple/mob.dmi', "ghost", layer + 0.01) //use a generic ghost icon, otherwise you can metagame who's dead if they have a custom ghost set ghost_overlay.pixel_y = 12 . += ghost_overlay diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index 4961f1bd1c7..8486c661604 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/bot/secbot name = "\improper Securitron" desc = "A little security robot. He looks less than thrilled." - icon = 'icons/mob/aibots.dmi' + icon = 'icons/mob/silicon/aibots.dmi' icon_state = "secbot" density = FALSE anchored = FALSE diff --git a/code/modules/mob/living/simple_animal/bot/vibebot.dm b/code/modules/mob/living/simple_animal/bot/vibebot.dm index 532ceb0c49d..f1769cd9883 100644 --- a/code/modules/mob/living/simple_animal/bot/vibebot.dm +++ b/code/modules/mob/living/simple_animal/bot/vibebot.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/bot/vibebot name = "\improper Vibebot" desc = "A little robot. It's just vibing, doing its thing." - icon = 'icons/mob/aibots.dmi' + icon = 'icons/mob/silicon/aibots.dmi' icon_state = "vibebot" density = FALSE anchored = FALSE diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index b5dc59d9387..76498a703c1 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -13,7 +13,7 @@ response_harm_continuous = "punches" response_harm_simple = "punch" speak_chance = 1 - icon = 'icons/mob/cult.dmi' + icon = 'icons/mob/nonhuman-player/cult.dmi' speed = 0 combat_mode = TRUE stop_automated_movement = 1 diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 3f1206ef443..6f156877e2d 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -2,7 +2,7 @@ /mob/living/simple_animal/pet/cat name = "cat" desc = "Kitty!!" - icon = 'icons/mob/pets.dmi' + icon = 'icons/mob/simple/pets.dmi' icon_state = "cat2" icon_living = "cat2" icon_dead = "cat2_dead" diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index a6e33337ebf..73af472401d 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -126,7 +126,7 @@ name = "\improper pug" real_name = "pug" desc = "They're a pug." - icon = 'icons/mob/pets.dmi' + icon = 'icons/mob/simple/pets.dmi' icon_state = "pug" icon_living = "pug" icon_dead = "pug_dead" @@ -148,7 +148,7 @@ name = "\improper bull terrier" real_name = "bull terrier" desc = "They're a bull terrier." - icon = 'icons/mob/pets.dmi' + icon = 'icons/mob/simple/pets.dmi' icon_state = "bullterrier" icon_living = "bullterrier" icon_dead = "bullterrier_dead" @@ -160,7 +160,7 @@ /mob/living/simple_animal/pet/dog/corgi/exoticcorgi name = "Exotic Corgi" desc = "As cute as they are colorful!" - icon = 'icons/mob/pets.dmi' + icon = 'icons/mob/simple/pets.dmi' icon_state = "corgigrey" icon_living = "corgigrey" icon_dead = "corgigrey_dead" @@ -722,7 +722,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list( icon_state = "breaddog" icon_living = "breaddog" icon_dead = "breaddog_dead" - head_icon = 'icons/mob/pets_held_head.dmi' + head_icon = 'icons/mob/clothing/head/pets_held_head.dmi' health = 50 maxHealth = 50 gender = NEUTER diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index 4a2a261ab0f..2fa20bee5d2 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -16,7 +16,7 @@ /mob/living/simple_animal/drone name = "Drone" desc = "A maintenance drone, an expendable robot built to perform station repairs." - icon = 'icons/mob/drone.dmi' + icon = 'icons/mob/silicon/drone.dmi' icon_state = "drone_maint_grey" icon_living = "drone_maint_grey" icon_dead = "drone_maint_dead" diff --git a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm index 9a2096011fa..c163066ae1e 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm @@ -12,7 +12,7 @@ /obj/effect/mob_spawn/ghost_role/drone name = "drone shell" desc = "A shell of a maintenance drone, an expendable robot built to perform station repairs." - icon = 'icons/mob/drone.dmi' + icon = 'icons/mob/silicon/drone.dmi' icon_state = "drone_maint_hat" //yes reuse the _hat state. layer = BELOW_MOB_LAYER density = FALSE diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm index f9cf1854517..4bbf2371802 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm @@ -111,7 +111,7 @@ /obj/effect/mob_spawn/ghost_role/drone/derelict name = "derelict drone shell" desc = "A long-forgotten drone shell. It seems kind of... Space Russian." - icon = 'icons/mob/drone.dmi' + icon = 'icons/mob/silicon/drone.dmi' icon_state = "drone_maint_hat" mob_name = "derelict drone" mob_type = /mob/living/simple_animal/drone/derelict diff --git a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm index 80ed0b6b0ef..e601e3c83df 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm @@ -100,21 +100,21 @@ /mob/living/simple_animal/drone/proc/pickVisualAppearance() picked = FALSE var/list/drone_icons = list( - "Maintenance Drone" = image(icon = 'icons/mob/drone.dmi', icon_state = "[MAINTDRONE]_grey"), - "Repair Drone" = image(icon = 'icons/mob/drone.dmi', icon_state = REPAIRDRONE), - "Scout Drone" = image(icon = 'icons/mob/drone.dmi', icon_state = SCOUTDRONE) + "Maintenance Drone" = image(icon = 'icons/mob/silicon/drone.dmi', icon_state = "[MAINTDRONE]_grey"), + "Repair Drone" = image(icon = 'icons/mob/silicon/drone.dmi', icon_state = REPAIRDRONE), + "Scout Drone" = image(icon = 'icons/mob/silicon/drone.dmi', icon_state = SCOUTDRONE) ) var/picked_icon = show_radial_menu(src, src, drone_icons, custom_check = CALLBACK(src, .proc/check_menu), radius = 38, require_near = TRUE) switch(picked_icon) if("Maintenance Drone") visualAppearance = MAINTDRONE var/list/drone_colors = list( - "blue" = image(icon = 'icons/mob/drone.dmi', icon_state = "[visualAppearance]_blue"), - "green" = image(icon = 'icons/mob/drone.dmi', icon_state = "[visualAppearance]_green"), - "grey" = image(icon = 'icons/mob/drone.dmi', icon_state = "[visualAppearance]_grey"), - "orange" = image(icon = 'icons/mob/drone.dmi', icon_state = "[visualAppearance]_orange"), - "pink" = image(icon = 'icons/mob/drone.dmi', icon_state = "[visualAppearance]_pink"), - "red" = image(icon = 'icons/mob/drone.dmi', icon_state = "[visualAppearance]_red") + "blue" = image(icon = 'icons/mob/silicon/drone.dmi', icon_state = "[visualAppearance]_blue"), + "green" = image(icon = 'icons/mob/silicon/drone.dmi', icon_state = "[visualAppearance]_green"), + "grey" = image(icon = 'icons/mob/silicon/drone.dmi', icon_state = "[visualAppearance]_grey"), + "orange" = image(icon = 'icons/mob/silicon/drone.dmi', icon_state = "[visualAppearance]_orange"), + "pink" = image(icon = 'icons/mob/silicon/drone.dmi', icon_state = "[visualAppearance]_pink"), + "red" = image(icon = 'icons/mob/silicon/drone.dmi', icon_state = "[visualAppearance]_red") ) var/picked_color = show_radial_menu(src, src, drone_colors, custom_check = CALLBACK(src, .proc/check_menu), radius = 38, require_near = TRUE) if(picked_color) diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm index a262190a2df..a2dc6d0cd59 100644 --- a/code/modules/mob/living/simple_animal/friendly/fox.dm +++ b/code/modules/mob/living/simple_animal/friendly/fox.dm @@ -2,7 +2,7 @@ /mob/living/simple_animal/pet/fox name = "fox" desc = "They're a fox." - icon = 'icons/mob/pets.dmi' + icon = 'icons/mob/simple/pets.dmi' icon_state = "fox" icon_living = "fox" icon_dead = "fox_dead" diff --git a/code/modules/mob/living/simple_animal/friendly/gondola.dm b/code/modules/mob/living/simple_animal/friendly/gondola.dm index 717ef3526f5..6027e35fee0 100644 --- a/code/modules/mob/living/simple_animal/friendly/gondola.dm +++ b/code/modules/mob/living/simple_animal/friendly/gondola.dm @@ -17,7 +17,7 @@ response_harm_simple = "kick" faction = list("gondola") turns_per_move = 10 - icon = 'icons/mob/gondolas.dmi' + icon = 'icons/mob/simple/gondolas.dmi' icon_state = "gondola" icon_living = "gondola" loot = list(/obj/effect/decal/cleanable/blood/gibs, /obj/item/stack/sheet/animalhide/gondola = 1, /obj/item/food/meat/slab/gondola = 1) diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 53ae622c2ac..63512172855 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -195,7 +195,7 @@ /obj/item/food/deadmouse name = "dead mouse" desc = "They look like somebody dropped the bass on it. A lizard's favorite meal." - icon = 'icons/mob/animal.dmi' + icon = 'icons/mob/simple/animal.dmi' icon_state = "mouse_gray_dead" bite_consumption = 3 eatverbs = list("devour") diff --git a/code/modules/mob/living/simple_animal/friendly/penguin.dm b/code/modules/mob/living/simple_animal/friendly/penguin.dm index 53f6d580586..4480f324052 100644 --- a/code/modules/mob/living/simple_animal/friendly/penguin.dm +++ b/code/modules/mob/living/simple_animal/friendly/penguin.dm @@ -17,7 +17,7 @@ see_in_dark = 5 speak_chance = 1 turns_per_move = 10 - icon = 'icons/mob/penguins.dmi' + icon = 'icons/mob/simple/penguins.dmi' butcher_results = list(/obj/item/organ/internal/ears/penguin = 1, /obj/item/food/meat/slab/penguin = 3) footstep_type = FOOTSTEP_MOB_BAREFOOT diff --git a/code/modules/mob/living/simple_animal/friendly/pet.dm b/code/modules/mob/living/simple_animal/friendly/pet.dm index c4f621a3743..c7127679f74 100644 --- a/code/modules/mob/living/simple_animal/friendly/pet.dm +++ b/code/modules/mob/living/simple_animal/friendly/pet.dm @@ -1,5 +1,5 @@ /mob/living/simple_animal/pet - icon = 'icons/mob/pets.dmi' + icon = 'icons/mob/simple/pets.dmi' mob_size = MOB_SIZE_SMALL mob_biotypes = MOB_ORGANIC|MOB_BEAST blood_volume = BLOOD_VOLUME_NORMAL diff --git a/code/modules/mob/living/simple_animal/friendly/rabbit.dm b/code/modules/mob/living/simple_animal/friendly/rabbit.dm index 603fd873c57..7ece0ea7c5c 100644 --- a/code/modules/mob/living/simple_animal/friendly/rabbit.dm +++ b/code/modules/mob/living/simple_animal/friendly/rabbit.dm @@ -13,7 +13,7 @@ mob_biotypes = MOB_ORGANIC|MOB_BEAST health = 15 maxHealth = 15 - icon = 'icons/mob/rabbit.dmi' + icon = 'icons/mob/simple/rabbit.dmi' icon_state = "rabbit_white" icon_living = "rabbit_white" icon_dead = "rabbit_white_dead" diff --git a/code/modules/mob/living/simple_animal/friendly/robot_customer.dm b/code/modules/mob/living/simple_animal/friendly/robot_customer.dm index 14246accede..461333943ba 100644 --- a/code/modules/mob/living/simple_animal/friendly/robot_customer.dm +++ b/code/modules/mob/living/simple_animal/friendly/robot_customer.dm @@ -5,7 +5,7 @@ health = 150 desc = "I wonder what they'll order..." gender = NEUTER - icon = 'icons/mob/tourists.dmi' + icon = 'icons/mob/simple/tourists.dmi' icon_state = "amerifat" icon_living = "amerifat" ///Override so it uses datum ai diff --git a/code/modules/mob/living/simple_animal/friendly/sloth.dm b/code/modules/mob/living/simple_animal/friendly/sloth.dm index 68b7d337b0c..8e308c58d12 100644 --- a/code/modules/mob/living/simple_animal/friendly/sloth.dm +++ b/code/modules/mob/living/simple_animal/friendly/sloth.dm @@ -3,7 +3,7 @@ GLOBAL_DATUM(cargo_sloth, /mob/living/simple_animal/sloth) /mob/living/simple_animal/sloth name = "sloth" desc = "An adorable, sleepy creature." - icon = 'icons/mob/pets.dmi' + icon = 'icons/mob/simple/pets.dmi' icon_state = "sloth" icon_living = "sloth" icon_dead = "sloth_dead" diff --git a/code/modules/mob/living/simple_animal/friendly/trader.dm b/code/modules/mob/living/simple_animal/friendly/trader.dm index 8ee7eae74c7..0e5fba828df 100644 --- a/code/modules/mob/living/simple_animal/friendly/trader.dm +++ b/code/modules/mob/living/simple_animal/friendly/trader.dm @@ -26,7 +26,7 @@ /mob/living/simple_animal/hostile/retaliate/trader name = "Trader" desc = "Come buy some!" - icon = 'icons/mob/simple_human.dmi' + icon = 'icons/mob/simple/simple_human.dmi' icon_state = "faceless" maxHealth = 200 health = 200 diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index a4888d77043..955d190bb29 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -18,7 +18,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians response_disarm_simple = "flail at" response_harm_continuous = "punches" response_harm_simple = "punch" - icon = 'icons/mob/guardian.dmi' + icon = 'icons/mob/nonhuman-player/guardian.dmi' icon_state = "magicbase" icon_living = "magicbase" icon_dead = "magicbase" diff --git a/code/modules/mob/living/simple_animal/heretic_monsters.dm b/code/modules/mob/living/simple_animal/heretic_monsters.dm index 793e3b2201e..9fd542f2214 100644 --- a/code/modules/mob/living/simple_animal/heretic_monsters.dm +++ b/code/modules/mob/living/simple_animal/heretic_monsters.dm @@ -2,7 +2,7 @@ name = "Eldritch Demon" real_name = "Eldritch Demon" desc = "A horror from beyond this realm." - icon = 'icons/mob/eldritch_mobs.dmi' + icon = 'icons/mob/nonhuman-player/eldritch_mobs.dmi' gender = NEUTER mob_biotypes = NONE attack_sound = 'sound/weapons/punch1.ogg' diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index fdcb6173b8d..7c76a6bbcb1 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/alien name = "alien hunter" desc = "Hiss!" - icon = 'icons/mob/alien.dmi' + icon = 'icons/mob/nonhuman-player/alien.dmi' icon_state = "alienh" icon_living = "alienh" icon_dead = "alienh_dead" @@ -126,7 +126,7 @@ /mob/living/simple_animal/hostile/alien/queen/large name = "alien empress" - icon = 'icons/mob/alienqueen.dmi' + icon = 'icons/mob/nonhuman-player/alienqueen.dmi' icon_state = "alienq" icon_living = "alienq" icon_dead = "alienq_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/ant.dm b/code/modules/mob/living/simple_animal/hostile/ant.dm index 72a9286069d..c64e1fe0c2e 100644 --- a/code/modules/mob/living/simple_animal/hostile/ant.dm +++ b/code/modules/mob/living/simple_animal/hostile/ant.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/ant name = "giant ant" desc = "A writhing mass of ants, glued together to make an adorable pet!" - icon = 'icons/mob/pets.dmi' + icon = 'icons/mob/simple/pets.dmi' icon_state = "ant" icon_living = "ant" icon_dead = "ant_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index 754dd891699..d6218284a67 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -17,7 +17,7 @@ desc = "Buzzy buzzy bee, stingy sti- Ouch!" icon_state = "" icon_living = "" - icon = 'icons/mob/bees.dmi' + icon = 'icons/mob/simple/bees.dmi' gender = FEMALE speak_emote = list("buzzes") emote_hear = list("buzzes") @@ -135,7 +135,7 @@ add_overlay("[icon_base]_base") var/static/mutable_appearance/greyscale_overlay - greyscale_overlay = greyscale_overlay || mutable_appearance('icons/mob/bees.dmi') + greyscale_overlay = greyscale_overlay || mutable_appearance('icons/mob/simple/bees.dmi') greyscale_overlay.icon_state = "[icon_base]_grey" greyscale_overlay.color = col add_overlay(greyscale_overlay) @@ -307,7 +307,7 @@ desc = "She's the queen of bees, BZZ BZZ!" icon_state = "queen_item" inhand_icon_state = "" - icon = 'icons/mob/bees.dmi' + icon = 'icons/mob/simple/bees.dmi' /// The actual mob that our bee item corresponds to var/mob/living/simple_animal/hostile/bee/queen/queen @@ -374,7 +374,7 @@ /obj/item/trash/bee name = "bee" desc = "No wonder the bees are dying out, you monster." - icon = 'icons/mob/bees.dmi' + icon = 'icons/mob/simple/bees.dmi' icon_state = "bee_item" var/datum/reagent/beegent diff --git a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm index d893eafa2ec..c746625110a 100644 --- a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm @@ -6,7 +6,7 @@ boss_abilities = list(/datum/action/boss/wizard_summon_minions, /datum/action/boss/wizard_mimic) faction = list("hostile","stickman") del_on_death = TRUE - icon = 'icons/mob/simple_human.dmi' + icon = 'icons/mob/simple/simple_human.dmi' icon_state = "paperwizard" ranged = 1 environment_smash = ENVIRONMENT_SMASH_NONE diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 401ad2aaa99..297690c0422 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -3,7 +3,7 @@ /mob/living/simple_animal/hostile/carp name = "space carp" desc = "A ferocious, fang-bearing creature that resembles a fish." - icon = 'icons/mob/carp.dmi' + icon = 'icons/mob/simple/carp.dmi' icon_state = "base" icon_living = "base" icon_dead = "base_dead" @@ -164,7 +164,7 @@ return /mob/living/simple_animal/hostile/carp/megacarp - icon = 'icons/mob/broadMobs.dmi' + icon = 'icons/mob/simple/broadMobs.dmi' name = "Mega Space Carp" desc = "A ferocious, fang bearing creature that resembles a shark. This one seems especially ticked off." icon_state = "megacarp" @@ -252,7 +252,7 @@ /// Keeping track of the nuke disk for the functionality of storing it. var/obj/item/disk/nuclear/disky /// Location of the file storing disk overlays - var/icon/disk_overlay_file = 'icons/mob/carp.dmi' + var/icon/disk_overlay_file = 'icons/mob/simple/carp.dmi' /// Colored disk mouth appearance for adding it as a mouth overlay var/mutable_appearance/colored_disk_mouth diff --git a/code/modules/mob/living/simple_animal/hostile/cat_butcher.dm b/code/modules/mob/living/simple_animal/hostile/cat_butcher.dm index 5677b2752fd..652b082543d 100644 --- a/code/modules/mob/living/simple_animal/hostile/cat_butcher.dm +++ b/code/modules/mob/living/simple_animal/hostile/cat_butcher.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/cat_butcherer name = "Cat Surgeon" desc = "A man with the quest of chasing endless feline tail." - icon = 'icons/mob/simple_human.dmi' + icon = 'icons/mob/simple/simple_human.dmi' icon_state = "cat_butcher" icon_living = "cat_butcher" icon_dead = "syndicate_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/dark_wizard.dm b/code/modules/mob/living/simple_animal/hostile/dark_wizard.dm index 65ca35c477c..e7aa4aa4f53 100644 --- a/code/modules/mob/living/simple_animal/hostile/dark_wizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/dark_wizard.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/dark_wizard name = "Dark Wizard" desc = "Killing amateurs since the dawn of times." - icon = 'icons/mob/simple_human.dmi' + icon = 'icons/mob/simple/simple_human.dmi' icon_state = "dark_wizard" icon_living = "dark_wizard" move_to_delay = 10 diff --git a/code/modules/mob/living/simple_animal/hostile/eyeballs.dm b/code/modules/mob/living/simple_animal/hostile/eyeballs.dm index 23637f2d1cf..bc84e60936c 100644 --- a/code/modules/mob/living/simple_animal/hostile/eyeballs.dm +++ b/code/modules/mob/living/simple_animal/hostile/eyeballs.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/eyeball name = "eyeball" desc = "An odd looking creature, it won't stop staring..." - icon = 'icons/mob/carp.dmi' + icon = 'icons/mob/simple/carp.dmi' icon_state = "eyeball" icon_living = "eyeball" icon_gib = "" diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/goose.dm index 14284d414cd..9a63801e9e6 100644 --- a/code/modules/mob/living/simple_animal/hostile/goose.dm +++ b/code/modules/mob/living/simple_animal/hostile/goose.dm @@ -247,7 +247,7 @@ name = "Vomit" check_flags = AB_CHECK_CONSCIOUS button_icon_state = "vomit" - icon_icon = 'icons/mob/animal.dmi' + icon_icon = 'icons/mob/simple/animal.dmi' cooldown_time = 250 /datum/action/cooldown/vomit/Activate(atom/target) diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm index 85a38873895..4f81e2ece3e 100644 --- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm +++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm @@ -4,7 +4,7 @@ /mob/living/simple_animal/hostile/gorilla name = "Gorilla" desc = "A ground-dwelling, predominantly herbivorous ape that inhabits the forests of central Africa." - icon = 'icons/mob/gorilla.dmi' + icon = 'icons/mob/simple/gorilla.dmi' icon_state = "crawling" icon_living = "crawling" icon_dead = "dead" @@ -118,7 +118,7 @@ /mob/living/simple_animal/hostile/gorilla/cargo_domestic name = "Cargorilla" // Overriden, normally - icon = 'icons/mob/cargorillia.dmi' + icon = 'icons/mob/simple/cargorillia.dmi' desc = "Cargo's pet gorilla. They seem to have an 'I love Mom' tattoo." maxHealth = 200 health = 200 diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm index a6ae4396fb4..c8c665351c3 100644 --- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm +++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm @@ -5,7 +5,7 @@ /mob/living/simple_animal/hostile/hivebot name = "hivebot" desc = "A small robot." - icon = 'icons/mob/hivebot.dmi' + icon = 'icons/mob/simple/hivebot.dmi' icon_state = "basic" icon_living = "basic" icon_dead = "basic" diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm index fb219fa5aca..a12f3f136ba 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm @@ -6,7 +6,7 @@ /mob/living/simple_animal/hostile/jungle/leaper name = "leaper" desc = "Commonly referred to as 'leapers', the Geron Toad is a massive beast that spits out highly pressurized bubbles containing a unique toxin, knocking down its prey and then crushing it with its girth." - icon = 'icons/mob/jungle/leaper.dmi' + icon = 'icons/mob/simple/jungle/leaper.dmi' icon_state = "leaper" icon_living = "leaper" icon_dead = "leaper_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm b/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm index fb752989cef..a3c7908a9e6 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm @@ -3,7 +3,7 @@ /mob/living/simple_animal/hostile/jungle/mega_arachnid name = "mega arachnid" desc = "Though physically imposing, it prefers to ambush its prey, and it will only engage with an already crippled opponent." - icon = 'icons/mob/jungle/arachnid.dmi' + icon = 'icons/mob/simple/jungle/arachnid.dmi' icon_state = "arachnid" icon_living = "arachnid" icon_dead = "arachnid_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm b/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm index 8d4c48dbf17..52e9ee10698 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm @@ -9,7 +9,7 @@ /mob/living/simple_animal/hostile/jungle/mook name = "wanderer" desc = "This unhealthy looking primitive is wielding a rudimentary hatchet, swinging it with wild abandon. One isn't much of a threat, but in numbers they can quickly overwhelm a superior opponent." - icon = 'icons/mob/jungle/mook.dmi' + icon = 'icons/mob/simple/jungle/mook.dmi' icon_state = "mook" icon_living = "mook" icon_dead = "mook_dead" @@ -217,7 +217,7 @@ /obj/effect/temp_visual/mook_dust name = "dust" desc = "It's just a dust cloud!" - icon = 'icons/mob/jungle/mook.dmi' + icon = 'icons/mob/simple/jungle/mook.dmi' icon_state = "mook_leap_cloud" layer = BELOW_MOB_LAYER plane = GAME_PLANE diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm index 09a3d31bd18..5f05d8e27d5 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm @@ -9,7 +9,7 @@ name = "seedling" desc = "This oversized, predatory flower conceals what can only be described as an organic energy cannon, and it will not die until its hidden vital organs are sliced out. \ The concentrated streams of energy it sometimes produces require its full attention, attacking it during this time will prevent it from finishing its attack." - icon = 'icons/mob/jungle/seedling.dmi' + icon = 'icons/mob/simple/jungle/seedling.dmi' icon_state = "seedling" icon_living = "seedling" icon_dead = "seedling_dead" @@ -101,7 +101,7 @@ seedling_screen_object.transform = final /atom/movable/screen/seedling - icon = 'icons/mob/jungle/arachnid.dmi' + icon = 'icons/mob/simple/jungle/arachnid.dmi' icon_state = "seedling_beam_indicator" screen_loc = "CENTER:-16,CENTER:-16" diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index 7dbc797ec56..c8ab7a545ee 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -25,7 +25,7 @@ Difficulty: Medium maxHealth = 900 icon_state = "miner" icon_living = "miner" - icon = 'icons/mob/broadMobs.dmi' + icon = 'icons/mob/simple/broadMobs.dmi' health_doll_icon = "miner" mob_biotypes = MOB_ORGANIC|MOB_HUMANOID light_color = COLOR_LIGHT_GRAYISH_RED diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index fb98f6d1f9a..cbf15b468d8 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -41,7 +41,7 @@ Difficulty: Hard health_doll_icon = "bubblegum" friendly_verb_continuous = "stares down" friendly_verb_simple = "stare down" - icon = 'icons/mob/lavaland/96x96megafauna.dmi' + icon = 'icons/mob/simple/lavaland/96x96megafauna.dmi' speak_emote = list("gurgles") armour_penetration = 40 melee_damage_lower = 40 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/clockwork_knight.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/clockwork_knight.dm index ea415e75df7..cf909081e77 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/clockwork_knight.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/clockwork_knight.dm @@ -13,7 +13,7 @@ I'd rather there be something than the clockwork ruin be entirely empty though s maxHealth = 300 icon_state = "clockwork_defender" icon_living = "clockwork_defender" - icon = 'icons/mob/icemoon/icemoon_monsters.dmi' + icon = 'icons/mob/simple/icemoon/icemoon_monsters.dmi' attack_verb_continuous = "slashes" attack_verb_simple = "slash" attack_sound = 'sound/weapons/bladeslice.ogg' diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 6f659825128..01a58badbc2 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -34,7 +34,7 @@ health_doll_icon = "eva" friendly_verb_continuous = "stares down" friendly_verb_simple = "stare down" - icon = 'icons/mob/lavaland/96x96megafauna.dmi' + icon = 'icons/mob/simple/lavaland/96x96megafauna.dmi' speak_emote = list("roars") armour_penetration = 40 melee_damage_lower = 40 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm index b7cfe0265ba..bca18789ba8 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm @@ -14,7 +14,7 @@ Difficulty: Extremely Hard maxHealth = 1500 icon_state = "demonic_miner" icon_living = "demonic_miner" - icon = 'icons/mob/icemoon/icemoon_monsters.dmi' + icon = 'icons/mob/simple/icemoon/icemoon_monsters.dmi' attack_verb_continuous = "pummels" attack_verb_simple = "pummels" attack_sound = 'sound/weapons/sonic_jackhammer.ogg' diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index 7ac2652b95c..bfa938bb82d 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -42,7 +42,7 @@ attack_verb_simple = "chomp" attack_sound = 'sound/magic/demon_attack1.ogg' attack_vis_effect = ATTACK_EFFECT_BITE - icon = 'icons/mob/lavaland/64x64megafauna.dmi' + icon = 'icons/mob/simple/lavaland/64x64megafauna.dmi' icon_state = "dragon" icon_living = "dragon" icon_dead = "dragon_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index d8a87f3a620..90b6322500f 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -47,7 +47,7 @@ Difficulty: Hard health_doll_icon = "hierophant" friendly_verb_continuous = "stares down" friendly_verb_simple = "stare down" - icon = 'icons/mob/lavaland/hierophant_new.dmi' + icon = 'icons/mob/simple/lavaland/hierophant_new.dmi' faction = list("boss") //asteroid mobs? get that shit out of my beautiful square house speak_emote = list("preaches") armour_penetration = 50 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 25e4a51eda7..0d2655e23c3 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -29,7 +29,7 @@ icon_living = "mega_legion" health_doll_icon = "mega_legion" desc = "One of many." - icon = 'icons/mob/lavaland/96x96megafauna.dmi' + icon = 'icons/mob/simple/lavaland/96x96megafauna.dmi' attack_verb_continuous = "chomps" attack_verb_simple = "chomp" attack_sound = 'sound/magic/demon_attack1.ogg' @@ -72,7 +72,7 @@ ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, INNATE_TRAIT) /mob/living/simple_animal/hostile/megafauna/legion/medium - icon = 'icons/mob/lavaland/64x64megafauna.dmi' + icon = 'icons/mob/simple/lavaland/64x64megafauna.dmi' pixel_x = -16 pixel_y = -8 maxHealth = 350 @@ -88,7 +88,7 @@ icon_state = "mega_legion_right" /mob/living/simple_animal/hostile/megafauna/legion/small - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' icon_state = "mega_legion" pixel_x = 0 pixel_y = 0 @@ -99,7 +99,7 @@ /datum/action/innate/megafauna_attack/create_skull name = "Create Legion Skull" - icon_icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon_icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' button_icon_state = "legion_head" chosen_message = "You are now creating legion skulls." chosen_attack_num = 1 @@ -113,7 +113,7 @@ /datum/action/innate/megafauna_attack/create_turrets name = "Create Sentinels" - icon_icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon_icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' button_icon_state = "legion_turret" chosen_message = "You are now creating legion sentinels." chosen_attack_num = 3 @@ -264,7 +264,7 @@ /obj/structure/legionturret name = "\improper Legion sentinel" desc = "The eye pierces your soul." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' icon_state = "legion_turret" light_power = 0.5 light_range = 2 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm index 4876a47498a..8dad5e9e646 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm @@ -20,7 +20,7 @@ Difficulty: Hard icon_state = "wendigo" icon_living = "wendigo" icon_dead = "wendigo_dead" - icon = 'icons/mob/icemoon/64x64megafauna.dmi' + icon = 'icons/mob/simple/icemoon/64x64megafauna.dmi' attack_verb_continuous = "claws" attack_verb_simple = "claw" attack_sound = 'sound/magic/demon_attack1.ogg' diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index 38b6b880182..dca1f2a98b9 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -107,7 +107,7 @@ GLOBAL_LIST_INIT(mimic_blacklist, list(/obj/structure/table, /obj/structure/cabl var/mob/living/creator = null // the creator var/destroy_objects = 0 var/knockdown_people = 0 - var/static/mutable_appearance/googly_eyes = mutable_appearance('icons/mob/mob.dmi', "googly_eyes") + var/static/mutable_appearance/googly_eyes = mutable_appearance('icons/mob/simple/mob.dmi', "googly_eyes") var/overlay_googly_eyes = TRUE var/idledamage = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm index 16cf6406916..3c1d5df32e5 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm @@ -2,7 +2,7 @@ /mob/living/simple_animal/hostile/asteroid/basilisk name = "basilisk" desc = "A territorial beast, covered in a thick shell that absorbs energy. Its stare causes victims to freeze from the inside." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' icon_state = "Basilisk" icon_living = "Basilisk" icon_aggro = "Basilisk_alert" @@ -103,7 +103,7 @@ /mob/living/simple_animal/hostile/asteroid/basilisk/watcher name = "watcher" desc = "A levitating, eye-like creature held aloft by winglike formations of sinew. A sharp spine of crystal protrudes from its body." - icon = 'icons/mob/lavaland/watcher.dmi' + icon = 'icons/mob/simple/lavaland/watcher.dmi' icon_state = "watcher" icon_living = "watcher" icon_aggro = "watcher" diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm index 1239960845e..9aacf4f3f26 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm @@ -4,7 +4,7 @@ name = "brimdemon" desc = "A misshapen demon with big, red eyes and a hinged mouth. Not much is known about the creatures \ due to their response to any unexpected stimulus being \"brimbeam\", a deadly blood-laser barrage." - icon = 'icons/mob/brimdemon.dmi' + icon = 'icons/mob/simple/lavaland/brimdemon.dmi' icon_state = "brimdemon" icon_living = "brimdemon" icon_dead = "brimdemon_dead" @@ -157,7 +157,7 @@ /obj/effect/brimbeam name = "brimbeam" - icon = 'icons/mob/brimdemon.dmi' + icon = 'icons/mob/simple/lavaland/brimdemon.dmi' icon_state = "brimbeam_mid" layer = ABOVE_MOB_LAYER plane = ABOVE_GAME_PLANE diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm index 76105c1cfc2..6daeb14f70b 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/asteroid/curseblob name = "curse mass" desc = "A mass of purple... smoke?" - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' icon_state = "curseblob" icon_living = "curseblob" icon_aggro = "curseblob" diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm index 98644a69260..8b17bfce984 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm @@ -6,7 +6,7 @@ /mob/living/simple_animal/hostile/asteroid/elite name = "elite" desc = "An elite monster, found in one of the strange tumors on lavaland." - icon = 'icons/mob/lavaland/lavaland_elites.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_elites.dmi' faction = list("boss") robust_searching = TRUE ranged_ignores_vision = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm index 5465b1179b6..dd831d8cd06 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm @@ -161,7 +161,7 @@ /mob/living/simple_animal/hostile/asteroid/elite/broodmother_child name = "baby goliath" desc = "A young goliath recently born from it's mother. While they hatch from eggs, said eggs are incubated in the mother until they are ready to be born." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' icon_state = "goliath_baby" icon_living = "goliath_baby" icon_aggro = "goliath_baby" diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm index 0df3326fbf1..83f485144ab 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm @@ -2,7 +2,7 @@ /mob/living/simple_animal/hostile/asteroid/goldgrub name = "goldgrub" desc = "A worm that grows fat from eating everything in its sight. Seems to enjoy precious metals and other shiny things, hence the name." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' icon_state = "Goldgrub" icon_living = "Goldgrub" icon_aggro = "Goldgrub_alert" diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm index 95a3e57ad80..69120d72b02 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm @@ -2,7 +2,7 @@ /mob/living/simple_animal/hostile/asteroid/goliath name = "goliath" desc = "A massive beast that uses long tentacles to ensnare its prey, threatening them is not advised under any conditions." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' icon_state = "Goliath" icon_living = "Goliath" icon_aggro = "Goliath_alert" @@ -89,7 +89,7 @@ /mob/living/simple_animal/hostile/asteroid/goliath/beast name = "goliath" desc = "A hulking, armor-plated beast with long tendrils arching from its back." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' icon_state = "goliath" icon_living = "goliath" icon_aggro = "goliath" @@ -179,7 +179,7 @@ //tentacles /obj/effect/temp_visual/goliath_tentacle name = "goliath tentacle" - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' icon_state = "Goliath_tentacle_spawn" layer = BELOW_MOB_LAYER plane = GAME_PLANE diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm index 01d975a37a6..a77a6d05699 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm @@ -2,7 +2,7 @@ /mob/living/simple_animal/hostile/asteroid/gutlunch name = "gutlunch" desc = "A scavenger that eats raw meat, often found alongside ash walkers. Produces a thick, nutritious milk." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' icon_state = "gutlunch" icon_living = "gutlunch" icon_dead = "gutlunch" diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 07c5a3143a9..675924fa8ec 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/asteroid/hivelord name = "hivelord" desc = "A truly alien creature, it is a mass of unknown organic material, constantly fluctuating. When attacking, pieces of it split off and attack in tandem with the original." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' icon_state = "Hivelord" icon_living = "Hivelord" icon_aggro = "Hivelord_alert" @@ -61,7 +61,7 @@ /mob/living/simple_animal/hostile/asteroid/hivelordbrood name = "hivelord brood" desc = "A fragment of the original Hivelord, rallying behind its original. One isn't much of a threat, but..." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' icon_state = "Hivelordbrood" icon_living = "Hivelordbrood" icon_aggro = "Hivelordbrood" @@ -102,7 +102,7 @@ /mob/living/simple_animal/hostile/asteroid/hivelord/legion name = "legion" desc = "You can still see what was once a human under the shifting mass of corruption." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' icon_state = "legion" icon_living = "legion" icon_aggro = "legion" @@ -169,7 +169,7 @@ /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion name = "legion" desc = "One of many." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' icon_state = "legion_head" icon_living = "legion_head" icon_aggro = "legion_head" @@ -247,7 +247,7 @@ /mob/living/simple_animal/hostile/big_legion name = "legion" desc = "One of many." - icon = 'icons/mob/lavaland/64x64megafauna.dmi' + icon = 'icons/mob/simple/lavaland/64x64megafauna.dmi' icon_state = "legion" icon_living = "legion" icon_dead = "legion" @@ -286,7 +286,7 @@ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow name = "snow legion" desc = "You can still see what was once a human under the shifting snowy mass, clearly decorated by a clown." - icon = 'icons/mob/icemoon/icemoon_monsters.dmi' + icon = 'icons/mob/simple/icemoon/icemoon_monsters.dmi' icon_state = "snowlegion" icon_living = "snowlegion" icon_aggro = "snowlegion_alive" @@ -302,7 +302,7 @@ /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/snow name = "snow legion" desc = "One of many." - icon = 'icons/mob/icemoon/icemoon_monsters.dmi' + icon = 'icons/mob/simple/icemoon/icemoon_monsters.dmi' icon_state = "snowlegion_head" icon_living = "snowlegion_head" icon_aggro = "snowlegion_head" diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm index 40864a39798..2c2efc947f7 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/asteroid/ice_demon name = "demonic watcher" desc = "A creature formed entirely out of ice, bluespace energy emanates from inside of it." - icon = 'icons/mob/icemoon/icemoon_monsters.dmi' + icon = 'icons/mob/simple/icemoon/icemoon_monsters.dmi' icon_state = "ice_demon" icon_living = "ice_demon" icon_dead = "ice_demon_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm index 25faf599b85..123f26f69e4 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/asteroid/ice_whelp name = "ice whelp" desc = "The offspring of an ice drake, weak in comparison but still terrifying." - icon = 'icons/mob/icemoon/icemoon_monsters.dmi' + icon = 'icons/mob/simple/icemoon/icemoon_monsters.dmi' icon_state = "ice_whelp" icon_living = "ice_whelp" icon_dead = "ice_whelp_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/lobstrosity.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/lobstrosity.dm index 33cb4513c99..553109c1373 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/lobstrosity.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/lobstrosity.dm @@ -5,7 +5,7 @@ /mob/living/simple_animal/hostile/asteroid/lobstrosity name = "arctic lobstrosity" desc = "A marvel of evolution gone wrong, the frosty ice produces underground lakes where these ill tempered seafood gather. Beware its charge." - icon = 'icons/mob/icemoon/icemoon_monsters.dmi' + icon = 'icons/mob/simple/icemoon/icemoon_monsters.dmi' icon_state = "arctic_lobstrosity" icon_living = "arctic_lobstrosity" icon_dead = "arctic_lobstrosity_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm index 744d39e26f1..6596780e325 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/asteroid/polarbear name = "polar bear" desc = "An aggressive animal that defends it's territory with incredible power. These beasts don't run from their enemies." - icon = 'icons/mob/icemoon/icemoon_monsters.dmi' + icon = 'icons/mob/simple/icemoon/icemoon_monsters.dmi' icon_state = "polarbear" icon_living = "polarbear" icon_dead = "polarbear_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm index 647f6d5ecd3..6dd2a2b5d72 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/asteroid/wolf name = "white wolf" desc = "A beast that survives by feasting on weaker opponents, they're much stronger with numbers." - icon = 'icons/mob/icemoon/icemoon_monsters.dmi' + icon = 'icons/mob/simple/icemoon/icemoon_monsters.dmi' icon_state = "whitewolf" icon_living = "whitewolf" icon_dead = "whitewolf_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm b/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm index 29fb502c1a8..0cc6f8a37c1 100644 --- a/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm +++ b/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/nanotrasen name = "\improper Nanotrasen Private Security Officer" desc = "An officer part of Nanotrasen's private security force, he seems rather unpleased to meet you." - icon = 'icons/mob/simple_human.dmi' + icon = 'icons/mob/simple/simple_human.dmi' icon_state = "nanotrasen" icon_living = "nanotrasen" icon_dead = null diff --git a/code/modules/mob/living/simple_animal/hostile/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm index a1eac620a40..d7b2c16eba4 100644 --- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm +++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm @@ -145,7 +145,7 @@ max_integrity = 50 spawn_time = 600 //1 minute max_mobs = 15 - icon = 'icons/mob/nest.dmi' + icon = 'icons/mob/simple/lavaland/nest.dmi' spawn_text = "crawls through" mob_types = list(/mob/living/simple_animal/hostile/netherworld/migo, /mob/living/simple_animal/hostile/netherworld, /mob/living/simple_animal/hostile/netherworld/blankbody) faction = list("nether") diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm index b9a95269bf3..1a9b5dfe70f 100644 --- a/code/modules/mob/living/simple_animal/hostile/pirate.dm +++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/pirate name = "Pirate" desc = "Does what he wants cause a pirate is free." - icon = 'icons/mob/simple_human.dmi' + icon = 'icons/mob/simple/simple_human.dmi' icon_state = "piratemelee" icon_living = "piratemelee" icon_dead = "pirate_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm index 6e8ed5c638c..95c1c20c6c3 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/retaliate/clown name = "Clown" desc = "A denizen of clown planet." - icon = 'icons/mob/clown_mobs.dmi' + icon = 'icons/mob/simple/clown_mobs.dmi' icon_state = "clown" icon_living = "clown" icon_dead = "clown_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm index 8b9ace91bd1..2fce1b0f183 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm @@ -31,7 +31,7 @@ can_be_held = TRUE held_w_class = WEIGHT_CLASS_TINY worn_slot_flags = ITEM_SLOT_HEAD - head_icon = 'icons/mob/animal_item_head.dmi' + head_icon = 'icons/mob/clothing/head/animal_item_head.dmi' var/stepped_sound = 'sound/effects/huuu.ogg' ///How much of a reagent the mob injects on attack var/poison_per_bite = 3 diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm index 557a3052605..153f3dc354d 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/retaliate/ghost name = "ghost" desc = "A soul of the dead, spooky." - icon = 'icons/mob/mob.dmi' + icon = 'icons/mob/simple/mob.dmi' icon_state = "ghost" icon_living = "ghost" mob_biotypes = MOB_SPIRIT @@ -55,12 +55,12 @@ /mob/living/simple_animal/hostile/retaliate/ghost/proc/give_hair() if(ghost_hairstyle != null) - ghost_hair = mutable_appearance('icons/mob/human_face.dmi', "hair_[ghost_hairstyle]", -HAIR_LAYER) + ghost_hair = mutable_appearance('icons/mob/species/human/human_face.dmi', "hair_[ghost_hairstyle]", -HAIR_LAYER) ghost_hair.alpha = 200 ghost_hair.color = ghost_hair_color add_overlay(ghost_hair) if(ghost_facial_hairstyle != null) - ghost_facial_hair = mutable_appearance('icons/mob/human_face.dmi', "facial_[ghost_facial_hairstyle]", -HAIR_LAYER) + ghost_facial_hair = mutable_appearance('icons/mob/species/human/human_face.dmi', "facial_[ghost_facial_hairstyle]", -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/simple_animal/hostile/retaliate/spaceman.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm index 617c8e80ebf..3e4e6ddaf32 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm @@ -31,7 +31,7 @@ /mob/living/simple_animal/hostile/retaliate/nanotrasenpeace //this should be in a different file name = "\improper Nanotrasen Private Security Officer" desc = "An officer part of Nanotrasen's private security force." - icon = 'icons/mob/simple_human.dmi' + icon = 'icons/mob/simple/simple_human.dmi' icon_state = "nanotrasen" icon_living = "nanotrasen" icon_dead = null diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm index 3172c56c957..dee84b5f863 100644 --- a/code/modules/mob/living/simple_animal/hostile/russian.dm +++ b/code/modules/mob/living/simple_animal/hostile/russian.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/russian name = "Russian" desc = "For the Motherland!" - icon = 'icons/mob/simple_human.dmi' + icon = 'icons/mob/simple/simple_human.dmi' icon_state = "russianmelee" icon_living = "russianmelee" icon_dead = "russianmelee_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/skeleton.dm b/code/modules/mob/living/simple_animal/hostile/skeleton.dm index 8b040c2c438..5d439748865 100644 --- a/code/modules/mob/living/simple_animal/hostile/skeleton.dm +++ b/code/modules/mob/living/simple_animal/hostile/skeleton.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/skeleton name = "reanimated skeleton" desc = "A real bonefied skeleton, doesn't seem like it wants to socialize." - icon = 'icons/mob/simple_human.dmi' + icon = 'icons/mob/simple/simple_human.dmi' icon_state = "skeleton" icon_living = "skeleton" icon_dead = "skeleton" diff --git a/code/modules/mob/living/simple_animal/hostile/smspider.dm b/code/modules/mob/living/simple_animal/hostile/smspider.dm index da68f1a291a..ec05f2e56d1 100644 --- a/code/modules/mob/living/simple_animal/hostile/smspider.dm +++ b/code/modules/mob/living/simple_animal/hostile/smspider.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/smspider name = "supermatter spider" desc= "A sliver of supermatter placed upon a robotically enhanced pedestal." - icon = 'icons/mob/smspider.dmi' + icon = 'icons/mob/simple/smspider.dmi' icon_state = "smspider" icon_living = "smspider" icon_dead = "smspider_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm index 1537eed928a..f46f7a5c34e 100644 --- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm @@ -35,7 +35,7 @@ attack_sound = 'sound/magic/demon_attack1.ogg' attack_vis_effect = ATTACK_EFFECT_BITE death_sound = 'sound/creatures/space_dragon_roar.ogg' - icon = 'icons/mob/spacedragon.dmi' + icon = 'icons/mob/nonhuman-player/spacedragon.dmi' icon_state = "spacedragon" icon_living = "spacedragon" icon_dead = "spacedragon_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 36373a8f389..e1636d680a9 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -17,7 +17,7 @@ /mob/living/simple_animal/hostile/syndicate name = "Syndicate Operative" desc = "Death to Nanotrasen." - icon = 'icons/mob/simple_human.dmi' + icon = 'icons/mob/simple/simple_human.dmi' icon_state = "syndicate" icon_living = "syndicate" icon_dead = "syndicate_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/wizard.dm b/code/modules/mob/living/simple_animal/hostile/wizard.dm index e844ceb12c1..b69cd69c21c 100644 --- a/code/modules/mob/living/simple_animal/hostile/wizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/wizard.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/wizard name = "Space Wizard" desc = "EI NATH?" - icon = 'icons/mob/simple_human.dmi' + icon = 'icons/mob/simple/simple_human.dmi' icon_state = "wizard" icon_living = "wizard" icon_dead = "wizard_dead" diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm index 6e12db38add..e0ee6efe904 100644 --- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm +++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm @@ -12,7 +12,7 @@ /mob/living/simple_animal/hostile/asteroid/fugu name = "wumborian fugu" desc = "The wumborian fugu rapidly increases its body mass in order to ward off its prey. Great care should be taken to avoid it while it's in this state as it is nearly invincible, but it cannot maintain its form forever." - icon = 'icons/mob/lavaland/64x64megafauna.dmi' + icon = 'icons/mob/simple/lavaland/64x64megafauna.dmi' icon_state = "Fugu0" icon_living = "Fugu0" icon_aggro = "Fugu0" diff --git a/code/modules/mob/living/simple_animal/hostile/zombie.dm b/code/modules/mob/living/simple_animal/hostile/zombie.dm index 660f4314cb8..01ce6f84442 100644 --- a/code/modules/mob/living/simple_animal/hostile/zombie.dm +++ b/code/modules/mob/living/simple_animal/hostile/zombie.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/zombie name = "Shambling Corpse" desc = "When there is no more room in hell, the dead will walk in outer space." - icon = 'icons/mob/simple_human.dmi' + icon = 'icons/mob/simple/simple_human.dmi' icon_state = "zombie" icon_living = "zombie" mob_biotypes = MOB_ORGANIC|MOB_HUMANOID diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 0416ca299fa..580fbe68f5a 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -29,7 +29,7 @@ /mob/living/simple_animal/parrot name = "parrot" desc = "The parrot squawks, \"They're a Parrot! BAWWK!\"" //' - icon = 'icons/mob/animal.dmi' + icon = 'icons/mob/simple/animal.dmi' icon_state = "parrot_fly" icon_living = "parrot_fly" icon_dead = "parrot_dead" diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index 079508f6487..57bb11e23d9 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -3,7 +3,7 @@ real_name = "Shade" desc = "A bound spirit." gender = PLURAL - icon = 'icons/mob/cult.dmi' + icon = 'icons/mob/nonhuman-player/cult.dmi' icon_state = "shade_cult" icon_living = "shade_cult" mob_biotypes = MOB_SPIRIT diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index a5c339b7aab..2941accdee2 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -1,7 +1,7 @@ /// Simple, mostly AI-controlled critters, such as pets, bots, and drones. /mob/living/simple_animal name = "animal" - icon = 'icons/mob/animal.dmi' + icon = 'icons/mob/simple/animal.dmi' health = 20 maxHealth = 20 gender = PLURAL //placeholder @@ -502,7 +502,7 @@ adjust_bodytemperature((maxbodytemp + (fire_handler.stacks * 12)) * 0.5 * delta_time) /mob/living/simple_animal/update_fire_overlay(stacks, on_fire, last_icon_state, suffix = "") - var/mutable_appearance/fire_overlay = mutable_appearance('icons/mob/onfire.dmi', "generic_fire") + var/mutable_appearance/fire_overlay = mutable_appearance('icons/mob/effects/onfire.dmi', "generic_fire") if(on_fire && isnull(last_icon_state)) add_overlay(fire_overlay) return fire_overlay diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index f6fa376e391..6c72fb7537f 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -1,7 +1,7 @@ #define SLIME_CARES_ABOUT(to_check) (to_check && (to_check == Target || to_check == Leader || (to_check in Friends))) /mob/living/simple_animal/slime name = "grey baby slime (123)" - icon = 'icons/mob/slimes.dmi' + icon = 'icons/mob/simple/slimes.dmi' icon_state = "grey baby slime" pass_flags = PASSTABLE | PASSGRILLE gender = NEUTER diff --git a/code/modules/mob_spawn/corpses/nonhuman_corpses.dm b/code/modules/mob_spawn/corpses/nonhuman_corpses.dm index b39c381f0f9..7aae4abb048 100644 --- a/code/modules/mob_spawn/corpses/nonhuman_corpses.dm +++ b/code/modules/mob_spawn/corpses/nonhuman_corpses.dm @@ -19,7 +19,7 @@ ///dead slimes, with a var for whatever color you want. /obj/effect/mob_spawn/corpse/slime mob_type = /mob/living/simple_animal/slime - icon = 'icons/mob/slimes.dmi' + icon = 'icons/mob/simple/slimes.dmi' icon_state = "grey baby slime" //sets the icon in the map editor ///the color of the slime you're spawning. var/slime_species = "grey" diff --git a/code/modules/mob_spawn/ghost_roles/mining_roles.dm b/code/modules/mob_spawn/ghost_roles/mining_roles.dm index fa80e7c597c..2be71e1f773 100644 --- a/code/modules/mob_spawn/ghost_roles/mining_roles.dm +++ b/code/modules/mob_spawn/ghost_roles/mining_roles.dm @@ -175,7 +175,7 @@ /obj/structure/ash_walker_eggshell name = "ash walker egg" desc = "A man-sized yellow egg, spawned from some unfathomable creature. A humanoid silhouette lurks within. The egg shell looks resistant to temperature but otherwise rather brittle." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' icon_state = "large_egg" resistance_flags = LAVA_PROOF | FIRE_PROOF | FREEZE_PROOF max_integrity = 80 @@ -214,7 +214,7 @@ name = "ash walker egg" desc = "A man-sized yellow egg, spawned from some unfathomable creature. A humanoid silhouette lurks within." prompt_name = "necropolis ash walker" - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' icon_state = "large_egg" mob_species = /datum/species/lizard/ashwalker outfit = /datum/outfit/ashwalker diff --git a/code/modules/pai/pai.dm b/code/modules/pai/pai.dm index 235ce06ee85..c148b78d0e9 100644 --- a/code/modules/pai/pai.dm +++ b/code/modules/pai/pai.dm @@ -4,11 +4,11 @@ density = FALSE desc = "A generic pAI hard-light holographics emitter." health = 500 - held_lh = 'icons/mob/pai_item_lh.dmi' - held_rh = 'icons/mob/pai_item_rh.dmi' - head_icon = 'icons/mob/pai_item_head.dmi' + held_lh = 'icons/mob/inhands/pai_item_lh.dmi' + held_rh = 'icons/mob/inhands/pai_item_rh.dmi' + head_icon = 'icons/mob/clothing/head/pai_item_head.dmi' hud_type = /datum/hud/pai - icon = 'icons/mob/pai.dmi' + icon = 'icons/mob/silicon/pai.dmi' icon_state = "repairbot" job = JOB_PERSONAL_AI layer = LOW_MOB_LAYER diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 4a9d16db1ef..9658ae4b54d 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -436,7 +436,7 @@ /obj/item/stock_parts/cell/emproof/slime name = "EMP-proof slime core" desc = "A yellow slime core infused with plasma. Its organic nature makes it immune to EMPs." - icon = 'icons/mob/slimes.dmi' + icon = 'icons/mob/simple/slimes.dmi' icon_state = "yellow slime extract" custom_materials = null maxcharge = 5000 diff --git a/code/modules/research/xenobiology/crossbreeding/_misc.dm b/code/modules/research/xenobiology/crossbreeding/_misc.dm index d53d9b1ff4d..8f12d7c2733 100644 --- a/code/modules/research/xenobiology/crossbreeding/_misc.dm +++ b/code/modules/research/xenobiology/crossbreeding/_misc.dm @@ -87,7 +87,7 @@ Slimecrossing Items /obj/item/stock_parts/cell/high/slime_hypercharged name = "hypercharged slime core" desc = "A charged yellow slime extract, infused with plasma. It almost hurts to touch." - icon = 'icons/mob/slimes.dmi' + icon = 'icons/mob/simple/slimes.dmi' icon_state = "yellow slime extract" rating = 7 custom_materials = null diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index 92d01592230..198c433e3de 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/simple_human.dmi', icon_state = "skeleton", layer = ABOVE_MOB_LAYER, loc = owner) + var/image/I = image(icon = 'icons/mob/simple/simple_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/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index d8329e537f1..751e6499acf 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -1,7 +1,7 @@ //Xenobio control console /mob/camera/ai_eye/remote/xenobio visible_icon = TRUE - icon = 'icons/mob/cameramob.dmi' + icon = 'icons/mob/silicon/cameramob.dmi' icon_state = "generic_camera" var/allowed_area = null @@ -80,7 +80,7 @@ eyeobj = new /mob/camera/ai_eye/remote/xenobio(get_turf(src)) eyeobj.origin = src eyeobj.visible_icon = TRUE - eyeobj.icon = 'icons/mob/cameramob.dmi' + eyeobj.icon = 'icons/mob/silicon/cameramob.dmi' eyeobj.icon_state = "generic_camera" /obj/machinery/computer/camera_advanced/xenobio/GrantActions(mob/living/user) diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index d7f03fcf88c..a939b02cb10 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -3,7 +3,7 @@ /obj/item/slime_extract name = "slime extract" desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"." - icon = 'icons/mob/slimes.dmi' + icon = 'icons/mob/simple/slimes.dmi' icon_state = "grey slime extract" force = 0 w_class = WEIGHT_CLASS_TINY diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index ae557d9dfb7..4a809808b30 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -4,14 +4,14 @@ force = 3 throwforce = 3 w_class = WEIGHT_CLASS_SMALL - icon = 'icons/mob/human_parts.dmi' + icon = 'icons/mob/species/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/human_parts.dmi' + VAR_PROTECTED/icon_static = 'icons/mob/species/human/bodyparts.dmi' ///The icon for husked limbs - VAR_PROTECTED/icon_husk = 'icons/mob/human_parts.dmi' + VAR_PROTECTED/icon_husk = 'icons/mob/species/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 @@ -764,16 +764,21 @@ image_dir = SOUTH if(dmg_overlay_type) if(brutestate) - . += image('icons/mob/dam_mob.dmi', "[dmg_overlay_type]_[body_zone]_[brutestate]0", -DAMAGE_LAYER, image_dir) + . += image('icons/mob/effects/dam_mob.dmi', "[dmg_overlay_type]_[body_zone]_[brutestate]0", -DAMAGE_LAYER, image_dir) if(burnstate) - . += image('icons/mob/dam_mob.dmi', "[dmg_overlay_type]_[body_zone]_0[burnstate]", -DAMAGE_LAYER, image_dir) + . += image('icons/mob/effects/dam_mob.dmi', "[dmg_overlay_type]_[body_zone]_0[burnstate]", -DAMAGE_LAYER, image_dir) var/image/limb = image(layer = -BODYPARTS_LAYER, dir = image_dir) var/image/aux if(animal_origin) if(IS_ORGANIC_LIMB(src)) - limb.icon = 'icons/mob/animal_parts.dmi' + + if (animal_origin == MONKEY_BODYPART) + limb.icon = 'icons/mob/species/monkey/bodyparts.dmi' + else + limb.icon = 'icons/mob/species/alien/bodyparts.dmi' + if(limb_id == "husk") limb.icon_state = "[animal_origin]_husk_[body_zone]" else diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index 45081ba453a..40cb80deb36 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/human_parts.dmi' + icon = 'icons/mob/species/human/bodyparts.dmi' icon_state = "default_human_head" max_damage = 250 //SKYRAT EDIT CHANGE: max_damage = 200 body_zone = BODY_ZONE_HEAD @@ -203,7 +203,7 @@ // Blush emote overlay if (is_blushing) - var/mutable_appearance/blush_overlay = mutable_appearance('icons/mob/human_face.dmi', "blush", -BODY_ADJ_LAYER) // Should appear behind the eyes + var/mutable_appearance/blush_overlay = mutable_appearance('icons/mob/species/human/human_face.dmi', "blush", -BODY_ADJ_LAYER) // Should appear behind the eyes blush_overlay.color = COLOR_BLUSH_PINK blush_overlay.pixel_x += face_offset_x blush_overlay.pixel_y += face_offset_y @@ -225,13 +225,13 @@ if(!brain) var/image/debrain_overlay = image(layer = -HAIR_LAYER, dir = SOUTH) if(animal_origin == ALIEN_BODYPART) - debrain_overlay.icon = 'icons/mob/animal_parts.dmi' + debrain_overlay.icon = 'icons/mob/species/alien/bodyparts.dmi' debrain_overlay.icon_state = "debrained_alien" else if(animal_origin == LARVA_BODYPART) - debrain_overlay.icon = 'icons/mob/animal_parts.dmi' + debrain_overlay.icon = 'icons/mob/species/alien/bodyparts.dmi' debrain_overlay.icon_state = "debrained_larva" else if(!(NOBLOOD in species_flags_list)) - debrain_overlay.icon = 'icons/mob/human_face.dmi' + debrain_overlay.icon = 'icons/mob/species/human/human_face.dmi' debrain_overlay.icon_state = "debrained" . += debrain_overlay else @@ -245,14 +245,14 @@ // lipstick if(lip_style) - var/image/lips_overlay = image('icons/mob/human_face.dmi', "lips_[lip_style]", -BODY_LAYER, SOUTH) + var/image/lips_overlay = image('icons/mob/species/human/human_face.dmi', "lips_[lip_style]", -BODY_LAYER, SOUTH) lips_overlay.color = lip_color . += lips_overlay // eyes if(eyes) // This is a bit of copy/paste code from eyes.dm:generate_body_overlay - var/image/eye_left = image('icons/mob/human_face.dmi', "[eyes.eye_icon_state]_l", -BODY_LAYER, SOUTH) - var/image/eye_right = image('icons/mob/human_face.dmi', "[eyes.eye_icon_state]_r", -BODY_LAYER, SOUTH) + 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) if(eyes.eye_color_left) eye_left.color = eyes.eye_color_left if(eyes.eye_color_right) @@ -260,7 +260,7 @@ . += eye_left . += eye_right else - . += image('icons/mob/human_face.dmi', "eyes_missing", -BODY_LAYER, SOUTH) + . += image('icons/mob/species/human/human_face.dmi', "eyes_missing", -BODY_LAYER, SOUTH) else if(!facial_hair_hidden && facial_overlay && (FACEHAIR in species_flags_list)) facial_overlay.alpha = hair_alpha @@ -269,7 +269,7 @@ . += facial_gradient_overlay if(show_debrained) - . += mutable_appearance('icons/mob/human_face.dmi', "debrained", HAIR_LAYER) + . += mutable_appearance('icons/mob/species/human/human_face.dmi', "debrained", HAIR_LAYER) else if(!hair_hidden && hair_overlay && (HAIR in species_flags_list)) hair_overlay.alpha = hair_alpha @@ -315,14 +315,14 @@ return "The head of [real_name]" /obj/item/bodypart/head/monkey - icon = 'icons/mob/animal_parts.dmi' + icon = 'icons/mob/species/monkey/bodyparts.dmi' icon_state = "default_monkey_head" limb_id = SPECIES_MONKEY animal_origin = MONKEY_BODYPART bodytype = BODYTYPE_MONKEY | BODYTYPE_ORGANIC /obj/item/bodypart/head/alien - icon = 'icons/mob/animal_parts.dmi' + icon = 'icons/mob/species/alien/bodyparts.dmi' icon_state = "alien_head" px_x = 0 px_y = 0 @@ -331,7 +331,7 @@ animal_origin = ALIEN_BODYPART /obj/item/bodypart/head/larva - icon = 'icons/mob/animal_parts.dmi' + icon = 'icons/mob/species/alien/bodyparts.dmi' icon_state = "larva_head" px_x = 0 px_y = 0 diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm index b7aa3dc1263..9961022ed61 100644 --- a/code/modules/surgery/bodyparts/parts.dm +++ b/code/modules/surgery/bodyparts/parts.dm @@ -35,8 +35,8 @@ ..() /obj/item/bodypart/chest/monkey - icon = 'icons/mob/animal_parts.dmi' - icon_static = 'icons/mob/animal_parts.dmi' + icon = 'icons/mob/species/monkey/bodyparts.dmi' + icon_static = 'icons/mob/species/monkey/bodyparts.dmi' icon_state = "default_monkey_chest" limb_id = SPECIES_MONKEY should_draw_greyscale = FALSE @@ -46,7 +46,7 @@ acceptable_bodytype = BODYTYPE_MONKEY /obj/item/bodypart/chest/alien - icon = 'icons/mob/animal_parts.dmi' + icon = 'icons/mob/species/alien/bodyparts.dmi' icon_state = "alien_chest" limb_id = BODYPART_TYPE_ALIEN dismemberable = 0 @@ -54,7 +54,7 @@ animal_origin = ALIEN_BODYPART /obj/item/bodypart/chest/larva - icon = 'icons/mob/animal_parts.dmi' + icon = 'icons/mob/species/alien/bodyparts.dmi' icon_state = "larva_chest" dismemberable = 0 max_damage = 50 @@ -143,8 +143,8 @@ /obj/item/bodypart/l_arm/monkey - icon = 'icons/mob/animal_parts.dmi' - icon_static = 'icons/mob/animal_parts.dmi' + icon = 'icons/mob/species/monkey/bodyparts.dmi' + icon_static = 'icons/mob/species/monkey/bodyparts.dmi' icon_state = "default_monkey_l_arm" limb_id = SPECIES_MONKEY should_draw_greyscale = FALSE @@ -155,7 +155,7 @@ px_y = -3 /obj/item/bodypart/l_arm/alien - icon = 'icons/mob/animal_parts.dmi' + icon = 'icons/mob/species/alien/bodyparts.dmi' icon_state = "alien_l_arm" limb_id = BODYPART_TYPE_ALIEN px_x = 0 @@ -246,8 +246,8 @@ /obj/item/bodypart/r_arm/monkey - icon = 'icons/mob/animal_parts.dmi' - icon_static = 'icons/mob/animal_parts.dmi' + icon = 'icons/mob/species/monkey/bodyparts.dmi' + icon_static = 'icons/mob/species/monkey/bodyparts.dmi' icon_state = "default_monkey_r_arm" limb_id = SPECIES_MONKEY bodytype = BODYTYPE_MONKEY | BODYTYPE_ORGANIC @@ -257,7 +257,7 @@ px_y = -3 /obj/item/bodypart/r_arm/alien - icon = 'icons/mob/animal_parts.dmi' + icon = 'icons/mob/species/alien/bodyparts.dmi' icon_state = "alien_r_arm" limb_id = BODYPART_TYPE_ALIEN px_x = 0 @@ -339,8 +339,8 @@ owner.set_usable_legs(owner.usable_legs + 1) /obj/item/bodypart/l_leg/monkey - icon = 'icons/mob/animal_parts.dmi' - icon_static = 'icons/mob/animal_parts.dmi' + icon = 'icons/mob/species/monkey/bodyparts.dmi' + icon_static = 'icons/mob/species/monkey/bodyparts.dmi' icon_state = "default_monkey_l_leg" limb_id = SPECIES_MONKEY should_draw_greyscale = FALSE @@ -350,7 +350,7 @@ px_y = 4 /obj/item/bodypart/l_leg/alien - icon = 'icons/mob/animal_parts.dmi' + icon = 'icons/mob/species/alien/bodyparts.dmi' icon_state = "alien_l_leg" limb_id = BODYPART_TYPE_ALIEN px_x = 0 @@ -440,7 +440,7 @@ owner.set_usable_legs(owner.usable_legs + 1) /obj/item/bodypart/r_leg/monkey - icon = 'icons/mob/animal_parts.dmi' + icon = 'icons/mob/species/monkey/bodyparts.dmi' icon_state = "default_monkey_r_leg" limb_id = SPECIES_MONKEY should_draw_greyscale = FALSE @@ -450,7 +450,7 @@ px_y = 4 /obj/item/bodypart/r_leg/alien - icon = 'icons/mob/animal_parts.dmi' + icon = 'icons/mob/species/alien/bodyparts.dmi' icon_state = "alien_r_leg" limb_id = BODYPART_TYPE_ALIEN px_x = 0 diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 39ca6cf6eec..4823b6438f5 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -113,7 +113,7 @@ if(!istype(parent) || parent.getorgan(/obj/item/organ/internal/eyes) != src) CRASH("Generating a body overlay for [src] targeting an invalid parent '[parent]'.") - var/eye_icon = parent.dna?.species.eyes_icon || 'icons/mob/human_face.dmi' // SKYRAT EDIT ADDITION + var/eye_icon = parent.dna?.species.eyes_icon || 'icons/mob/species/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) @@ -130,7 +130,7 @@ // Cry emote overlay if (HAS_TRAIT(parent, TRAIT_CRYING)) // Caused by the *cry emote - var/mutable_appearance/tears_overlay = mutable_appearance('icons/mob/human_face.dmi', "tears", -BODY_ADJ_LAYER) + var/mutable_appearance/tears_overlay = mutable_appearance('icons/mob/species/human/human_face.dmi', "tears", -BODY_ADJ_LAYER) tears_overlay.color = COLOR_DARK_CYAN overlays += tears_overlay diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index f63ff886f39..6d6111eb16f 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -524,10 +524,10 @@ remove_tonal_indicator() deltimer(tonal_timerid) if(question_found) // Prioritize questions - tonal_indicator = mutable_appearance('icons/mob/talk.dmi', "signlang1", TYPING_LAYER) + tonal_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "signlang1", TYPING_LAYER) owner.visible_message(span_notice("[owner] lowers [owner.p_their()] eyebrows.")) else if(exclamation_found) - tonal_indicator = mutable_appearance('icons/mob/talk.dmi', "signlang2", TYPING_LAYER) + tonal_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "signlang2", TYPING_LAYER) owner.visible_message(span_notice("[owner] raises [owner.p_their()] eyebrows.")) if(!isnull(tonal_indicator) && owner?.client.typing_indicators) owner.add_overlay(tonal_indicator) diff --git a/code/modules/tgui_input/say_modal/typing.dm b/code/modules/tgui_input/say_modal/typing.dm index 51361768a45..9bda127a836 100644 --- a/code/modules/tgui_input/say_modal/typing.dm +++ b/code/modules/tgui_input/say_modal/typing.dm @@ -77,7 +77,7 @@ /mob/living/create_thinking_indicator() if(active_thinking_indicator || active_typing_indicator || !thinking_IC || stat != CONSCIOUS ) return FALSE - active_thinking_indicator = mutable_appearance('icons/mob/talk.dmi', "[bubble_icon]3", TYPING_LAYER) + active_thinking_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "[bubble_icon]3", TYPING_LAYER) add_overlay(active_thinking_indicator) /mob/living/remove_thinking_indicator() @@ -89,7 +89,7 @@ /mob/living/create_typing_indicator() if(active_typing_indicator || active_thinking_indicator || !thinking_IC || stat != CONSCIOUS) return FALSE - active_typing_indicator = mutable_appearance('icons/mob/talk.dmi', "[bubble_icon]0", TYPING_LAYER) + active_typing_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "[bubble_icon]0", TYPING_LAYER) add_overlay(active_typing_indicator) /mob/living/remove_typing_indicator() diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm index b1f3bb9f92b..3ad5c120e46 100644 --- a/code/modules/vehicles/mecha/_mecha.dm +++ b/code/modules/vehicles/mecha/_mecha.dm @@ -655,7 +655,7 @@ for(var/mob/M in speech_bubble_recipients) if(M.client) speech_bubble_recipients.Add(M.client) - INVOKE_ASYNC(GLOBAL_PROC, /proc/flick_overlay, image('icons/mob/talk.dmi', src, "machine[say_test(speech_args[SPEECH_MESSAGE])]",MOB_LAYER+1), speech_bubble_recipients, 30) + INVOKE_ASYNC(GLOBAL_PROC, /proc/flick_overlay, image('icons/mob/effects/talk.dmi', src, "machine[say_test(speech_args[SPEECH_MESSAGE])]",MOB_LAYER+1), speech_bubble_recipients, 30) ///////////////////////// diff --git a/icons/mob/animal_parts.dmi b/icons/mob/animal_parts.dmi deleted file mode 100644 index 375df9341bf..00000000000 Binary files a/icons/mob/animal_parts.dmi and /dev/null differ diff --git a/icons/mob/animal_item_head.dmi b/icons/mob/clothing/head/animal_item_head.dmi similarity index 100% rename from icons/mob/animal_item_head.dmi rename to icons/mob/clothing/head/animal_item_head.dmi diff --git a/icons/mob/pai_item_head.dmi b/icons/mob/clothing/head/pai_item_head.dmi similarity index 100% rename from icons/mob/pai_item_head.dmi rename to icons/mob/clothing/head/pai_item_head.dmi diff --git a/icons/mob/pets_held.dmi b/icons/mob/clothing/head/pets_held.dmi similarity index 100% rename from icons/mob/pets_held.dmi rename to icons/mob/clothing/head/pets_held.dmi diff --git a/icons/mob/pets_held_head.dmi b/icons/mob/clothing/head/pets_held_head.dmi similarity index 100% rename from icons/mob/pets_held_head.dmi rename to icons/mob/clothing/head/pets_held_head.dmi diff --git a/icons/mob/bleed_overlays.dmi b/icons/mob/effects/bleed_overlays.dmi similarity index 100% rename from icons/mob/bleed_overlays.dmi rename to icons/mob/effects/bleed_overlays.dmi diff --git a/icons/mob/dam_mob.dmi b/icons/mob/effects/dam_mob.dmi similarity index 100% rename from icons/mob/dam_mob.dmi rename to icons/mob/effects/dam_mob.dmi diff --git a/icons/mob/onfire.dmi b/icons/mob/effects/onfire.dmi similarity index 100% rename from icons/mob/onfire.dmi rename to icons/mob/effects/onfire.dmi diff --git a/icons/mob/talk.dmi b/icons/mob/effects/talk.dmi similarity index 100% rename from icons/mob/talk.dmi rename to icons/mob/effects/talk.dmi diff --git a/icons/mob/animal_item_lh.dmi b/icons/mob/inhands/animal_item_lh.dmi similarity index 100% rename from icons/mob/animal_item_lh.dmi rename to icons/mob/inhands/animal_item_lh.dmi diff --git a/icons/mob/animal_item_rh.dmi b/icons/mob/inhands/animal_item_rh.dmi similarity index 100% rename from icons/mob/animal_item_rh.dmi rename to icons/mob/inhands/animal_item_rh.dmi diff --git a/icons/mob/pai_item_lh.dmi b/icons/mob/inhands/pai_item_lh.dmi similarity index 100% rename from icons/mob/pai_item_lh.dmi rename to icons/mob/inhands/pai_item_lh.dmi diff --git a/icons/mob/pai_item_rh.dmi b/icons/mob/inhands/pai_item_rh.dmi similarity index 100% rename from icons/mob/pai_item_rh.dmi rename to icons/mob/inhands/pai_item_rh.dmi diff --git a/icons/mob/pets_held_lh.dmi b/icons/mob/inhands/pets_held_lh.dmi similarity index 100% rename from icons/mob/pets_held_lh.dmi rename to icons/mob/inhands/pets_held_lh.dmi diff --git a/icons/mob/pets_held_rh.dmi b/icons/mob/inhands/pets_held_rh.dmi similarity index 100% rename from icons/mob/pets_held_rh.dmi rename to icons/mob/inhands/pets_held_rh.dmi diff --git a/icons/mob/alien.dmi b/icons/mob/nonhuman-player/alien.dmi similarity index 100% rename from icons/mob/alien.dmi rename to icons/mob/nonhuman-player/alien.dmi diff --git a/icons/mob/alienleap.dmi b/icons/mob/nonhuman-player/alienleap.dmi similarity index 100% rename from icons/mob/alienleap.dmi rename to icons/mob/nonhuman-player/alienleap.dmi diff --git a/icons/mob/alienqueen.dmi b/icons/mob/nonhuman-player/alienqueen.dmi similarity index 100% rename from icons/mob/alienqueen.dmi rename to icons/mob/nonhuman-player/alienqueen.dmi diff --git a/icons/mob/blob.dmi b/icons/mob/nonhuman-player/blob.dmi similarity index 100% rename from icons/mob/blob.dmi rename to icons/mob/nonhuman-player/blob.dmi diff --git a/icons/mob/cult.dmi b/icons/mob/nonhuman-player/cult.dmi similarity index 100% rename from icons/mob/cult.dmi rename to icons/mob/nonhuman-player/cult.dmi diff --git a/icons/mob/eldritch_mobs.dmi b/icons/mob/nonhuman-player/eldritch_mobs.dmi similarity index 100% rename from icons/mob/eldritch_mobs.dmi rename to icons/mob/nonhuman-player/eldritch_mobs.dmi diff --git a/icons/mob/guardian.dmi b/icons/mob/nonhuman-player/guardian.dmi similarity index 100% rename from icons/mob/guardian.dmi rename to icons/mob/nonhuman-player/guardian.dmi diff --git a/icons/mob/nonhuman-player/note -- alien bodyparts.txt b/icons/mob/nonhuman-player/note -- alien bodyparts.txt new file mode 100644 index 00000000000..35296caf717 --- /dev/null +++ b/icons/mob/nonhuman-player/note -- alien bodyparts.txt @@ -0,0 +1 @@ +To match the existing pattern of bodypart organization and allow for simpler code, alien bodyparts are stored in mob/species/alien/bodyparts, rather than this folder. \ No newline at end of file diff --git a/icons/mob/spacedragon.dmi b/icons/mob/nonhuman-player/spacedragon.dmi similarity index 100% rename from icons/mob/spacedragon.dmi rename to icons/mob/nonhuman-player/spacedragon.dmi diff --git a/icons/mob/ai.dmi b/icons/mob/silicon/ai.dmi similarity index 100% rename from icons/mob/ai.dmi rename to icons/mob/silicon/ai.dmi diff --git a/icons/mob/aibots.dmi b/icons/mob/silicon/aibots.dmi similarity index 100% rename from icons/mob/aibots.dmi rename to icons/mob/silicon/aibots.dmi diff --git a/icons/mob/cameramob.dmi b/icons/mob/silicon/cameramob.dmi similarity index 100% rename from icons/mob/cameramob.dmi rename to icons/mob/silicon/cameramob.dmi diff --git a/icons/mob/drone.dmi b/icons/mob/silicon/drone.dmi similarity index 100% rename from icons/mob/drone.dmi rename to icons/mob/silicon/drone.dmi diff --git a/icons/mob/pai.dmi b/icons/mob/silicon/pai.dmi similarity index 100% rename from icons/mob/pai.dmi rename to icons/mob/silicon/pai.dmi diff --git a/icons/mob/robot_items.dmi b/icons/mob/silicon/robot_items.dmi similarity index 100% rename from icons/mob/robot_items.dmi rename to icons/mob/silicon/robot_items.dmi diff --git a/icons/mob/robots.dmi b/icons/mob/silicon/robots.dmi similarity index 100% rename from icons/mob/robots.dmi rename to icons/mob/silicon/robots.dmi diff --git a/icons/mob/animal.dmi b/icons/mob/simple/animal.dmi similarity index 100% rename from icons/mob/animal.dmi rename to icons/mob/simple/animal.dmi diff --git a/icons/mob/bees.dmi b/icons/mob/simple/bees.dmi similarity index 100% rename from icons/mob/bees.dmi rename to icons/mob/simple/bees.dmi diff --git a/icons/mob/broadMobs.dmi b/icons/mob/simple/broadMobs.dmi similarity index 100% rename from icons/mob/broadMobs.dmi rename to icons/mob/simple/broadMobs.dmi diff --git a/icons/mob/cargorillia.dmi b/icons/mob/simple/cargorillia.dmi similarity index 100% rename from icons/mob/cargorillia.dmi rename to icons/mob/simple/cargorillia.dmi diff --git a/icons/mob/carp.dmi b/icons/mob/simple/carp.dmi similarity index 100% rename from icons/mob/carp.dmi rename to icons/mob/simple/carp.dmi diff --git a/icons/mob/clown_mobs.dmi b/icons/mob/simple/clown_mobs.dmi similarity index 100% rename from icons/mob/clown_mobs.dmi rename to icons/mob/simple/clown_mobs.dmi diff --git a/icons/mob/corgi_back.dmi b/icons/mob/simple/corgi_back.dmi similarity index 100% rename from icons/mob/corgi_back.dmi rename to icons/mob/simple/corgi_back.dmi diff --git a/icons/mob/corgi_head.dmi b/icons/mob/simple/corgi_head.dmi similarity index 100% rename from icons/mob/corgi_head.dmi rename to icons/mob/simple/corgi_head.dmi diff --git a/icons/mob/cows.dmi b/icons/mob/simple/cows.dmi similarity index 100% rename from icons/mob/cows.dmi rename to icons/mob/simple/cows.dmi diff --git a/icons/mob/gondolas.dmi b/icons/mob/simple/gondolas.dmi similarity index 100% rename from icons/mob/gondolas.dmi rename to icons/mob/simple/gondolas.dmi diff --git a/icons/mob/gorilla.dmi b/icons/mob/simple/gorilla.dmi similarity index 100% rename from icons/mob/gorilla.dmi rename to icons/mob/simple/gorilla.dmi diff --git a/icons/mob/hivebot.dmi b/icons/mob/simple/hivebot.dmi similarity index 100% rename from icons/mob/hivebot.dmi rename to icons/mob/simple/hivebot.dmi diff --git a/icons/mob/icemoon/64x64megafauna.dmi b/icons/mob/simple/icemoon/64x64megafauna.dmi similarity index 100% rename from icons/mob/icemoon/64x64megafauna.dmi rename to icons/mob/simple/icemoon/64x64megafauna.dmi diff --git a/icons/mob/icemoon/icemoon_monsters.dmi b/icons/mob/simple/icemoon/icemoon_monsters.dmi similarity index 100% rename from icons/mob/icemoon/icemoon_monsters.dmi rename to icons/mob/simple/icemoon/icemoon_monsters.dmi diff --git a/icons/mob/jungle/arachnid.dmi b/icons/mob/simple/jungle/arachnid.dmi similarity index 100% rename from icons/mob/jungle/arachnid.dmi rename to icons/mob/simple/jungle/arachnid.dmi diff --git a/icons/mob/jungle/leaper.dmi b/icons/mob/simple/jungle/leaper.dmi similarity index 100% rename from icons/mob/jungle/leaper.dmi rename to icons/mob/simple/jungle/leaper.dmi diff --git a/icons/mob/jungle/mook.dmi b/icons/mob/simple/jungle/mook.dmi similarity index 100% rename from icons/mob/jungle/mook.dmi rename to icons/mob/simple/jungle/mook.dmi diff --git a/icons/mob/jungle/seedling.dmi b/icons/mob/simple/jungle/seedling.dmi similarity index 100% rename from icons/mob/jungle/seedling.dmi rename to icons/mob/simple/jungle/seedling.dmi diff --git a/icons/mob/lavaland/64x64megafauna.dmi b/icons/mob/simple/lavaland/64x64megafauna.dmi similarity index 100% rename from icons/mob/lavaland/64x64megafauna.dmi rename to icons/mob/simple/lavaland/64x64megafauna.dmi diff --git a/icons/mob/lavaland/96x96megafauna.dmi b/icons/mob/simple/lavaland/96x96megafauna.dmi similarity index 100% rename from icons/mob/lavaland/96x96megafauna.dmi rename to icons/mob/simple/lavaland/96x96megafauna.dmi diff --git a/icons/mob/lavaland/bileworm.dmi b/icons/mob/simple/lavaland/bileworm.dmi similarity index 100% rename from icons/mob/lavaland/bileworm.dmi rename to icons/mob/simple/lavaland/bileworm.dmi diff --git a/icons/mob/brimdemon.dmi b/icons/mob/simple/lavaland/brimdemon.dmi similarity index 100% rename from icons/mob/brimdemon.dmi rename to icons/mob/simple/lavaland/brimdemon.dmi diff --git a/icons/mob/lavaland/hierophant_new.dmi b/icons/mob/simple/lavaland/hierophant_new.dmi similarity index 100% rename from icons/mob/lavaland/hierophant_new.dmi rename to icons/mob/simple/lavaland/hierophant_new.dmi diff --git a/icons/mob/lavaland/lavaland_elites.dmi b/icons/mob/simple/lavaland/lavaland_elites.dmi similarity index 100% rename from icons/mob/lavaland/lavaland_elites.dmi rename to icons/mob/simple/lavaland/lavaland_elites.dmi diff --git a/icons/mob/lavaland/lavaland_monsters.dmi b/icons/mob/simple/lavaland/lavaland_monsters.dmi similarity index 100% rename from icons/mob/lavaland/lavaland_monsters.dmi rename to icons/mob/simple/lavaland/lavaland_monsters.dmi diff --git a/icons/mob/nest.dmi b/icons/mob/simple/lavaland/nest.dmi similarity index 100% rename from icons/mob/nest.dmi rename to icons/mob/simple/lavaland/nest.dmi diff --git a/icons/mob/lavaland/watcher.dmi b/icons/mob/simple/lavaland/watcher.dmi similarity index 100% rename from icons/mob/lavaland/watcher.dmi rename to icons/mob/simple/lavaland/watcher.dmi diff --git a/icons/mob/mob.dmi b/icons/mob/simple/mob.dmi similarity index 100% rename from icons/mob/mob.dmi rename to icons/mob/simple/mob.dmi diff --git a/icons/mob/penguins.dmi b/icons/mob/simple/penguins.dmi similarity index 100% rename from icons/mob/penguins.dmi rename to icons/mob/simple/penguins.dmi diff --git a/icons/mob/pets.dmi b/icons/mob/simple/pets.dmi similarity index 100% rename from icons/mob/pets.dmi rename to icons/mob/simple/pets.dmi diff --git a/icons/mob/rabbit.dmi b/icons/mob/simple/rabbit.dmi similarity index 100% rename from icons/mob/rabbit.dmi rename to icons/mob/simple/rabbit.dmi diff --git a/icons/mob/sheep.dmi b/icons/mob/simple/sheep.dmi similarity index 100% rename from icons/mob/sheep.dmi rename to icons/mob/simple/sheep.dmi diff --git a/icons/mob/simple_human.dmi b/icons/mob/simple/simple_human.dmi similarity index 100% rename from icons/mob/simple_human.dmi rename to icons/mob/simple/simple_human.dmi diff --git a/icons/mob/slimes.dmi b/icons/mob/simple/slimes.dmi similarity index 100% rename from icons/mob/slimes.dmi rename to icons/mob/simple/slimes.dmi diff --git a/icons/mob/smspider.dmi b/icons/mob/simple/smspider.dmi similarity index 100% rename from icons/mob/smspider.dmi rename to icons/mob/simple/smspider.dmi diff --git a/icons/mob/tourists.dmi b/icons/mob/simple/tourists.dmi similarity index 100% rename from icons/mob/tourists.dmi rename to icons/mob/simple/tourists.dmi diff --git a/icons/mob/species/alien/bodyparts.dmi b/icons/mob/species/alien/bodyparts.dmi new file mode 100644 index 00000000000..6fc37963310 Binary files /dev/null and b/icons/mob/species/alien/bodyparts.dmi differ diff --git a/icons/mob/hair_gradients.dmi b/icons/mob/species/hair_gradients.dmi similarity index 100% rename from icons/mob/hair_gradients.dmi rename to icons/mob/species/hair_gradients.dmi diff --git a/icons/mob/human_parts.dmi b/icons/mob/species/human/bodyparts.dmi similarity index 100% rename from icons/mob/human_parts.dmi rename to icons/mob/species/human/bodyparts.dmi diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/species/human/bodyparts_greyscale.dmi similarity index 100% rename from icons/mob/human_parts_greyscale.dmi rename to icons/mob/species/human/bodyparts_greyscale.dmi diff --git a/icons/mob/human.dmi b/icons/mob/species/human/human.dmi similarity index 100% rename from icons/mob/human.dmi rename to icons/mob/species/human/human.dmi diff --git a/icons/mob/human_face.dmi b/icons/mob/species/human/human_face.dmi similarity index 100% rename from icons/mob/human_face.dmi rename to icons/mob/species/human/human_face.dmi diff --git a/icons/mob/species/monkey/bodyparts.dmi b/icons/mob/species/monkey/bodyparts.dmi new file mode 100644 index 00000000000..7b10838c313 Binary files /dev/null and b/icons/mob/species/monkey/bodyparts.dmi differ diff --git a/icons/mob/moth_antennae.dmi b/icons/mob/species/moth/moth_antennae.dmi similarity index 100% rename from icons/mob/moth_antennae.dmi rename to icons/mob/species/moth/moth_antennae.dmi diff --git a/icons/mob/moth_markings.dmi b/icons/mob/species/moth/moth_markings.dmi similarity index 100% rename from icons/mob/moth_markings.dmi rename to icons/mob/species/moth/moth_markings.dmi diff --git a/icons/mob/moth_wings.dmi b/icons/mob/species/moth/moth_wings.dmi similarity index 100% rename from icons/mob/moth_wings.dmi rename to icons/mob/species/moth/moth_wings.dmi diff --git a/icons/mob/mutant_bodyparts.dmi b/icons/mob/species/mutant_bodyparts.dmi similarity index 100% rename from icons/mob/mutant_bodyparts.dmi rename to icons/mob/species/mutant_bodyparts.dmi diff --git a/icons/mob/podperson_hair.dmi b/icons/mob/species/podperson_hair.dmi similarity index 100% rename from icons/mob/podperson_hair.dmi rename to icons/mob/species/podperson_hair.dmi 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 643ee9b0b56..a5d68ca172f 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 @@ -20,7 +20,7 @@ layer = "BEHIND" final_icon = icon(sprite_accessory.icon, "m_[key]_[sprite_accessory.icon_state]_[layer]", direction) else - final_icon = icon('icons/mob/human_parts_greyscale.dmi', "lizard_chest_m", direction) + final_icon = icon('icons/mob/species/human/bodyparts_greyscale.dmi', "lizard_chest_m", direction) final_icon.Blend(COLOR_VIBRANT_LIME) diff --git a/modular_skyrat/master_files/code/modules/mob/dead/new_player/preferences_setup.dm b/modular_skyrat/master_files/code/modules/mob/dead/new_player/preferences_setup.dm index c98a80bde6d..adf4227c04e 100644 --- a/modular_skyrat/master_files/code/modules/mob/dead/new_player/preferences_setup.dm +++ b/modular_skyrat/master_files/code/modules/mob/dead/new_player/preferences_setup.dm @@ -11,9 +11,9 @@ if(preview_job) // SKYRAT EDIT CHANGE // Silicons only need a very basic preview since there is no customization for them. if (istype(preview_job, /datum/job/ai)) - return image('icons/mob/ai.dmi', icon_state = resolve_ai_icon(read_preference(/datum/preference/choiced/ai_core_display)), dir = SOUTH) + return image('icons/mob/silicon/ai.dmi', icon_state = resolve_ai_icon(read_preference(/datum/preference/choiced/ai_core_display)), dir = SOUTH) if (istype(preview_job, /datum/job/cyborg)) - return image('icons/mob/robots.dmi', icon_state = "robot", dir = SOUTH) + return image('icons/mob/silicon/robots.dmi', icon_state = "robot", dir = SOUTH) mannequin.job = preview_job.title mannequin.equip_outfit_and_loadout(preview_job.outfit, src, TRUE) if(PREVIEW_PREF_LOADOUT) diff --git a/modular_skyrat/modules/altborgs/code/robot_model.dm b/modular_skyrat/modules/altborgs/code/robot_model.dm index 6dc5ae7d344..e8ee3f89754 100644 --- a/modular_skyrat/modules/altborgs/code/robot_model.dm +++ b/modular_skyrat/modules/altborgs/code/robot_model.dm @@ -302,9 +302,9 @@ hat_offset = INFINITY canDispose = TRUE borg_skins = list( - "Saboteur" = list(SKIN_ICON_STATE = "synd_engi", SKIN_ICON = 'icons/mob/robots.dmi'), - "Medical" = list(SKIN_ICON_STATE = "synd_medical", SKIN_ICON = 'icons/mob/robots.dmi'), - "Assault" = list(SKIN_ICON_STATE = "synd_sec", SKIN_ICON = 'icons/mob/robots.dmi'), + "Saboteur" = list(SKIN_ICON_STATE = "synd_engi", SKIN_ICON = 'icons/mob/silicon/robots.dmi'), + "Medical" = list(SKIN_ICON_STATE = "synd_medical", SKIN_ICON = 'icons/mob/silicon/robots.dmi'), + "Assault" = list(SKIN_ICON_STATE = "synd_sec", SKIN_ICON = 'icons/mob/silicon/robots.dmi'), "Meka" = list(SKIN_ICON_STATE = "mekasyndi", SKIN_ICON = CYBORG_ICON_SYNDIE_TALL, SKIN_FEATURES = list(R_TRAIT_UNIQUEWRECK, R_TRAIT_UNIQUETIP, R_TRAIT_TALL), SKIN_HAT_OFFSET = 15), "Heavy" = list(SKIN_ICON_STATE = "syndieheavy", SKIN_ICON = CYBORG_ICON_SYNDIE), "Miss M" = list(SKIN_ICON_STATE = "missm_syndie", SKIN_ICON = CYBORG_ICON_SYNDIE), 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 87b39e14b82..61704e4ed6b 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 @@ -75,7 +75,7 @@ /datum/sprite_accessory/tails/monkey/default name = "Monkey" icon_state = "monkey" - icon = 'icons/mob/mutant_bodyparts.dmi' + icon = 'icons/mob/species/mutant_bodyparts.dmi' recommended_species = list(SPECIES_HUMAN, SPECIES_SYNTHHUMAN, SPECIES_FELINE, SPECIES_SYNTHMAMMAL, SPECIES_MAMMAL, SPECIES_MONKEY, SPECIES_GHOUL) color_src = FALSE organ_type = /obj/item/organ/external/tail/monkey @@ -166,7 +166,7 @@ /datum/sprite_accessory/tails/mammal/wagging/bee name = "Bee" icon_state = "bee" - + /datum/sprite_accessory/tails/mammal/wagging/queenbee name = "Queen Bee" icon_state = "queenbee" @@ -264,7 +264,7 @@ /datum/sprite_accessory/tails/mammal/wagging/insect name = "Insect" icon_state = "insect" - + /datum/sprite_accessory/tails/mammal/wagging/queeninsect name = "Queen Insect" icon_state = "queeninsect" diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm index e99e206ae79..76e5d5ebd26 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm @@ -337,7 +337,7 @@ GLOBAL_LIST_EMPTY(customizable_races) if(HD && !(HAS_TRAIT(species_human, TRAIT_HUSK))) // lipstick if(species_human.lip_style && (LIPS in species_traits)) - var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/human_face.dmi', "lips_[species_human.lip_style]", -BODY_LAYER) + var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/species/human/human_face.dmi', "lips_[species_human.lip_style]", -BODY_LAYER) lip_overlay.color = species_human.lip_color if(OFFSET_FACE in species_human.dna.species.offset_features) lip_overlay.pixel_x += species_human.dna.species.offset_features[OFFSET_FACE][1] @@ -360,7 +360,7 @@ GLOBAL_LIST_EMPTY(customizable_races) add_pixel_y = species_human.dna.species.offset_features[OFFSET_FACE][2] if(!eye_organ) - no_eyeslay = mutable_appearance('icons/mob/human_face.dmi', "eyes_missing", -BODY_LAYER) + no_eyeslay = mutable_appearance('icons/mob/species/human/human_face.dmi', "eyes_missing", -BODY_LAYER) no_eyeslay.pixel_x += add_pixel_x no_eyeslay.pixel_y += add_pixel_y standing += no_eyeslay @@ -378,7 +378,7 @@ GLOBAL_LIST_EMPTY(customizable_races) // blush if (HAS_TRAIT(species_human, TRAIT_BLUSHING)) // Caused by either the *blush emote or the "drunk" mood event - var/mutable_appearance/blush_overlay = mutable_appearance('icons/mob/human_face.dmi', "blush", -BODY_ADJ_LAYER) //should appear behind the eyes + var/mutable_appearance/blush_overlay = mutable_appearance('icons/mob/species/human/human_face.dmi', "blush", -BODY_ADJ_LAYER) //should appear behind the eyes blush_overlay.color = COLOR_BLUSH_PINK standing += blush_overlay diff --git a/modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm b/modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm index ec6549f1a7e..1e6d15e8154 100644 --- a/modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm +++ b/modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm @@ -77,7 +77,7 @@ id = /obj/item/card/id/advanced/ghost_cafe /datum/action/toggle_dead_chat_mob - icon_icon = 'icons/mob/mob.dmi' + icon_icon = 'icons/mob/simple/mob.dmi' button_icon_state = "ghost" name = "Toggle deadchat" desc = "Turn off or on your ability to hear ghosts." diff --git a/modular_skyrat/modules/shapeshifting_module/code/borg_shapeshifter.dm b/modular_skyrat/modules/shapeshifting_module/code/borg_shapeshifter.dm index 1224f7059b4..3f8c0e18ba5 100644 --- a/modular_skyrat/modules/shapeshifting_module/code/borg_shapeshifter.dm +++ b/modular_skyrat/modules/shapeshifting_module/code/borg_shapeshifter.dm @@ -86,17 +86,17 @@ to_chat(user, span_notice("\the [src] is recharging.")) return var/static/list/model_icons = sort_list(list( - "Standard" = image(icon = 'icons/mob/robots.dmi', icon_state = "robot"), - "Medical" = image(icon = 'icons/mob/robots.dmi', icon_state = "medical"), + "Standard" = image(icon = 'icons/mob/silicon/robots.dmi', icon_state = "robot"), + "Medical" = image(icon = 'icons/mob/silicon/robots.dmi', icon_state = "medical"), "Cargo" = image(icon = CYBORG_ICON_CARGO, icon_state = "cargoborg"), - "Engineer" = image(icon = 'icons/mob/robots.dmi', icon_state = "engineer"), - "Security" = image(icon = 'icons/mob/robots.dmi', icon_state = "sec"), - "Service" = image(icon = 'icons/mob/robots.dmi', icon_state = "service_f"), - "Janitor" = image(icon = 'icons/mob/robots.dmi', icon_state = "janitor"), - "Miner" = image(icon = 'icons/mob/robots.dmi', icon_state = "miner"), - "Peacekeeper" = image(icon = 'icons/mob/robots.dmi', icon_state = "peace"), - "Clown" = image(icon = 'icons/mob/robots.dmi', icon_state = "clown"), - "Syndicate" = image(icon = 'icons/mob/robots.dmi', icon_state = "synd_sec"), + "Engineer" = image(icon = 'icons/mob/silicon/robots.dmi', icon_state = "engineer"), + "Security" = image(icon = 'icons/mob/silicon/robots.dmi', icon_state = "sec"), + "Service" = image(icon = 'icons/mob/silicon/robots.dmi', icon_state = "service_f"), + "Janitor" = image(icon = 'icons/mob/silicon/robots.dmi', icon_state = "janitor"), + "Miner" = image(icon = 'icons/mob/silicon/robots.dmi', icon_state = "miner"), + "Peacekeeper" = image(icon = 'icons/mob/silicon/robots.dmi', icon_state = "peace"), + "Clown" = image(icon = 'icons/mob/silicon/robots.dmi', icon_state = "clown"), + "Syndicate" = image(icon = 'icons/mob/silicon/robots.dmi', icon_state = "synd_sec"), "Spider Clan" = image(icon = CYBORG_ICON_NINJA, icon_state = "ninja_engi") )) var/model_selection = show_radial_menu(user, user, model_icons, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 42, require_near = TRUE) @@ -170,7 +170,7 @@ var/list/reskin_icons = list() for(var/skin in disguise_model.borg_skins) var/list/details = disguise_model.borg_skins[skin] - var/image/reskin = image(icon = details[SKIN_ICON] || 'icons/mob/robots.dmi', icon_state = details[SKIN_ICON_STATE]) + var/image/reskin = image(icon = details[SKIN_ICON] || 'icons/mob/silicon/robots.dmi', icon_state = details[SKIN_ICON_STATE]) if (!isnull(details[SKIN_FEATURES])) if (R_TRAIT_WIDE in details[SKIN_FEATURES]) reskin.pixel_x -= 16