From c3bf4e52201fa6f846b3141b7fcd2ac28b279351 Mon Sep 17 00:00:00 2001
From: Heroman <alesha3000@list.ru>
Date: Sun, 30 Aug 2020 05:32:23 +1000
Subject: [PATCH] Makes rabbits not be vulpines

---
 .../living/simple_mob/subtypes/vore/rabbit.dm | 52 ++++++++++---------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm
index f1f13b832f5..a49309e7138 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm
@@ -6,7 +6,7 @@
 /mob/living/simple_mob/vore/rabbit
 	name = "rabbit"
 	desc = "It's a fluffy, smol bunny! Adorable!"
-	tt_desc = "Vulpes zerda"
+	tt_desc = "Oryctolagus cuniculus domesticus"
 
 	icon_state = "rabbit_brown"
 	icon_living = "rabbit_brown"
@@ -26,12 +26,12 @@
 	melee_damage_lower = 1
 	melee_damage_upper = 3
 	attacktext = list("nipped")
-	
+
 	movement_cooldown = 3
 
 	say_list_type = /datum/say_list/rabbit
 	ai_holder_type = /datum/ai_holder/simple_mob/passive
-	
+
 	// Vore vars
 	vore_active = 1
 	vore_bump_chance = 10
@@ -40,16 +40,16 @@
 	vore_pounce_maxhealth = 100 // They won't pounce by default, as they're passive. This is just so the nom check succeeds. :u
 	vore_default_mode = DM_HOLD
 	vore_icons = SA_ICON_LIVING
-	
+
 	var/body_color 				//brown, black and white, leave blank for random
-	
+
 	var/grumpiness = 0 			// This determines how grumpy we are. Pet us to increase it, leave us alone to decrease.
 	var/last_pet				// This tracks the last time someone patted us.
 	var/grump_decay = 5 SECONDS // This is how quickly our grumpiness decays.
-	
+
 /mob/living/simple_mob/vore/rabbit/New()
 	. = ..()
-	
+
 	if(!body_color)
 		body_color = pick( list("brown","black","white") )
 	icon_state = "rabbit_[body_color]"
@@ -57,16 +57,16 @@
 	icon_living = "rabbit_[body_color]"
 	icon_dead = "rabbit_[body_color]_dead"
 	icon_rest = "rabbit_[body_color]_rest"
-	
+
 /mob/living/simple_mob/vore/rabbit/Life()
 	. = ..()
-	
+
 	if(grumpiness > 0 && last_pet > (world.time + grump_decay))
 		grumpiness = max(0, grumpiness-rand(5,10)) // Subtract grumpiness randomly in a range of 5-10 if we've not been PAT in the last 5 seconds.
-		
+
 /mob/living/simple_mob/vore/rabbit/examine(mob/user)
 	. = ..()
-	
+
 	switch(grumpiness)
 		if(-INFINITY to 25)
 			. += "They appear calm."
@@ -76,14 +76,14 @@
 			. += "They seem very annoyed, perhaps you should stop petting them."
 		if(75 to INFINITY)
 			. += "They are very angry. Petting them will likely result in unpleasant things."
-		
+
 /mob/living/simple_mob/vore/rabbit/attack_hand(mob/user)
 	. = ..()
-	
+
 	if(user.a_intent == I_HELP) // only patpet on help. :p
 		grumpiness = CLAMP(grumpiness + rand(5, 10), 0, 120)
 		last_pet = world.time
-	
+
 	if(grumpiness > 90) // Annoyed bunbun :U
 		var/pounce_chance = CanPounceTarget(user)
 		if(pounce_chance)
@@ -93,58 +93,60 @@
 	speak = list("chrrrs.")
 	emote_hear = list("screms.")
 	emote_see = list("earflicks","wiggles it's tail", "wiggles its nose")
-	
+
 /mob/living/simple_mob/vore/rabbit/black
 	icon_state = "rabbit_black"
 	icon_living = "rabbit_black"
 	icon_dead = "rabbit_black_dead"
 	icon_rest = "rabbit_black_rest"
 	body_color = "black"
-	
+
 /mob/living/simple_mob/vore/rabbit/white
 	icon_state = "rabbit_white"
 	icon_living = "rabbit_white"
 	icon_dead = "rabbit_white_dead"
 	icon_rest = "rabbit_white_rest"
 	body_color = "white"
-	
+
 /mob/living/simple_mob/vore/rabbit/brown
 	icon_state = "rabbit_brown"
 	icon_living = "rabbit_brown"
 	icon_dead = "rabbit_brown_dead"
 	icon_rest = "rabbit_brown_rest"
 	body_color = "brown"
-	
+
 /mob/living/simple_mob/vore/rabbit/white/lennie
 	name = "Lennie"
 	desc = "A large but somewhat dumb-looking rabbit. Has a little collar that says 'Lennie'!"
-	
+
 /mob/living/simple_mob/vore/rabbit/brown/george
 	name = "George"
 	desc = "A small and quick bunny with a restless expression in its eyes. Has a little collar that says 'George'!"
-	
+
 /mob/living/simple_mob/vore/rabbit/killer
+	tt_desc = "Oryctolagus cuniculus homicidam"
+
 	icon_state = "rabbit_killer"
 	icon_living = "rabbit_killer"
 	icon_dead = "rabbit_killer_dead"
 	icon_rest = "rabbit_killer_rest"
-	
+
 	maxHealth = 2000
 	health = 2000
 	harm_intent_damage = 5
 	melee_damage_lower = 1
 	melee_damage_upper = 3
 	attacktext = list("nipped")
-	
+
 	movement_cooldown = 0.5 // very fast bunbun.
-	
+
 	vore_pounce_chance = 100
 	vore_pounce_falloff = 0.2
-	
+
 	body_color = "killer" // Set this so New() doesn't try to randomize us.
 
 	say_list_type = /datum/say_list/rabbit
 	ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive
-	
+
 /mob/living/simple_mob/vore/rabbit/killer/ex_act()
 	gib()
\ No newline at end of file