From 38f765d4dc3aaa5b5bf55a443c1e335ba3597661 Mon Sep 17 00:00:00 2001 From: GDN <96800819+GDNgit@users.noreply.github.com> Date: Mon, 20 Nov 2023 13:12:15 -0600 Subject: [PATCH] Gives drones respawnability, improves killing yourself as a drone (#23070) --- code/game/verbs/suicide.dm | 3 +++ code/modules/mob/living/silicon/robot/drone/maint_drone.dm | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm index 1558c9d524d..9f1eff529c9 100644 --- a/code/game/verbs/suicide.dm +++ b/code/game/verbs/suicide.dm @@ -61,6 +61,9 @@ //put em at -175 adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) +/mob/living/silicon/robot/drone/do_suicide() + shut_down() + /mob/living/silicon/pai/do_suicide() if(mobility_flags & MOBILITY_MOVE) close_up() diff --git a/code/modules/mob/living/silicon/robot/drone/maint_drone.dm b/code/modules/mob/living/silicon/robot/drone/maint_drone.dm index 2aee30f2c3b..b5b2ca28e59 100644 --- a/code/modules/mob/living/silicon/robot/drone/maint_drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/maint_drone.dm @@ -108,6 +108,7 @@ aiCamera = new /obj/item/camera/siliconcam/drone_camera(src) additional_law_channels["Drone"] = ";" + ADD_TRAIT(src, TRAIT_RESPAWNABLE, UNIQUE_TRAIT_SOURCE(src)) playsound(loc, 'sound/machines/twobeep.ogg', 50) @@ -220,7 +221,7 @@ SSticker.mode.replace_jobbanned_player(src, ROLE_SYNDICATE) to_chat(src, "You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script. You sense you have five minutes before the drone server detects this and automatically shuts you down.") - + REMOVE_TRAIT(src, TRAIT_RESPAWNABLE, UNIQUE_TRAIT_SOURCE(src)) message_admins("[key_name_admin(user)] emagged drone [key_name_admin(src)]. Laws overridden.") log_game("[key_name(user)] emagged drone [key_name(src)]. Laws overridden.") var/time = time2text(world.realtime,"hh:mm:ss") @@ -259,7 +260,6 @@ . = ..(gibbed) adjustBruteLoss(health) - //CONSOLE PROCS /mob/living/silicon/robot/drone/proc/law_resync() if(stat != DEAD)