From f54d75cd355c39d1799eb23f2a7e9e5e4451a56e Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 9 Jan 2014 12:44:17 +1030 Subject: [PATCH] Fixes #4240 --- code/WorkInProgress/Yinadele/Supermatter.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/WorkInProgress/Yinadele/Supermatter.dm b/code/WorkInProgress/Yinadele/Supermatter.dm index aba28a7d5b..32fe1c1cb0 100644 --- a/code/WorkInProgress/Yinadele/Supermatter.dm +++ b/code/WorkInProgress/Yinadele/Supermatter.dm @@ -200,15 +200,18 @@ /obj/machinery/power/supermatter/attack_robot(mob/user as mob) - return attack_hand(user) + if(Adjacent(user)) + return attack_hand(user) + else + user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update." + return /obj/machinery/power/supermatter/attack_ai(mob/user as mob) user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update." - /obj/machinery/power/supermatter/attack_hand(mob/user as mob) - user.visible_message("\The [user] reaches out and touches \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.",\ - "You reach out and touch \the [src], everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\ + user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.",\ + "You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\ "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") Consume(user)