From 2eac03ec08688a03a2893673900a09c65778ecb1 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sun, 11 Feb 2018 01:31:03 -0600 Subject: [PATCH] Adjusts certain simple mobs, adds some things (#4778) --- .../gamemodes/technomancer/spells/control.dm | 4 +- .../mob/living/simple_animal/aliens/alien.dm | 104 +----------------- .../simple_animal/animals/miscellaneous.dm | 19 ++++ .../animals/sif wildlife/diyaab.dm | 27 +++++ .../animals/sif wildlife/savik.dm | 32 ++++++ .../animals/sif wildlife/shantak.dm | 25 +++++ .../simple_animal/humanoids/syndicate.dm | 2 +- icons/jungle.dmi | Bin 72143 -> 72141 bytes polaris.dme | 4 + 9 files changed, 111 insertions(+), 106 deletions(-) create mode 100644 code/modules/mob/living/simple_animal/animals/miscellaneous.dm create mode 100644 code/modules/mob/living/simple_animal/animals/sif wildlife/diyaab.dm create mode 100644 code/modules/mob/living/simple_animal/animals/sif wildlife/savik.dm create mode 100644 code/modules/mob/living/simple_animal/animals/sif wildlife/shantak.dm diff --git a/code/game/gamemodes/technomancer/spells/control.dm b/code/game/gamemodes/technomancer/spells/control.dm index ebcf373baf..78c709040a 100644 --- a/code/game/gamemodes/technomancer/spells/control.dm +++ b/code/game/gamemodes/technomancer/spells/control.dm @@ -43,8 +43,8 @@ /mob/living/simple_animal/hostile/malf_drone, /mob/living/simple_animal/hostile/giant_spider, /mob/living/simple_animal/hostile/hivebot, - /mob/living/simple_animal/hostile/diyaab, //Doubt these will get used but might as well, - /mob/living/simple_animal/hostile/samak, + /mob/living/simple_animal/retaliate/diyaab, //Doubt these will get used but might as well, + /mob/living/simple_animal/hostile/savik, /mob/living/simple_animal/hostile/shantak ) diff --git a/code/modules/mob/living/simple_animal/aliens/alien.dm b/code/modules/mob/living/simple_animal/aliens/alien.dm index 3836a6abd2..62a3b5e767 100644 --- a/code/modules/mob/living/simple_animal/aliens/alien.dm +++ b/code/modules/mob/living/simple_animal/aliens/alien.dm @@ -137,106 +137,4 @@ /mob/living/simple_animal/hostile/alien/death() ..() visible_message("[src] lets out a waning guttural screech, green blood bubbling from its maw...") - playsound(src, 'sound/voice/hiss6.ogg', 100, 1) - -// Xenoarch aliens. -/mob/living/simple_animal/hostile/samak - name = "samak" - desc = "A fast, armoured predator accustomed to hiding and ambushing in cold terrain." - faction = "samak" - icon_state = "samak" - icon_living = "samak" - icon_dead = "samak_dead" - icon = 'icons/jungle.dmi' - - faction = "samak" - - maxHealth = 125 - health = 125 - speed = 2 - move_to_delay = 2 - - melee_damage_lower = 5 - melee_damage_upper = 15 - - attacktext = "mauled" - cold_damage_per_tick = 0 - - speak_chance = 5 - speak = list("Hruuugh!","Hrunnph") - emote_see = list("paws the ground","shakes its mane","stomps") - emote_hear = list("snuffles") - -/mob/living/simple_animal/hostile/diyaab - name = "diyaab" - desc = "A small pack animal. Although omnivorous, it will hunt meat on occasion." - faction = "diyaab" - icon_state = "diyaab" - icon_living = "diyaab" - icon_dead = "diyaab_dead" - icon = 'icons/jungle.dmi' - - faction = "diyaab" - cooperative = 1 - - maxHealth = 25 - health = 25 - speed = 1 - move_to_delay = 1 - - melee_damage_lower = 1 - melee_damage_upper = 8 - - attacktext = "gouged" - cold_damage_per_tick = 0 - - speak_chance = 5 - speak = list("Awrr?","Aowrl!","Worrl") - emote_see = list("sniffs the air cautiously","looks around") - emote_hear = list("snuffles") - -/mob/living/simple_animal/hostile/shantak - name = "shantak" - desc = "A piglike creature with a bright iridiscent mane that sparkles as though lit by an inner light. Don't be fooled by its beauty though." - faction = "shantak" - icon_state = "shantak" - icon_living = "shantak" - icon_dead = "shantak_dead" - icon = 'icons/jungle.dmi' - - faction = "shantak" - - maxHealth = 75 - health = 75 - speed = 1 - move_to_delay = 1 - - melee_damage_lower = 3 - melee_damage_upper = 12 - - attacktext = "gouged" - cold_damage_per_tick = 0 - - speak_chance = 5 - speak = list("Shuhn","Shrunnph?","Shunpf") - emote_see = list("scratches the ground","shakes out its mane","clinks gently as it moves") - -/mob/living/simple_animal/yithian - name = "yithian" - desc = "A friendly creature vaguely resembling an oversized snail without a shell." - icon_state = "yithian" - icon_living = "yithian" - icon_dead = "yithian_dead" - icon = 'icons/jungle.dmi' - - faction = "yithian" - -/mob/living/simple_animal/tindalos - name = "tindalos" - desc = "It looks like a large, flightless grasshopper." - icon_state = "tindalos" - icon_living = "tindalos" - icon_dead = "tindalos_dead" - icon = 'icons/jungle.dmi' - - faction = "tindalos" + playsound(src, 'sound/voice/hiss6.ogg', 100, 1) \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/animals/miscellaneous.dm b/code/modules/mob/living/simple_animal/animals/miscellaneous.dm new file mode 100644 index 0000000000..57fe09727b --- /dev/null +++ b/code/modules/mob/living/simple_animal/animals/miscellaneous.dm @@ -0,0 +1,19 @@ +/mob/living/simple_animal/yithian + name = "yithian" + desc = "A friendly creature vaguely resembling an oversized snail without a shell." + icon_state = "yithian" + icon_living = "yithian" + icon_dead = "yithian_dead" + icon = 'icons/jungle.dmi' + + faction = "yithian" + +/mob/living/simple_animal/tindalos + name = "tindalos" + desc = "It looks like a large, flightless grasshopper." + icon_state = "tindalos" + icon_living = "tindalos" + icon_dead = "tindalos_dead" + icon = 'icons/jungle.dmi' + + faction = "tindalos" \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/animals/sif wildlife/diyaab.dm b/code/modules/mob/living/simple_animal/animals/sif wildlife/diyaab.dm new file mode 100644 index 0000000000..5e21308410 --- /dev/null +++ b/code/modules/mob/living/simple_animal/animals/sif wildlife/diyaab.dm @@ -0,0 +1,27 @@ +/mob/living/simple_animal/retaliate/diyaab + name = "diyaab" + desc = "A small pack animal. Although omnivorous, it will hunt meat on occasion." + faction = "diyaab" + icon_state = "diyaab" + icon_living = "diyaab" + icon_dead = "diyaab_dead" + icon = 'icons/jungle.dmi' + + faction = "diyaab" + cooperative = 1 + + maxHealth = 25 + health = 25 + speed = 1 + move_to_delay = 1 + + melee_damage_lower = 1 + melee_damage_upper = 8 + + attacktext = "gouged" + cold_damage_per_tick = 0 + + speak_chance = 5 + speak = list("Awrr?","Aowrl!","Worrl") + emote_see = list("sniffs the air cautiously","looks around") + emote_hear = list("snuffles") \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/animals/sif wildlife/savik.dm b/code/modules/mob/living/simple_animal/animals/sif wildlife/savik.dm new file mode 100644 index 0000000000..c8b6bd7570 --- /dev/null +++ b/code/modules/mob/living/simple_animal/animals/sif wildlife/savik.dm @@ -0,0 +1,32 @@ +/mob/living/simple_animal/hostile/savik + name = "savik" + desc = "A fast, armoured predator accustomed to hiding and ambushing in cold terrain." + faction = "savik" + icon_state = "savik" + icon_living = "savik" + icon_dead = "savik_dead" + icon = 'icons/jungle.dmi' + + faction = "savik" + + maxHealth = 125 + health = 125 + speed = 2 + move_to_delay = 2 + + melee_damage_lower = 15 + melee_damage_upper = 25 + + attacktext = "mauled" + cold_damage_per_tick = 0 + + speak_chance = 5 + speak = list("Hruuugh!","Hrunnph") + emote_see = list("paws the ground","shakes its mane","stomps") + emote_hear = list("snuffles") + +/mob/living/simple_animal/hostile/savik/handle_stance(var/new_stance) + ..(new_stance) + if(stance == STANCE_ATTACK || stance == STANCE_ATTACKING) + if((health / maxHealth) <= 0.5) // At half health, and fighting someone currently. + add_modifier(/datum/modifier/berserk, 30 SECONDS) \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/animals/sif wildlife/shantak.dm b/code/modules/mob/living/simple_animal/animals/sif wildlife/shantak.dm new file mode 100644 index 0000000000..fe3865e4ea --- /dev/null +++ b/code/modules/mob/living/simple_animal/animals/sif wildlife/shantak.dm @@ -0,0 +1,25 @@ +/mob/living/simple_animal/hostile/shantak + name = "shantak" + desc = "A piglike creature with a bright iridiscent mane that sparkles as though lit by an inner light. Don't be fooled by its beauty though." + faction = "shantak" + icon_state = "shantak" + icon_living = "shantak" + icon_dead = "shantak_dead" + icon = 'icons/jungle.dmi' + + faction = "shantak" + + maxHealth = 75 + health = 75 + speed = 1 + move_to_delay = 1 + + melee_damage_lower = 3 + melee_damage_upper = 12 + + attacktext = "gouged" + cold_damage_per_tick = 0 + + speak_chance = 5 + speak = list("Shuhn","Shrunnph?","Shunpf") + emote_see = list("scratches the ground","shakes out its mane","clinks gently as it moves") \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/humanoids/syndicate.dm b/code/modules/mob/living/simple_animal/humanoids/syndicate.dm index c63ec3125f..b053094663 100644 --- a/code/modules/mob/living/simple_animal/humanoids/syndicate.dm +++ b/code/modules/mob/living/simple_animal/humanoids/syndicate.dm @@ -133,7 +133,7 @@ ranged = 1 rapid = 1 projectiletype = /obj/item/projectile/bullet/pistol/medium - casingtype = /obj/item/ammo_casing/spent +// casingtype = /obj/item/ammo_casing/spent //Makes infinite stacks of bullets when put in PoIs. projectilesound = 'sound/weapons/Gunshot_light.ogg' loot_list = list(/obj/item/weapon/gun/projectile/automatic/c20r = 100) diff --git a/icons/jungle.dmi b/icons/jungle.dmi index f27897881ce8a2cab1845364d0185673456235c8..484decf75eef8871b84ecd7922db3ff8064764a2 100644 GIT binary patch delta 607 zcmV-l0-*iRvjokv1dt?uKzdYIbVOxyV{&P5bZKvH004NLrIycb;y?_>&*Uja?X_AJ z2)n&-si;;Q+E+kM;xHp7laa?EVxN8w;lRJthKdVFzt8hA_Sk+l?;n5HUuN~W&h|*j zwZSY+{_8cH^sZuSmS#T7CKlb+^6(=uFq)-#+7hHReaa@4qhywUW|~cEf(D20=h((I z5d$(o;ZZ3mJpw7&2yAueOoz>NST15cFv|a;2S(adh*3m~E?N23BLudJgOA*%La0PI zao0ro?8IFY<$DG~5Fy4UdX&!`IQh_lle0T;a(V}Dq2zwc9D!T{HSACax|$CvG6mS3 zJk0zXN>?it5RasP?Jb*B=;2_NX8LmWIhT)QQ!5`yvPPbuFFaHuok|m-_RwI_QR2sA zu%))YofEbE2Pt4nZU2KDu%)&ic|mIZ+v9q<_jw3oHF}B3oh5n*V>Ne)$$cey2rRdi z=pnG&RicN$e?+XbZP|KY#O+p|L#^{zQA=&vl04H3s0d4c7gf_gViGYzm#h=9U040< zVkol{g+Ns#1~Dge9v>3AL)97k>g zCEsReXAk;XsG2zgJX5-vjl0RO+RL^04o7pPqxqxvGrz}8u5^<>>L$O(%|hvB@u-`H z&P@qTtld~mBb#3o#ObQAcRP7;g1y@*7bkZBD8z^Zrrg^t1O|o6fzt&&IJORg81%^L tg0c%0_%_LjUcB6peS65W`S@Cy)#p0<5Ar}Y5y^S$ENsB;Ei3 delta 609 zcmV-n0-pWNvjoqx1dt?uLV8qKbVOxyV{&P5bZKvH004NLrIx*J<1h@z=lCgvb}bG~ z?A&$9QlvO!XkQ_qZ8{Pn%K}B$$UXfH&XA9~WKwvsfgj1gMT+F3d42o4`7rDEP43mum0utLNJV3hx207lx@h*3n#K3VzHBLudJz(;OdBh(_C zxNoBzJ8|De`J90eM2NAC9_5%LCkGulIlCh#r+4I*O76GJ5y&Obz#es=YxtldQ-J-+ z#Vo#|bhT0g@kH8xUb0z@9u8(@=1*tOx%oskwdNB^)|e+4N)Po!r_y+6JhWK$l=yxh zY^fW*&WYOm2Pt4n-SC4Pu%&L8xIt?Bm;3GI-sd4q)#xQAcb4cOOx4^aCij)-A+X$5 zqKCk8SBV}1{}Hjuc2(zr5qCRz4t36BO&xVrNAgTBp(d<@Y zkDc7GylZ7`4fT$nb(maP4fRe@Sq=40QCSW3PElD6^-fV)6+x0$ssQXhPsj7b;5c$y zsQ7Dkadx4v4OKH|gcnLRi)l5*ReQNMzCls0RFvO)KKU(b3Z