cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 17:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] [IDB IGNORE] [MDB IGNORE] Makes the icons/mob folder sane [MDB IGNORE] (#16030)

Browse Source 
* [IDB IGNORE] [MDB IGNORE] Makes the icons/mob folder sane

* fix map merges

* icon paths and merge conflicts

Co-authored-by: skylord-a52 <skylord-a52@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
This commit is contained in:
SkyratBot
2022-09-25 02:10:28 +02:00
committed by GitHub
parent e1b1166239
commit d27cd97f74
302 changed files with 489 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
_maps/map_files/CTF/limbo.dmm
View File

@@ -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" = (

8
_maps/map_files/IceBoxStation/IceBoxStation.dmm
View File

@@ -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)

8
_maps/map_files/Mafia/mafia_spiderclan.dmm
View File

@@ -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" = (

14
_maps/map_files/generic/CentCom.dmm
View File

@@ -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" = (

9
_maps/skyrat/xenoarch_base.dmm
View File

@@ -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,

2
code/__DEFINES/mobs.dm
View File

@@ -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"

6
code/_globalvars/lists/mobs.dm
View File

@@ -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)

2
code/_onclick/hud/screen_objects.dm
View File

@@ -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

2
code/datums/actions/mobs/lava_swoop.dm
View File

@@ -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

10
code/datums/actions/mobs/small_sprite.dm
View File

@@ -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)

2
code/datums/ai/dog/dog_controller.dm
View File

@@ -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)

8
code/datums/brain_damage/imaginary_friend.dm
View File

@@ -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")

2
code/datums/brain_damage/magic.dm
View File

@@ -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"

2
code/datums/brain_damage/special.dm
View File

@@ -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

2
code/datums/components/lockon_aiming.dm
View File

@@ -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

4
code/datums/dog_fashion.dm
View File

@@ -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"

2
code/datums/greyscale/config_types/greyscale_configs.dm
View File

@@ -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

2
code/datums/holocall.dm
View File

@@ -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()

6
code/game/objects/effects/decals/cleanable/humans.dm
View File

@@ -305,11 +305,11 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache)
if(species == "unknown")
. += "Some <B>feet</B>."
else if(species == SPECIES_MONKEY)
. += "[icon2html('icons/mob/human.dmi', user, "monkey")] Some <B>monkey feet</B>."
. += "[icon2html('icons/mob/species/human/human.dmi', user, "monkey")] Some <B>monkey feet</B>."
else if(species == SPECIES_HUMAN)
. += "[icon2html('icons/mob/human_parts.dmi', user, "default_human_l_leg")] Some <B>human feet</B>."
. += "[icon2html('icons/mob/species/human/bodyparts.dmi', user, "default_human_l_leg")] Some <B>human feet</B>."
else
. += "[icon2html('icons/mob/human_parts.dmi', user, "[species]_l_leg")] Some <B>[species] feet</B>."
. += "[icon2html('icons/mob/species/human/bodyparts.dmi', user, "[species]_l_leg")] Some <B>[species] feet</B>."
/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

4
code/game/objects/effects/decals/cleanable/robots.dm
View File

@@ -3,7 +3,7 @@
/obj/effect/decal/cleanable/robot_debris
name = "robot debris"
desc = "It's a useless heap of junk... <i>or is it?</i>"
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

2
code/game/objects/effects/decals/remains.dm
View File

@@ -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

2
code/game/objects/effects/spawners/xeno_egg_delivery.dm
View File

@@ -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

20
code/game/objects/effects/temporary_visuals/miscellaneous.dm
View File

@@ -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

8
code/game/objects/items/cardboard_cutouts.dm
View File

@@ -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"

4
code/game/objects/items/dehy_carp.dm
View File

@@ -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

4
code/game/objects/items/hand_items.dm
View File

@@ -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'

2
code/game/objects/items/robot/items/generic.dm
View File

@@ -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"

2
code/game/objects/items/robot/items/storage.dm
View File

@@ -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

6
code/game/objects/items/stacks/sheets/leather.dm
View File

@@ -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

2
code/game/objects/structures/ai_core.dm
View File

@@ -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

2
code/game/objects/structures/aliens.dm
View File

@@ -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)

2
code/game/objects/structures/beds_chairs/alien_nest.dm
View File

@@ -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())

2
code/game/objects/structures/hivebot.dm
View File

@@ -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

4
code/game/objects/structures/icemoon/cave_entrance.dm
View File

@@ -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

4
code/game/objects/structures/lavaland/necropolis_tendril.dm
View File

@@ -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

19
code/game/objects/structures/showcase.dm
View File

@@ -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.

6
code/game/objects/structures/spawner.dm
View File

@@ -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")

8
code/modules/admin/verbs/mapping.dm
View File

@@ -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)

2
code/modules/antagonists/abductor/machinery/camera.dm
View File

@@ -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

8
code/modules/antagonists/blob/blob.dm
View File

@@ -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)

6
code/modules/antagonists/blob/blob_mobs.dm
View File

@@ -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

4
code/modules/antagonists/blob/overmind.dm
View File

@@ -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

2
code/modules/antagonists/blob/powers.dm
View File

@@ -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)]")

2
code/modules/antagonists/blob/structures/_blob.dm
View File

@@ -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

6
code/modules/antagonists/blob/structures/core.dm
View File

@@ -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()
. = ..()

2
code/modules/antagonists/blob/structures/factory.dm
View File

@@ -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

6
code/modules/antagonists/blob/structures/node.dm
View File

@@ -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)

2
code/modules/antagonists/blob/structures/resource.dm
View File

@@ -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

2
code/modules/antagonists/blob/structures/shield.dm
View File

@@ -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."

4
code/modules/antagonists/cult/runes.dm
View File

@@ -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)

2
code/modules/antagonists/disease/disease_mob.dm
View File

@@ -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

2
code/modules/antagonists/heretic/magic/ash_jaunt.dm
View File

@@ -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

2
code/modules/antagonists/heretic/mobs/maid_in_mirror.dm
View File

@@ -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")

2
code/modules/antagonists/malf_ai/datum_malf_ai.dm
View File

@@ -274,7 +274,7 @@
return result.Join("<br>")
/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)

2
code/modules/antagonists/morph/morph.dm
View File

@@ -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"

2
code/modules/antagonists/revenant/revenant.dm
View File

@@ -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"

2
code/modules/antagonists/revenant/revenant_antag.dm
View File

@@ -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"))

2
code/modules/antagonists/slaughter/slaughter.dm
View File

@@ -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

4
code/modules/antagonists/space_dragon/space_dragon.dm
View File

@@ -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)

2
code/modules/antagonists/xeno/xeno.dm
View File

@@ -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()

8
code/modules/art/statues.dm
View File

@@ -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."

4
code/modules/client/preferences/ai_core_display.dm
View File

@@ -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

16
code/modules/client/preferences/clothing.dm
View File

@@ -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()

2
code/modules/client/preferences/ghost.dm
View File

@@ -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

2
code/modules/client/preferences/species_features/basic.dm
View File

@@ -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)

2
code/modules/client/preferences/species_features/ethereal.dm
View File

@@ -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)

6
code/modules/client/preferences/species_features/lizard.dm
View File

@@ -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",
)

10
code/modules/client/preferences/species_features/moth.dm
View File

@@ -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)

2
code/modules/client/preferences/species_features/pod.dm
View File

@@ -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]

2
code/modules/clothing/head/wig.dm
View File

@@ -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"

4
code/modules/clothing/suits/costume.dm
View File

@@ -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

6
code/modules/food_and_drinks/restaurant/customers/_customer.dm
View File

@@ -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

2
code/modules/hallucination/_hallucination.dm
View File

@@ -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

2
code/modules/hallucination/chat.dm
View File

@@ -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)

2
code/modules/hallucination/fire.dm
View File

@@ -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!"))

10
code/modules/hallucination/hostile_mob.dm
View File

@@ -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

6
code/modules/hallucination/husk.dm
View File

@@ -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

26
code/modules/hallucination/polymorph.dm
View File

@@ -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)

2
code/modules/hallucination/shock.dm
View File

@@ -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)

2
code/modules/holodeck/mobs.dm
View File

@@ -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"

2
code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm
View File

@@ -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

2
code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm
View File

@@ -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.

2
code/modules/mining/minebot.dm
View File

@@ -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

2
code/modules/mining/voucher_sets.dm
View File

@@ -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,

4
code/modules/mob/dead/new_player/preferences_setup.dm
View File

@@ -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)

32
code/modules/mob/dead/new_player/sprite_accessories.dm
View File

@@ -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

2
code/modules/mob/dead/observer/observer.dm
View File

@@ -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

2
code/modules/mob/living/basic/basic.dm
View File

@@ -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

2
code/modules/mob/living/basic/farm_animals/cow/_cow.dm
View File

@@ -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"

2
code/modules/mob/living/basic/farm_animals/sheep.dm
View File

@@ -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"

2
code/modules/mob/living/basic/lavaland/bileworm/_bileworm.dm
View File

@@ -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"

2
code/modules/mob/living/basic/lavaland/bileworm/bileworm_instrument.dm
View File

@@ -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"

4
code/modules/mob/living/basic/lavaland/bileworm/bileworm_loot.dm
View File

@@ -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

6
code/modules/mob/living/basic/vermin/mothroach.dm
View File

@@ -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

4
code/modules/mob/living/carbon/alien/alien.dm
View File

@@ -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

2
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
View File

@@ -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

4
code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm
View File

@@ -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)

6
code/modules/mob/living/carbon/alien/humanoid/queen.dm
View File

@@ -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)
. = ..()

6
code/modules/mob/living/carbon/alien/special/alien_embryo.dm
View File

@@ -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
/*----------------------------------------

2
code/modules/mob/living/carbon/alien/special/facehugger.dm
View File

@@ -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"

Some files were not shown because too many files have changed in this diff Show More