Merge pull request #318 from Tastyfish/master

fixed text formatting bugs

code/WorkInProgress/Tastyfish/livestock.dm

@@ -6,9 +6,9 @@
 	speak_chance = 1
 	turns_per_move = 15
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
-	response_help  = "pets \the"
-	response_disarm = "gently pushes aside \the"
-	response_harm   = "kicks \the"
+	response_help  = "pets "
+	response_disarm = "gently pushes aside "
+	response_harm   = "kicks "
 	var/max_nutrition = 100	// different animals get hungry faster, basically number of 5-second steps from full to starving (60 == 5 minutes)
 	var/nutrition_step		// cycle step in nutrition system
 	var/obj/movement_target // eating-ing target

code/game/objects/stool.dm

@@ -326,8 +326,14 @@
 						"You unbuckled from [src] by [user.name].",\
 						"You hear metal clanking")
 				else
+					var/t_himself = "itself"
+					if (M.gender == MALE)
+						t_himself = "himself"
+					else if (M.gender == FEMALE)
+						t_himself = "herself"
+
 					M.visible_message(\
-						"\blue [M.name] unbuckled \himself!",\
+						"\blue [M.name] unbuckled [t_himself]!",\
 						"You unbuckle yourself from [src].",\
 						"You hear metal clanking")
 				M.pixel_y = 0