From a0e9986b50c0f275800f38acd485783ba8a7c406 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Thu, 26 Jan 2012 22:25:30 -0500 Subject: [PATCH 1/2] fixed livestock attack flavor again, derp --- code/WorkInProgress/Tastyfish/livestock.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/WorkInProgress/Tastyfish/livestock.dm b/code/WorkInProgress/Tastyfish/livestock.dm index 8b14956004..9c9e7cc495 100644 --- a/code/WorkInProgress/Tastyfish/livestock.dm +++ b/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 From af14d9c9e9d6f58ef08392bd7c65acfbb83557e2 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Thu, 26 Jan 2012 22:36:13 -0500 Subject: [PATCH 2/2] seems \himself doesn't work right, contrary to docs --- code/game/objects/stool.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/objects/stool.dm b/code/game/objects/stool.dm index 2d978c02a9..89b5977b82 100644 --- a/code/game/objects/stool.dm +++ b/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