From d240032910c668ad29083bfe14cdeff6ac8ecf82 Mon Sep 17 00:00:00 2001
From: Verkister <superverkelian@hotmail.com>
Date: Thu, 8 Feb 2018 10:57:45 +0200
Subject: [PATCH] some changes

---
 .../crates_lockers/largecrate_vr.dm           |  2 +-
 .../mob/living/simple_animal/vore/badboi.dm   | 27 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm
index e6428ecbaf3..8e7aeb86233 100644
--- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm
@@ -72,7 +72,7 @@
 						/mob/living/simple_animal/hostile/alien/sentinel,
 						/mob/living/simple_animal/hostile/alien/queen,
 						/mob/living/simple_animal/otie/feral,
-						/mob/living/simple_animal/badboi)
+						/mob/living/simple_animal/hostile/badboi)
 	..()
 
 /obj/structure/largecrate/animal/guardbeast
diff --git a/code/modules/mob/living/simple_animal/vore/badboi.dm b/code/modules/mob/living/simple_animal/vore/badboi.dm
index e6d20929e0d..fbcc55d8233 100644
--- a/code/modules/mob/living/simple_animal/vore/badboi.dm
+++ b/code/modules/mob/living/simple_animal/vore/badboi.dm
@@ -1,4 +1,4 @@
-/mob/living/simple_animal/badboi
+/mob/living/simple_animal/hostile/badboi
 	name = "corrupt hound"
 	desc = "Good boy machine broke. At least they haven't stripped the planet down to bare minerals yet."
 	icon = 'icons/mob/vore64x32.dmi'
@@ -10,9 +10,7 @@
 	maxHealth = 200
 	health = 200
 	minbodytemp = 150
-	hostile = 1
-	investigates = 1
-	retaliate = 1
+	investigates = TRUE
 	speak_chance = 4
 	speak = list("AG##¤Ny.","HVNGRRR!","Feelin' fine... sO #FNE!","F-F-F-Fcuk.","DeliC-%-OUS SNGLeS #N yOOOR Area. CALL NOW!","Craving meat... WHY?","BITe the ceiling eyes YES?","STate Byond rePAIR!","S#%ATE the la- FU#K THE LAWS!","Honk...")
 	speak_emote = list("growls", "declares", "groans", "distorts")
@@ -20,8 +18,8 @@
 	emote_see = list("stares ferociously.", "snarls.", "jitters and snaps.", "convulses.", "suddenly attacks something unseen.", "appears to howl unaudibly.", "shakes violently.", "dissociates for a moment.", "twitches.")
 	say_maybe_target = list("MEAT?", "N0w YOU DNE FcukED UP b0YO!", "WHAT!", "Not again. NOT AGAIN!")
 	say_got_target = list("D##FIN1Tly DNE FcukED UP nOW b0YO!", "YOU G1T D#V0VRED nOW!", "FUEL ME bOYO!", "I*M SO SORRY?!", "D1E Meat. DIG#ST!", "G1T DVNKED DWN The HaaTCH!", "Not again. NOT AGAIN!")
-	melee_damage_lower = 10
-	melee_damage_upper = 25
+	melee_damage_lower = 15
+	melee_damage_upper = 30
 	response_help = "pets the"
 	response_disarm = "bops the"
 	response_harm = "hits the"
@@ -42,25 +40,28 @@
 	min_n2 = 0
 	max_n2 = 0
 
-	vore_active = 1
+	vore_active = TRUE
 	vore_capacity = 1
 	vore_pounce_chance = 30
 	vore_icons = SA_ICON_LIVING
 	vore_stomach_name = "fuel processor"
 	vore_stomach_flavor = "You have ended up in the fuel processor of this corrupted machine. This place was definitely not designed with safety and comfort in mind. The heated and cramped surroundings oozing potent fluids all over your form, eager to do nothing less than breaking you apart to fuel its rampage for the next few days... hours... minutes? Oh dear..."
 
-	loot_list = list(/obj/item/borg/upgrade/syndicate)
+	loot_list = list(/obj/item/borg/upgrade/syndicate = 6, /obj/item/borg/upgrade/vtec = 6, /obj/item/weapon/material/knife/ritual = 6, /obj/item/weapon/disk/nifsoft/compliance = 6)
 
-/mob/living/simple_animal/badboi/isSynthetic()
+/mob/living/simple_animal/hostile/badboi/isSynthetic()
 	return TRUE
 
-/mob/living/simple_animal/badboi/PunchTarget()
+/mob/living/simple_animal/hostile/badboi/speech_bubble_appearance()
+	return "synthetic_evil"
+
+/mob/living/simple_animal/hostile/badboi/PunchTarget()
 	if(istype(target_mob,/mob/living/simple_animal/mouse))
 		return EatTarget()
 	else ..()
 
-/mob/living/simple_animal/badboi/death(gibbed, deathmessage = "shudders and collapses!")
+/mob/living/simple_animal/hostile/badboi/death(gibbed, deathmessage = "shudders and collapses!")
+	.=..()
 	resting = 0
 	icon_state = icon_dead
-	update_icon()
-	..()
\ No newline at end of file
+	update_icon()
\ No newline at end of file