Merge pull request #2497 from CHOMPStationBot/upstream-merge-10992

[MIRROR] Allows players to name their mobs.

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

@@ -120,7 +120,7 @@ I think I covered everything.
 	var/small = 0
 	var/small_icon = 'icons/mob/bigdragon_small_ch.dmi'
 	var/small_icon_state = "dragon_small"
-	var/nameset
+	//var/nameset //Implemented upstream
 	var/flames
 
 	tame_items = list(
@@ -242,8 +242,8 @@ I think I covered everything.
 	verbs |= /mob/living/simple_mob/vore/bigdragon/proc/sprite_toggle
 	verbs |= /mob/living/simple_mob/vore/bigdragon/proc/flame_toggle
 	verbs |= /mob/living/simple_mob/vore/bigdragon/proc/special_toggle
-	verbs |= /mob/living/simple_mob/vore/bigdragon/proc/set_name
+	//verbs |= /mob/living/simple_mob/vore/bigdragon/proc/set_name //Implemented upstream
-	verbs |= /mob/living/simple_mob/vore/bigdragon/proc/set_desc
+	//verbs |= /mob/living/simple_mob/vore/bigdragon/proc/set_desc //Implemented upstream
 	faction = "neutral"
 
 /mob/living/simple_mob/vore/bigdragon/Initialize()
@@ -311,6 +311,7 @@ I think I covered everything.
 	specialtoggle = !specialtoggle
 	to_chat(src, "<span class='notice'>You will [specialtoggle?"now special":"no longer special"] attack on grab/disarm intent.</span>")
 
+/* //Implemented upstream
 /mob/living/simple_mob/vore/bigdragon/proc/set_name()
 	set name = "Set Name"
 	set desc = "Sets your mobs name. You only get to do this once."
@@ -333,7 +334,7 @@ I think I covered everything.
 	newdesc = sanitizeSafe(input(src,"Set your description. Max 4096 chars.", "Description set","") as text, MAX_MESSAGE_LEN)
 	if(newdesc)
 		desc = newdesc
-
+*/ 
 
 ///
 ///		Icon generation stuff
@@ -1057,4 +1058,4 @@ I think I covered everything.
 	if(chump in check_trajectory(chump, holder, pass_flags = PASSTABLE))
 		if(istype(holder,/mob/living/simple_mob/vore/bigdragon))
 			var/mob/living/simple_mob/vore/bigdragon/H = holder
-			H.chargeend(chump,1,1)
+			H.chargeend(chump,1,1)

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

@@ -1,6 +1,35 @@
 /mob/living/simple_mob/vore
 	mob_class = MOB_CLASS_ANIMAL
 	mob_bump_flag = 0
+	var/nameset
+
+/mob/living/simple_mob/vore/Login()
+	. = ..()
+	verbs |= /mob/living/simple_mob/vore/proc/set_name
+	verbs |= /mob/living/simple_mob/vore/proc/set_desc
+
+/mob/living/simple_mob/vore/proc/set_name()
+	set name = "Set Name"
+	set desc = "Sets your mobs name. You only get to do this once."
+	set category = "Abilities"
+	if(nameset)
+		to_chat(src, "<span class='userdanger'>You've already set your name. Ask an admin to toggle \"nameset\" to 0 if you really must.</span>")
+		return
+	var/newname
+	newname = sanitizeSafe(input(src,"Set your name. You only get to do this once. Max 52 chars.", "Name set","") as text, MAX_NAME_LEN)
+	if (newname)
+		name = newname
+		voice_name = newname
+		nameset = 1
+
+/mob/living/simple_mob/vore/proc/set_desc()
+	set name = "Set Description"
+	set desc = "Set your description."
+	set category = "Abilities"
+	var/newdesc
+	newdesc = sanitizeSafe(input(src,"Set your description. Max 4096 chars.", "Description set","") as text, MAX_MESSAGE_LEN)
+	if(newdesc)
+		desc = newdesc
 
 /mob/living/simple_mob/vore/aggressive
 	mob_bump_flag = HEAVY

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

@@ -12,6 +12,7 @@
 	faction = "panther"
 	maxHealth = 150
 	health = 150
+	movement_cooldown = 2
 
 	response_help = "pats"
 	response_disarm = "gently pushes aside"
@@ -25,6 +26,10 @@
 	say_list_type = /datum/say_list/weretiger
 	ai_holder_type = /datum/ai_holder/simple_mob/retaliate
 
+	pixel_x = -16
+
+	has_hands = 1
+
 // Nomnomn
 /mob/living/simple_mob/vore/weretiger
 	vore_active = 1