From 6a6c908097bbd44e0f44c3536b66b2fbab4f9783 Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Sun, 31 Dec 2017 11:56:45 -0700 Subject: [PATCH] Nerf drones - no more ventcrawling - can be blown up remotely - no more diamond drill - dense --- code/modules/mob/living/silicon/robot/drone/drone.dm | 12 +++++++----- .../mob/living/silicon/robot/robot_modules.dm | 2 -- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 2099b99f1b1..e1427426e29 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -188,6 +188,8 @@ lawchanges.Add("[time] : [H.name]([H.key]) emagged [name]([key])") emagged = 1 + density = 1 + ventcrawler = 0 icon_state = "repairbot-emagged" holder_type = /obj/item/weapon/holder/drone/emagged update_icons() @@ -247,11 +249,8 @@ /mob/living/silicon/robot/drone/proc/shut_down() if(stat != 2) - if(emagged) - to_chat(src, "You feel a system kill order percolate through your tiny brain, but it doesn't seem like a good idea to you.") - else - to_chat(src, "You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.") - death() + to_chat(src, "You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.") + death() /mob/living/silicon/robot/drone/proc/full_law_reset() clear_supplied_laws() @@ -347,6 +346,9 @@ /mob/living/silicon/robot/drone/update_canmove(delay_action_updates = 0) . = ..() + if(emagged) + density = 1 + return density = 0 //this is reset every canmove update otherwise /mob/living/simple_animal/drone/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 3d95987bcf8..a1980b72fed 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -502,8 +502,6 @@ modules += new /obj/item/device/t_scanner(src) modules += new /obj/item/weapon/rpd(src) - emag = new /obj/item/weapon/pickaxe/drill/cyborg/diamond(src) - for(var/T in stacktypes) var/obj/item/stack/sheet/W = new T(src) W.amount = stacktypes[T]