From 950bc17c23f4030dfc9c1013a39bd2a9cbe68115 Mon Sep 17 00:00:00 2001 From: Firecage Date: Sun, 18 Jan 2015 11:48:53 +0200 Subject: [PATCH 1/2] Gives the monkey dexterity message to some stuff. --- code/game/objects/items/devices/violin.dm | 3 +++ code/game/objects/structures/musician.dm | 6 ++++++ code/game/objects/structures/tank_dispenser.dm | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/code/game/objects/items/devices/violin.dm b/code/game/objects/items/devices/violin.dm index 13bfc403bcc..12f65b0ed37 100644 --- a/code/game/objects/items/devices/violin.dm +++ b/code/game/objects/items/devices/violin.dm @@ -19,6 +19,9 @@ ..() /obj/item/device/violin/attack_self(mob/user as mob) + if(!user.IsAdvancedToolUser()) + usr << "You don't have the dexterity to do this!" + return 1 interact(user) /obj/item/device/violin/interact(mob/user as mob) diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index 061fdd3b141..781ad56b612 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -323,8 +323,14 @@ ..() /obj/structure/piano/attack_hand(mob/user as mob) + if(!user.IsAdvancedToolUser()) + usr << "You don't have the dexterity to do this!" + return 1 interact(user) +/obj/structure/piano/attack_paw(mob/user as mob) + return src.attack_hand(user) + /obj/structure/piano/interact(mob/user as mob) if(!user || !anchored) return diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 67552863327..38094c6514b 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -31,8 +31,13 @@ if(1 to 4) overlays += "plasma-[plasmatanks]" if(5 to INFINITY) overlays += "plasma-5" +/obj/structure/dispenser/attack_paw(mob/user as mob) + return src.attack_hand(user) /obj/structure/dispenser/attack_hand(mob/user as mob) + if(!user.IsAdvancedToolUser()) + usr << "You don't have the dexterity to do this!" + return 1 user.set_machine(src) var/dat = "[src]

" dat += "Oxygen tanks: [oxygentanks] - [oxygentanks ? "Dispense" : "empty"]
" From a93a1dfe36a655a2f516427d6205fbbffc34c7ce Mon Sep 17 00:00:00 2001 From: Firecage Date: Wed, 21 Jan 2015 19:57:48 +0200 Subject: [PATCH 2/2] usr -> user in monkey dexterity. --- code/game/objects/items/devices/violin.dm | 2 +- code/game/objects/structures/musician.dm | 2 +- code/game/objects/structures/tank_dispenser.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/devices/violin.dm b/code/game/objects/items/devices/violin.dm index 12f65b0ed37..09fd77c6d75 100644 --- a/code/game/objects/items/devices/violin.dm +++ b/code/game/objects/items/devices/violin.dm @@ -20,7 +20,7 @@ /obj/item/device/violin/attack_self(mob/user as mob) if(!user.IsAdvancedToolUser()) - usr << "You don't have the dexterity to do this!" + user << "You don't have the dexterity to do this!" return 1 interact(user) diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index 781ad56b612..6510eaf31a5 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -324,7 +324,7 @@ /obj/structure/piano/attack_hand(mob/user as mob) if(!user.IsAdvancedToolUser()) - usr << "You don't have the dexterity to do this!" + user << "You don't have the dexterity to do this!" return 1 interact(user) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 38094c6514b..0dcf0f5f451 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -36,7 +36,7 @@ /obj/structure/dispenser/attack_hand(mob/user as mob) if(!user.IsAdvancedToolUser()) - usr << "You don't have the dexterity to do this!" + user << "You don't have the dexterity to do this!" return 1 user.set_machine(src) var/dat = "[src]

"