Merge pull request #8984 from VOREStation/upstream-merge-7620

[MIRROR] Increase a bunch of mobs MELEE AP power.

code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/thermic.dm

@@ -28,6 +28,7 @@
 
 	melee_damage_lower = 10
 	melee_damage_upper = 25
+	attack_armor_pen = 15
 
 	heat_resist = 0.75
 	cold_resist = -0.50

code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm

@@ -109,7 +109,8 @@
 	icon_rest = "poly-held"
 	icon_dead = "poly-dead"
 	tt_desc = "E Ara macao"
-	//my_headset = /obj/item/device/radio/headset/headset_eng //VOREStation Removal
+	attack_armor_pen = 20	//HE HAS THE B E A K
+	my_headset = /obj/item/device/radio/headset/headset_eng
 	say_list_type = /datum/say_list/bird/poly
 
 // Best Bird with best headset.

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

@@ -22,6 +22,7 @@
 	harm_intent_damage = 5
 	melee_damage_lower = 25
 	melee_damage_upper = 25
+	attack_armor_pen = 15	//It's a freaking alien.
 	attack_sharp = TRUE
 	attack_edge = TRUE
 

code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm

@@ -24,6 +24,7 @@
 	harm_intent_damage = 5
 	melee_damage_lower = 15		//Tac Knife damage
 	melee_damage_upper = 15
+	attack_armor_pen = 20
 	attack_sharp = 1
 	attack_edge = 1
 	attacktext = list("slashed", "stabbed")

code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm

@@ -15,7 +15,7 @@
 	harm_intent_damage = 5
 	melee_damage_lower = 30
 	melee_damage_upper = 30
-	attack_armor_pen = 50
+	attack_armor_pen = 30
 	attack_sharp = 1
 	attack_edge = 1
 

code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm

@@ -14,6 +14,7 @@
 	response_harm = "hits"
 
 	harm_intent_damage = 5
+	attack_armor_pen = 15
 	melee_damage_lower = 15
 	melee_damage_upper = 15
 	attacktext = list("punched")

code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm

@@ -18,6 +18,7 @@
 
 	melee_damage_lower = 30 // It has a built in esword.
 	melee_damage_upper = 30
+	attack_armor_pen = 20
 	attack_sound = 'sound/weapons/blade1.ogg'
 	attacktext = list("slashed")
 	melee_attack_delay = 0.5 SECONDS // Even has custom attack animations.

code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm

@@ -46,6 +46,7 @@
 	health = 1 LASERS_TO_KILL
 	melee_damage_lower = 8
 	melee_damage_upper = 8
+	attack_armor_pen = 5
 
 /datum/ai_holder/simple_mob/hivebot
 	pointblank = TRUE

code/modules/mob/living/simple_mob/subtypes/mechanical/viscerator.dm

@@ -87,3 +87,9 @@
 		if(istype(L, /mob/living/simple_mob/mechanical/ward/monitor/crew))	// Also ignore friendly monitor wards
 			return TRUE
 		return L.assess_perp(src, FALSE, FALSE, TRUE, FALSE) <= 3
+
+// Variant that has high armor pen. Slightly slower attack speed and movement. Meant to be dispersed in groups with other ones
+/mob/living/simple_mob/mechanical/viscerator/piercing.
+	attack_armor_pen = 20
+	base_attack_cooldown = 10 // One attack a second or so.
+	movement_cooldown = 0.5