From 3008087a95df7e33494e48a2ba594ecdd5bf9da8 Mon Sep 17 00:00:00 2001 From: Atlantis Date: Tue, 19 May 2015 17:39:25 +0200 Subject: [PATCH] Suggestions + Changelog - Implements PsiOmegaDelta's suggestions - Adds changelog --- code/game/machinery/computer/robot.dm | 10 +++++----- html/changelogs/Atlantis-PR-8816.yml | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/Atlantis-PR-8816.yml diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 919e7c9c83..888e3b4fed 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -19,7 +19,7 @@ data["robots"] = get_cyborgs(user) data["safety"] = safety // Also applies for cyborgs. Hides the manual self-destruct button. - data["is_ai"] = istype(user, /mob/living/silicon) ? 1 : 0 + data["is_ai"] = user.isSilicon() ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) @@ -42,11 +42,11 @@ var/mob/living/silicon/robot/target = get_cyborg_by_name(href_list["detonate"]) if(!target || !istype(target)) return - if(istype(user, /mob/living/silicon/ai) && (target.connected_ai != user)) + if(user.isMobAI() && (target.connected_ai != user)) user << "Access Denied. This robot is not linked to you." return // Cyborgs may blow up themselves via the console - if(istype(user, /mob/living/silicon/robot) && user != target) + if(user.isRobot() && user != target) user << "Access Denied." return var/choice = input("Really detonate [target.name]?") in list ("Yes", "No") @@ -74,11 +74,11 @@ if(!target || !istype(target)) return - if(istype(user, /mob/living/silicon/ai) && (target.connected_ai != user)) + if(user.isMobAI() && (target.connected_ai != user)) user << "Access Denied. This robot is not linked to you." return - if(istype(user, /mob/living/silicon/robot)) + if(user.isRobot()) user << "Access Denied." return diff --git a/html/changelogs/Atlantis-PR-8816.yml b/html/changelogs/Atlantis-PR-8816.yml new file mode 100644 index 0000000000..f3d30f9abe --- /dev/null +++ b/html/changelogs/Atlantis-PR-8816.yml @@ -0,0 +1,6 @@ +author: Atlantis +delete-after: True + +changes: + - rscadd: "NanoUI for Robotics Control Console" + - rscdel: "NanoUI for Supermatter Crystal - AI/Robot only, purely informational"