Adjusts certain simple mobs, adds some things (#4778)

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
 		)
 

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)

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"

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

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)

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

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)

polaris.dme

@@ -1865,6 +1865,7 @@
 #include "code\modules\mob\living\simple_animal\animals\giant_spider.dm"
 #include "code\modules\mob\living\simple_animal\animals\goose.dm"
 #include "code\modules\mob\living\simple_animal\animals\lizard.dm"
+#include "code\modules\mob\living\simple_animal\animals\miscellaneous.dm"
 #include "code\modules\mob\living\simple_animal\animals\mouse.dm"
 #include "code\modules\mob\living\simple_animal\animals\parrot.dm"
 #include "code\modules\mob\living\simple_animal\animals\penguin.dm"
@@ -1872,6 +1873,9 @@
 #include "code\modules\mob\living\simple_animal\animals\tomato.dm"
 #include "code\modules\mob\living\simple_animal\animals\tree.dm"
 #include "code\modules\mob\living\simple_animal\animals\worm.dm"
+#include "code\modules\mob\living\simple_animal\animals\sif wildlife\diyaab.dm"
+#include "code\modules\mob\living\simple_animal\animals\sif wildlife\savik.dm"
+#include "code\modules\mob\living\simple_animal\animals\sif wildlife\shantak.dm"
 #include "code\modules\mob\living\simple_animal\borer\borer.dm"
 #include "code\modules\mob\living\simple_animal\borer\borer_captive.dm"
 #include "code\modules\mob\living\simple_animal\borer\borer_powers.dm"