From f79de12509002743dcae02984b99d60656f32025 Mon Sep 17 00:00:00 2001 From: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com> Date: Tue, 1 Oct 2024 17:13:59 +0200 Subject: [PATCH] Prevent borgs from being able to be briefly toggled off. (#32485) * Prevent borgs from being able to be briefly toggled off. * Use the pre-existing component instead of making an unneccesary duplicate. --- Content.Shared/Item/ItemToggle/ItemToggleSystem.cs | 2 +- .../Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs index 98029f97d5..d5bbaac12c 100644 --- a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs +++ b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs @@ -71,7 +71,7 @@ public sealed class ItemToggleSystem : EntitySystem private void OnActivateVerb(Entity ent, ref GetVerbsEvent args) { - if (!args.CanAccess || !args.CanInteract) + if (!args.CanAccess || !args.CanInteract || !ent.Comp.OnActivate) return; var user = args.User; diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 955ddfd2e3..54bd58af78 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -121,6 +121,7 @@ cellSlotId: cell_slot fitsInCharger: true - type: ItemToggle + onActivate: false # You should not be able to turn off a borg temporarily. activated: false # gets activated when a mind is added onUse: false # no item-borg toggling sorry - type: ItemTogglePointLight -- 2.51.2