diff --git a/code/modules/mob/living/simple_animal/aliens/alien.dm b/code/modules/mob/living/simple_animal/aliens/alien.dm index f756b31798..dbe990e366 100644 --- a/code/modules/mob/living/simple_animal/aliens/alien.dm +++ b/code/modules/mob/living/simple_animal/aliens/alien.dm @@ -66,6 +66,19 @@ projectiletype = /obj/item/projectile/energy/neurotoxin/toxic projectilesound = 'sound/weapons/pierce.ogg' +/mob/living/simple_animal/hostile/alien/sentinel/praetorian + name = "alien praetorian" + icon = 'icons/mob/64x64.dmi' + icon_state = "prat_s" + icon_living = "prat_s" + icon_dead = "prat_dead" + move_to_delay = 5 + maxHealth = 200 + health = 200 + + pixel_x = -16 + old_x = -16 + meat_amount = 5 /mob/living/simple_animal/hostile/alien/queen name = "alien queen" @@ -83,15 +96,36 @@ rapid = 1 status_flags = 0 -/mob/living/simple_animal/hostile/alien/queen/large +/mob/living/simple_animal/hostile/alien/queen/empress name = "alien empress" - icon = 'icons/mob/alienqueen.dmi' + icon = 'icons/mob/64x64.dmi' icon_state = "queen_s" icon_living = "queen_s" icon_dead = "queen_dead" move_to_delay = 4 maxHealth = 400 health = 400 + meat_amount = 5 + speed = 1 + + pixel_x = -16 + old_x = -16 + +/mob/living/simple_animal/hostile/alien/queen/empress/mother + name = "alien mother" + icon = 'icons/mob/96x96.dmi' + icon_state = "empress_s" + icon_living = "empress_s" + icon_dead = "empress_dead" + maxHealth = 600 + health = 600 + meat_amount = 10 + melee_damage_lower = 15 + melee_damage_upper = 25 + speed = 2 + + pixel_x = -32 + old_x = -32 /mob/living/simple_animal/hostile/alien/death() ..() diff --git a/code/modules/mob/living/simple_animal/animals/carp.dm b/code/modules/mob/living/simple_animal/animals/carp.dm index ff626e5eab..9126642197 100644 --- a/code/modules/mob/living/simple_animal/animals/carp.dm +++ b/code/modules/mob/living/simple_animal/animals/carp.dm @@ -36,6 +36,43 @@ meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat +/mob/living/simple_animal/hostile/carp/large + name = "elder carp" + desc = "An older, more matured carp. Few survive to this age due to their aggressiveness." + icon = 'icons/mob/64x32.dmi' + icon_state = "shark" + icon_living = "shark" + icon_dead = "shark_dead" + turns_per_move = 2 + move_to_delay = 2 + mob_size = MOB_LARGE + + pixel_x = -16 + old_x = -16 + + health = 50 + maxHealth = 50 + + +/mob/living/simple_animal/hostile/carp/large/huge + name = "great white carp" + desc = "A very rare breed of carp- and a very aggressive one." + icon = 'icons/mob/64x64.dmi' + icon_dead = "megacarp_dead" + icon_living = "megacarp" + icon_state = "megacarp" + maxHealth = 230 + health = 230 + attack_same = 1 + speed = 1 + + meat_amount = 10 + + melee_damage_lower = 15 + melee_damage_upper = 25 + old_y = -16 + pixel_y = -16 + /mob/living/simple_animal/hostile/carp/Process_Spacemove(var/check_drift = 0) return 1 //No drifting in space for space carp! //original comments do not steal @@ -50,4 +87,5 @@ if(istype(L)) if(prob(15)) L.Weaken(3) - L.visible_message("\the [src] knocks down \the [L]!") \ No newline at end of file + L.visible_message("\the [src] knocks down \the [L]!") + diff --git a/code/modules/mob/living/simple_animal/animals/giant_spider.dm b/code/modules/mob/living/simple_animal/animals/giant_spider.dm index a087d4429a..1ff5605946 100644 --- a/code/modules/mob/living/simple_animal/animals/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/animals/giant_spider.dm @@ -74,6 +74,27 @@ var/atom/cocoon_target var/egg_inject_chance = 5 +/mob/living/simple_animal/hostile/giant_spider/nurse/queen + desc = "Absolutely gigantic, this creature is horror itself." + icon = 'icons/mob/64x64.dmi' + icon_state = "spider_queen" + icon_living = "spider_queen" + icon_dead = "spider_queen_dead" + + maxHealth = 320 + health = 320 + + melee_damage_lower = 15 + melee_damage_upper = 25 + poison_per_bite = 10 + + egg_inject_chance = 10 + + pixel_x = -16 + pixel_y = -16 + old_x = -16 + old_y = -16 + //hunters have the most poison and move the fastest, so they can find prey /mob/living/simple_animal/hostile/giant_spider/hunter desc = "Furry and black, it makes you shudder to look at it. This one has sparkling purple eyes." diff --git a/icons/mob/64x32.dmi b/icons/mob/64x32.dmi new file mode 100644 index 0000000000..615fd87a01 Binary files /dev/null and b/icons/mob/64x32.dmi differ diff --git a/icons/mob/64x64.dmi b/icons/mob/64x64.dmi new file mode 100644 index 0000000000..a829ee2c6f Binary files /dev/null and b/icons/mob/64x64.dmi differ diff --git a/icons/mob/96x96.dmi b/icons/mob/96x96.dmi new file mode 100644 index 0000000000..7368d30bb1 Binary files /dev/null and b/icons/mob/96x96.dmi differ diff --git a/icons/mob/alienqueen.dmi b/icons/mob/alienqueen.dmi deleted file mode 100644 index 1562152023..0000000000 Binary files a/icons/mob/alienqueen.dmi and /dev/null differ