diff --git a/code/datums/actions/mobs/lava_swoop.dm b/code/datums/actions/mobs/lava_swoop.dm index c309686755a..618dcc10ff0 100644 --- a/code/datums/actions/mobs/lava_swoop.dm +++ b/code/datums/actions/mobs/lava_swoop.dm @@ -201,11 +201,11 @@ duration = 10 /obj/effect/temp_visual/dragon_flight - icon = 'icons/mob/simple/lavaland/64x64megafauna.dmi' + icon = 'icons/mob/simple/lavaland/96x96megafauna.dmi' icon_state = "dragon" layer = ABOVE_ALL_MOB_LAYER plane = GAME_PLANE_UPPER_FOV_HIDDEN - pixel_x = -16 + pixel_x = -32 duration = 10 randomdir = FALSE @@ -219,7 +219,7 @@ else animate(src, pixel_x = SWOOP_HEIGHT*0.1, pixel_z = SWOOP_HEIGHT*0.15, time = 3, easing = BOUNCE_EASING) sleep(0.3 SECONDS) - icon_state = "swoop" + icon_state = "dragon_swoop" if(negative) animate(src, pixel_x = -SWOOP_HEIGHT, pixel_z = SWOOP_HEIGHT, time = 7) else diff --git a/code/modules/antagonists/sentient_creature/sentient_creature.dm b/code/modules/antagonists/sentient_creature/sentient_creature.dm index fd168360d65..4b68a288be1 100644 --- a/code/modules/antagonists/sentient_creature/sentient_creature.dm +++ b/code/modules/antagonists/sentient_creature/sentient_creature.dm @@ -8,9 +8,9 @@ /datum/antagonist/sentient_creature/get_preview_icon() var/icon/final_icon = icon('icons/mob/simple/pets.dmi', "corgi") - var/icon/broodmother = icon('icons/mob/simple/lavaland/lavaland_elites.dmi', "broodmother") - broodmother.Blend(rgb(128, 128, 128, 128), ICON_MULTIPLY) - final_icon.Blend(broodmother, ICON_UNDERLAY, -world.icon_size / 4, 0) + var/icon/pandora = icon('icons/mob/simple/lavaland/lavaland_elites.dmi', "pandora") + pandora.Blend(rgb(128, 128, 128, 128), ICON_MULTIPLY) + final_icon.Blend(pandora, ICON_UNDERLAY, -world.icon_size / 4, 0) var/icon/rat = icon('icons/mob/simple/animal.dmi', "regalrat") rat.Blend(rgb(128, 128, 128, 128), ICON_MULTIPLY) diff --git a/code/modules/art/statues.dm b/code/modules/art/statues.dm index ee50d822ebb..d9023840579 100644 --- a/code/modules/art/statues.dm +++ b/code/modules/art/statues.dm @@ -255,8 +255,10 @@ ///////////Goliath////////////////////////////////////////////////// /obj/structure/statue/goliath desc = "A lifelike statue of a horrifying monster." - icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters_wide.dmi' icon_state = "goliath" + pixel_x = -12 + base_pixel_x = -12 name = "goliath" ///////////Other Stuff////////////////////////////////////////////// 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 f876a56a7d8..c3921d1cc69 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/simple/lavaland/64x64megafauna.dmi' + icon = 'icons/mob/simple/lavaland/96x96megafauna.dmi' icon_state = "dragon" icon_living = "dragon" icon_dead = "dragon_dead" @@ -56,8 +56,8 @@ speed = 5 move_to_delay = 5 ranged = TRUE - pixel_x = -16 - base_pixel_x = -16 + pixel_x = -32 + base_pixel_x = -32 maptext_height = 64 maptext_width = 64 crusher_loot = list(/obj/structure/closet/crate/necropolis/dragon/crusher) @@ -145,7 +145,7 @@ /mob/living/simple_animal/hostile/megafauna/dragon/proc/start_attack(mob/living/owner, datum/action/cooldown/activated) SIGNAL_HANDLER if(activated == lava_swoop) - icon_state = "shadow" + icon_state = "dragon_shadow" swooping = SWOOP_DAMAGEABLE /mob/living/simple_animal/hostile/megafauna/dragon/proc/swoop_invulnerability_started() 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 d44ab22efd5..3dde18f06b7 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 @@ -102,14 +102,14 @@ /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/simple/lavaland/watcher.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters_wide.dmi' icon_state = "watcher" icon_living = "watcher" icon_aggro = "watcher" icon_dead = "watcher_dead" health_doll_icon = "watcher" - pixel_x = -10 - base_pixel_x = -10 + pixel_x = -12 + base_pixel_x = -12 throw_message = "bounces harmlessly off of" melee_damage_lower = 15 melee_damage_upper = 15 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 77b5fed1471..3511a4c53eb 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/simple/lavaland/brimdemon.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' icon_state = "brimdemon" icon_living = "brimdemon" icon_dead = "brimdemon_dead" @@ -161,7 +161,7 @@ /obj/effect/brimbeam name = "brimbeam" - icon = 'icons/mob/simple/lavaland/brimdemon.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters.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/elites/goliath_broodmother.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm index 64d606ed3b6..5f482ecb693 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 @@ -20,11 +20,14 @@ name = "goliath broodmother" desc = "An example of sexual dimorphism, this female goliath looks much different than the males of her species. She is, however, just as dangerous, if not more." gender = FEMALE + icon = 'icons/mob/simple/lavaland/lavaland_elites_64.dmi' icon_state = "broodmother" icon_living = "broodmother" icon_aggro = "broodmother" icon_dead = "egg_sac" icon_gib = "syndicate_gib" + pixel_x = -16 + base_pixel_x = -16 health_doll_icon = "broodmother" maxHealth = 1000 health = 1000 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm index 0015b94004f..73a3ad983c9 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm @@ -19,11 +19,14 @@ /mob/living/simple_animal/hostile/asteroid/elite/herald name = "herald" desc = "A monstrous beast which fires deadly projectiles at threats and prey." + icon = 'icons/mob/simple/lavaland/lavaland_elites_64.dmi' icon_state = "herald" icon_living = "herald" icon_aggro = "herald" icon_dead = "herald_dying" icon_gib = "syndicate_gib" + pixel_x = -16 + base_pixel_x = -16 health_doll_icon = "herald" maxHealth = 1000 health = 1000 @@ -199,6 +202,8 @@ maxHealth = 60 icon_state = "herald_mirror" icon_aggro = "herald_mirror" + pixel_x = -16 + base_pixel_x = -16 death_message = "shatters violently!" death_sound = 'sound/effects/glassbr1.ogg' del_on_death = TRUE 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 6df91804e53..f06c87363ce 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,12 +2,14 @@ /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/simple/lavaland/lavaland_monsters.dmi' - icon_state = "Goldgrub" - icon_living = "Goldgrub" - icon_aggro = "Goldgrub_alert" - icon_dead = "Goldgrub_dead" + icon = 'icons/mob/simple/lavaland/lavaland_monsters_wide.dmi' + icon_state = "goldgrub" + icon_living = "goldgrub" + icon_aggro = "goldgrub_alert" + icon_dead = "goldgrub_dead" icon_gib = "syndicate_gib" + pixel_x = -12 + base_pixel_x = -12 mob_biotypes = MOB_ORGANIC|MOB_BEAST vision_range = 2 aggro_vision_range = 9 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 3487d52bfbf..1bf01eed225 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,12 +2,14 @@ /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/simple/lavaland/lavaland_monsters.dmi' - icon_state = "Goliath" - icon_living = "Goliath" - icon_aggro = "Goliath_alert" - icon_dead = "Goliath_dead" + icon = 'icons/mob/simple/lavaland/lavaland_monsters_wide.dmi' + icon_state = "ancient_goliath" + icon_living = "ancient_goliath" + icon_aggro = "ancient_goliath_alert" + icon_dead = "ancient_goliath_dead" icon_gib = "syndicate_gib" + pixel_x = -12 + base_pixel_x = -12 mob_biotypes = MOB_ORGANIC|MOB_BEAST mouse_opacity = MOUSE_OPACITY_ICON move_to_delay = 40 @@ -34,7 +36,7 @@ pull_force = MOVE_FORCE_VERY_STRONG gender = MALE//lavaland elite goliath says that i'''' 't s female and i ''t s stronger because of sexual dimorphism, so normal goliaths should be male var/pre_attack = 0 - var/pre_attack_icon = "Goliath_preattack" + var/pre_attack_icon = "ancient_goliath_preattack" loot = list(/obj/item/stack/sheet/animalhide/goliath_hide) footstep_type = FOOTSTEP_MOB_HEAVY @@ -91,13 +93,13 @@ /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/simple/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters_wide.dmi' icon_state = "goliath" icon_living = "goliath" icon_aggro = "goliath" icon_dead = "goliath_dead" throw_message = "does nothing to the tough hide of the" - pre_attack_icon = "goliath2" + pre_attack_icon = "goliath_preattack" crusher_loot = /obj/item/crusher_trophy/goliath_tentacle butcher_results = list(/obj/item/food/meat/slab/goliath = 2, /obj/item/stack/sheet/bone = 2) guaranteed_butcher_results = list(/obj/item/stack/sheet/animalhide/goliath_hide = 1) @@ -139,14 +141,14 @@ /mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient name = "ancient goliath" desc = "Goliaths are biologically immortal, and rare specimens have survived for centuries. This one is clearly ancient, and its tentacles constantly churn the earth around it." - icon_state = "Goliath" - icon_living = "Goliath" - icon_aggro = "Goliath_alert" - icon_dead = "Goliath_dead" + icon_state = "ancient_goliath" + icon_living = "ancient_goliath" + icon_aggro = "ancient_goliath_alert" + icon_dead = "ancient_goliath_dead" maxHealth = 400 health = 400 speed = 4 - pre_attack_icon = "Goliath_preattack" + pre_attack_icon = "ancient_goliath_preattack" throw_message = "does nothing to the rocky hide of the" loot = list(/obj/item/stack/sheet/animalhide/goliath_hide) //A throwback to the asteroid days butcher_results = list(/obj/item/food/meat/slab/goliath = 2, /obj/item/stack/sheet/bone = 2) @@ -182,7 +184,7 @@ /obj/effect/temp_visual/goliath_tentacle name = "goliath tentacle" icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' - icon_state = "Goliath_tentacle_spawn" + icon_state = "goliath_tentacle_spawn" layer = BELOW_MOB_LAYER plane = GAME_PLANE var/mob/living/spawner diff --git a/code/modules/mob_spawn/corpses/nonhuman_corpses.dm b/code/modules/mob_spawn/corpses/nonhuman_corpses.dm index 6796bb011f8..2c80a3abdc4 100644 --- a/code/modules/mob_spawn/corpses/nonhuman_corpses.dm +++ b/code/modules/mob_spawn/corpses/nonhuman_corpses.dm @@ -41,8 +41,10 @@ ///dead goliath spawner /obj/effect/mob_spawn/corpse/goliath mob_type = /mob/living/simple_animal/hostile/asteroid/goliath/beast - icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi' + icon = 'icons/mob/simple/lavaland/lavaland_monsters_wide.dmi' icon_state = "goliath_dead_helper" + pixel_x = -12 + base_pixel_x = -12 /// Dead headcrab for changeling-themed ruins /obj/effect/mob_spawn/corpse/headcrab diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_sentiencepotionspawn.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_sentiencepotionspawn.png index 17dbac6cb51..02cdb1cb31a 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_sentiencepotionspawn.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_sentiencepotionspawn.png differ diff --git a/icons/mob/simple/lavaland/64x64megafauna.dmi b/icons/mob/simple/lavaland/64x64megafauna.dmi index 668bec73d9f..24d72d51463 100644 Binary files a/icons/mob/simple/lavaland/64x64megafauna.dmi and b/icons/mob/simple/lavaland/64x64megafauna.dmi differ diff --git a/icons/mob/simple/lavaland/96x96megafauna.dmi b/icons/mob/simple/lavaland/96x96megafauna.dmi index 5c0a1c6a4de..60a0b5dafc1 100644 Binary files a/icons/mob/simple/lavaland/96x96megafauna.dmi and b/icons/mob/simple/lavaland/96x96megafauna.dmi differ diff --git a/icons/mob/simple/lavaland/bileworm.dmi b/icons/mob/simple/lavaland/bileworm.dmi index e5b74f0241b..b8235ca77a1 100644 Binary files a/icons/mob/simple/lavaland/bileworm.dmi and b/icons/mob/simple/lavaland/bileworm.dmi differ diff --git a/icons/mob/simple/lavaland/brimdemon.dmi b/icons/mob/simple/lavaland/brimdemon.dmi deleted file mode 100644 index 8cf6dfa1689..00000000000 Binary files a/icons/mob/simple/lavaland/brimdemon.dmi and /dev/null differ diff --git a/icons/mob/simple/lavaland/hierophant_new.dmi b/icons/mob/simple/lavaland/hierophant_new.dmi index 84348700324..f7121709ce0 100644 Binary files a/icons/mob/simple/lavaland/hierophant_new.dmi and b/icons/mob/simple/lavaland/hierophant_new.dmi differ diff --git a/icons/mob/simple/lavaland/lavaland_elites.dmi b/icons/mob/simple/lavaland/lavaland_elites.dmi index b53c0383e63..86a10ae66fc 100644 Binary files a/icons/mob/simple/lavaland/lavaland_elites.dmi and b/icons/mob/simple/lavaland/lavaland_elites.dmi differ diff --git a/icons/mob/simple/lavaland/lavaland_elites_64.dmi b/icons/mob/simple/lavaland/lavaland_elites_64.dmi new file mode 100644 index 00000000000..fe22440cf97 Binary files /dev/null and b/icons/mob/simple/lavaland/lavaland_elites_64.dmi differ diff --git a/icons/mob/simple/lavaland/lavaland_monsters.dmi b/icons/mob/simple/lavaland/lavaland_monsters.dmi index cc2912201d0..4e074a70eea 100644 Binary files a/icons/mob/simple/lavaland/lavaland_monsters.dmi and b/icons/mob/simple/lavaland/lavaland_monsters.dmi differ diff --git a/icons/mob/simple/lavaland/lavaland_monsters_wide.dmi b/icons/mob/simple/lavaland/lavaland_monsters_wide.dmi new file mode 100644 index 00000000000..6142b5069d7 Binary files /dev/null and b/icons/mob/simple/lavaland/lavaland_monsters_wide.dmi differ diff --git a/icons/mob/simple/lavaland/watcher.dmi b/icons/mob/simple/lavaland/watcher.dmi deleted file mode 100644 index df4bbb61820..00000000000 Binary files a/icons/mob/simple/lavaland/watcher.dmi and /dev/null differ