Merge pull request #5121 from Novacat/nova-aifixes

Halves damage from voremobs

code/modules/mob/living/simple_mob/subtypes/animal/space/gaslamp_vr.dm

@@ -30,8 +30,8 @@ TODO: Make them light up and heat the air when exposed to oxygen.
 
 	//speed = 2 not sure what this is, guessing animation, but it conflicts with new system.
 
-	melee_damage_lower = 30 // Because fuck anyone who hurts this sweet, innocent creature.
-	melee_damage_upper = 30
+	melee_damage_lower = 15 // Because fuck anyone who hurts this sweet, innocent creature.
+	melee_damage_upper = 15
 	attacktext = list("thrashed")
 	friendly = "caressed"
 

code/modules/mob/living/simple_mob/subtypes/animal/space/mimic_vr.dm

@@ -22,8 +22,8 @@
 	response_harm = "hits"
 
 	harm_intent_damage = 5
-	melee_damage_lower = 8
-	melee_damage_upper = 12
+	melee_damage_lower = 4
+	melee_damage_upper = 6
 	attacktext = list("attacked")
 	attack_sound = 'sound/weapons/bite.ogg'
 

code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm

@@ -16,8 +16,8 @@
 	response_disarm = "shoos"
 	response_harm   = "kicks"
 
-	melee_damage_lower = 3
-	melee_damage_upper = 5
+	melee_damage_lower = 2
+	melee_damage_upper = 3
 	attacktext = list("bitten")
 
 	say_list_type = /datum/say_list/snake

code/modules/mob/living/simple_mob/subtypes/vore/bee.dm

@@ -16,9 +16,9 @@
 	maxHealth = 25
 	health = 25
 
-	harm_intent_damage = 8
-	melee_damage_lower = 4
-	melee_damage_upper = 8
+	harm_intent_damage = 4
+	melee_damage_lower = 2
+	melee_damage_upper = 4
 	attacktext = list("stung")
 
 	say_list_type = /datum/say_list/bee

code/modules/mob/living/simple_mob/subtypes/vore/catgirl.dm

@@ -7,8 +7,8 @@
 	icon = 'icons/mob/vore.dmi'
 
 	harm_intent_damage = 5
-	melee_damage_lower = 5
-	melee_damage_upper = 10
+	melee_damage_lower = 2
+	melee_damage_upper = 5
 
 	response_help = "pets the"
 	response_disarm = "gently baps the"

code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm

@@ -12,8 +12,8 @@
 	health = 10
 
 	harm_intent_damage = 2
-	melee_damage_lower = 5
-	melee_damage_upper = 10
+	melee_damage_lower = 2
+	melee_damage_upper = 5
 
 	say_list_type = /datum/say_list/cookiegirl
 	ai_holder_type = /datum/ai_holder/simple_mob/passive/cookiegirl

code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm

@@ -13,8 +13,8 @@
 	maxHealth = 200
 	health = 200
 
-	melee_damage_lower = 10
-	melee_damage_upper = 20 //makes it so 4 max dmg hits don't instakill you.
+	melee_damage_lower = 5
+	melee_damage_upper = 10 //makes it so 4 max dmg hits don't instakill you.
 	grab_resist = 100
 
 	response_help = "pets the"

code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm

@@ -14,8 +14,8 @@
 	maxHealth = 200
 	health = 200
 
-	melee_damage_lower = 10
-	melee_damage_upper = 60
+	melee_damage_lower = 5
+	melee_damage_upper = 30
 
 	old_x = -16
 	old_y = 0

code/modules/mob/living/simple_mob/subtypes/vore/dino.dm

@@ -15,8 +15,8 @@
 	response_harm = "hits"
 	movement_cooldown = 4
 	harm_intent_damage = 5
-	melee_damage_lower = 10
-	melee_damage_upper = 25
+	melee_damage_lower = 5
+	melee_damage_upper = 12
 	attacktext = list("bitten")
 	attack_sound = 'sound/weapons/bite.ogg'
 	minbodytemp = 200
@@ -42,4 +42,4 @@
 	vore_icons = SA_ICON_LIVING
 
 /mob/living/simple_mob/vore/aggressive/dino/virgo3b
-	faction = "virgo3b"
+	faction = "virgo3b"

code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm

@@ -11,8 +11,8 @@
 	maxHealth = 500 // Boss
 	health = 500
 
-	melee_damage_lower = 10
-	melee_damage_upper = 60
+	melee_damage_lower = 5
+	melee_damage_upper = 30
 
 	//Space dragons aren't affected by atmos.
 	min_oxy = 0

code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm

@@ -18,8 +18,8 @@
 	response_harm = "hits the"
 
 	harm_intent_damage = 5
-	melee_damage_lower = 5
-	melee_damage_upper = 2
+	melee_damage_lower = 1
+	melee_damage_upper = 3
 	attacktext = list("bapped")
 
 	say_list_type = /datum/say_list/fennec

code/modules/mob/living/simple_mob/subtypes/vore/fennix.dm

@@ -18,7 +18,7 @@
 
 	harm_intent_damage = 20
 	melee_damage_lower = 1
-	melee_damage_upper = 5
+	melee_damage_upper = 3
 	attacktext = list("Bites")
 
 	say_list_type = /datum/say_list/fennix

code/modules/mob/living/simple_mob/subtypes/vore/frog.dm

@@ -11,8 +11,8 @@
 	movement_cooldown = 4 //fast as fucc boie.
 
 	harm_intent_damage = 5
-	melee_damage_lower = 10
-	melee_damage_upper = 25
+	melee_damage_lower = 5
+	melee_damage_upper = 12
 
 	ai_holder_type = /datum/ai_holder/simple_mob/melee
 
@@ -41,4 +41,4 @@
 	max_co2 = 0
 	min_n2 = 0
 	max_n2 = 0
-	minbodytemp = 0
+	minbodytemp = 0

code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm

@@ -28,8 +28,8 @@
 	response_harm = "hits the"
 	attacktext = list("bit")
 
-	melee_damage_upper = 25
-	melee_damage_lower = 15
+	melee_damage_upper = 12
+	melee_damage_lower = 7
 	attack_sharp = TRUE
 
 	old_x = -16

code/modules/mob/living/simple_mob/subtypes/vore/jelly.dm

@@ -11,8 +11,8 @@
 	maxHealth = 50
 	health = 50
 
-	melee_damage_lower = 5
-	melee_damage_upper = 15
+	melee_damage_lower = 2
+	melee_damage_upper = 7
 
 	say_list_type = /datum/say_list/jelly
 	ai_holder_type = /datum/ai_holder/simple_mob/retaliate/jelly

code/modules/mob/living/simple_mob/subtypes/vore/otie.dm

@@ -32,8 +32,8 @@
 	emote_see = list("stares ferociously", "snarls", "licks their chops", "stretches", "yawns")
 	say_maybe_target = list("Ruh?", "Waf?")
 	say_got_target = list("Rurrr!", "ROAR!", "MARR!", "RERR!", "RAHH!", "RAH!", "WARF!")
-	melee_damage_lower = 5
-	melee_damage_upper = 15 //Don't break my bones bro
+	melee_damage_lower = 2
+	melee_damage_upper = 7 //Don't break my bones bro
 	response_help = "pets the"
 	response_disarm = "bops the"
 	response_harm = "hits the"
@@ -77,8 +77,8 @@
 	icon_rest = "siftusian_rest"
 	faction = "virgo3b"
 	tame_chance = 5 // Only a 1 in 20 chance of success. It's feral. What do you expect?
-	melee_damage_lower = 10
-	melee_damage_upper = 25
+	melee_damage_lower = 5
+	melee_damage_upper = 12
 	// Lazy way of making sure this otie survives outside.
 	min_oxy = 0
 	max_oxy = 0
@@ -101,8 +101,8 @@
 	icon_rest = "hotie_rest"
 	faction = "cult"
 	tame_chance = 20
-	melee_damage_lower = 10
-	melee_damage_upper = 25
+	melee_damage_lower = 5
+	melee_damage_upper = 12
 	// Lazy way of making sure this otie survives outside.
 	min_oxy = 0
 	max_oxy = 0
@@ -182,8 +182,8 @@
 	icon_living = "sifguard"
 	icon_rest = "sifguard_rest"
 	icon_dead = "sifguard-dead"
-	melee_damage_lower = 10
-	melee_damage_upper = 25
+	melee_damage_lower = 5
+	melee_damage_upper = 12
 	min_oxy = 0
 	max_oxy = 0
 	min_tox = 0
@@ -397,4 +397,4 @@
 	verbs |= /mob/living/simple_animal/proc/animal_mount
 
 /mob/living/simple_animal/otie/MouseDrop_T(mob/living/M, mob/living/user)
-	return
+	return

code/modules/mob/living/simple_mob/subtypes/vore/panther.dm

@@ -13,8 +13,8 @@
 	health = 200
 	movement_cooldown = 4
 
-	melee_damage_lower = 10
-	melee_damage_upper = 30
+	melee_damage_lower = 5
+	melee_damage_upper = 15
 	attack_sharp = TRUE
 
 	old_x = -16

code/modules/mob/living/simple_mob/subtypes/vore/rat.dm

@@ -13,8 +13,8 @@
 	maxHealth = 150
 	health = 150
 
-	melee_damage_lower = 5
-	melee_damage_upper = 15
+	melee_damage_lower = 2
+	melee_damage_upper = 7
 	grab_resist = 100
 
 	response_help = "pets the"

code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm

@@ -17,9 +17,9 @@
 	response_disarm = "gently pushes aside the"
 	response_harm = "hits the"
 
-	harm_intent_damage = 5
-	melee_damage_lower = 5
-	melee_damage_upper = 2
+	harm_intent_damage = 3
+	melee_damage_lower = 3
+	melee_damage_upper = 1
 	attacktext = list("bapped")
 
 	say_list_type = /datum/say_list/redpanda

code/modules/mob/living/simple_mob/subtypes/vore/snake.dm

@@ -11,8 +11,8 @@
 	maxHealth = 200
 	health = 200
 
-	melee_damage_lower = 10
-	melee_damage_upper = 25
+	melee_damage_lower = 5
+	melee_damage_upper = 12
 
 	old_x = -16
 	old_y = -16

code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm

@@ -23,7 +23,7 @@ List of things solar grubs should be able to do:
 	health = 50
 
 	melee_damage_lower = 1
-	melee_damage_upper = 5
+	melee_damage_upper = 3
 
 	speed = 2
 

code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm

@@ -11,8 +11,8 @@
 	movement_cooldown = 5
 
 	harm_intent_damage = 5
-	melee_damage_lower = 10
-	melee_damage_upper = 25
+	melee_damage_lower = 5
+	melee_damage_upper = 12
 
 	minbodytemp = 200
 

code/modules/mob/living/simple_mob/subtypes/vore/wolfgirl.dm

@@ -17,8 +17,8 @@
 	response_harm = "hits the"
 
 	harm_intent_damage = 8
-	melee_damage_lower = 15
-	melee_damage_upper = 15
+	melee_damage_lower = 7
+	melee_damage_upper = 7
 	attacktext = list("slashed")
 
 	say_list_type = /datum/say_list/wolfgirl