From 1c5953f01adbbf92a00bc53c3eccfb3120f1f898 Mon Sep 17 00:00:00 2001 From: Jazzdoodle Date: Sat, 3 Sep 2016 21:00:46 -0500 Subject: [PATCH 1/2] Fixes misc grammar and adds new attack messages Cleans up the grammar of the Desk Fan and Ball Toy. Additionally, some new attack messages are added to the Red Phone and Cane. --- code/game/objects/items/weapons/misc.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm index c230c033437..46fb757335f 100644 --- a/code/game/objects/items/weapons/misc.dm +++ b/code/game/objects/items/weapons/misc.dm @@ -32,7 +32,7 @@ throwforce = 7.0 w_class = 2 materials = list(MAT_METAL=50) - attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed") + attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed", "Vaudevilled") /obj/item/weapon/cane/is_crutch() return 1 @@ -53,7 +53,7 @@ name = "desk fan" icon = 'icons/obj/decorations.dmi' icon_state = "fan" - desc = "A smal desktop fan. Button seems to be stuck in the 'on' position." + desc = "A small desktop fan. The button seems to be stuck in the 'on' position." /* /obj/item/weapon/game_kit @@ -114,7 +114,7 @@ name = "newton cradle" icon = 'icons/obj/decorations.dmi' icon_state = "newton" - desc = "A device bored paper pushers use to remind themselves that the time did not stop yet. Contains gravity." + desc = "A device bored paper pushers use to remind themselves that time did not stop yet. Contains gravity." /obj/item/weapon/pai_cable desc = "A flexible coated cable with a universal jack on one end." @@ -135,11 +135,11 @@ throw_speed = 1 throw_range = 4 w_class = 2 - attack_verb = list("called", "rang") + attack_verb = list("called", "rang", "dialed", "belled") hitsound = 'sound/weapons/ring.ogg' var/cooldown = 0 /obj/item/weapon/phone/attack_self(mob/user) if(cooldown < world.time - 20) playsound(user.loc, 'sound/weapons/ring.ogg', 50, 1) - cooldown = world.time \ No newline at end of file + cooldown = world.time From 618df203809cc55dbe4fec8a9edfbf65c2af16f5 Mon Sep 17 00:00:00 2001 From: Jazzdoodle Date: Sun, 4 Sep 2016 15:05:14 -0500 Subject: [PATCH 2/2] Update misc.dm --- code/game/objects/items/weapons/misc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm index 46fb757335f..ffd021aae4b 100644 --- a/code/game/objects/items/weapons/misc.dm +++ b/code/game/objects/items/weapons/misc.dm @@ -135,7 +135,7 @@ throw_speed = 1 throw_range = 4 w_class = 2 - attack_verb = list("called", "rang", "dialed", "belled") + attack_verb = list("called", "rang") hitsound = 'sound/weapons/ring.ogg' var/cooldown = 0