diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs index 26bba4503f..7b7cb580a1 100644 --- a/Content.Server/Body/Systems/RespiratorSystem.cs +++ b/Content.Server/Body/Systems/RespiratorSystem.cs @@ -307,7 +307,7 @@ public sealed class RespiratorSystem : EntitySystem private void DoCPR(EntityUid target, RespiratorComponent comp, EntityUid user) { - var doAfterEventArgs = new DoAfterArgs(EntityManager, user, comp.CycleDelay * 4, new CPREndedEvent(), target, + var doAfterEventArgs = new DoAfterArgs(EntityManager, user, 1, new CPREndedEvent(), target, target: target) { BreakOnTargetMove = true, diff --git a/Content.Server/Changeling/ChangelingSystem.Abilities.cs b/Content.Server/Changeling/ChangelingSystem.Abilities.cs index d8403d6ae4..2ab8114c75 100644 --- a/Content.Server/Changeling/ChangelingSystem.Abilities.cs +++ b/Content.Server/Changeling/ChangelingSystem.Abilities.cs @@ -731,6 +731,8 @@ public sealed partial class ChangelingSystem ClonePerson(polymorphEntity.Value, transformData.AppearanceComponent, polyAppearance); TransferDna(polymorphEntity.Value, transformData.Dna); + _humanoidAppearance.SetTTSVoice(polymorphEntity.Value, transformData.AppearanceComponent.Voice, polyAppearance); + if (!TryComp(polymorphEntity.Value, out var meta)) return null; diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs index 86e3c94625..e738dd7964 100644 --- a/Content.Server/GameTicking/GameTicker.Spawning.cs +++ b/Content.Server/GameTicking/GameTicker.Spawning.cs @@ -20,6 +20,7 @@ using Content.Shared.Preferences; using Content.Shared.Roles; using Content.Shared.Roles.Jobs; using Content.Shared._White; +using Content.Shared.NameIdentifier; using JetBrains.Annotations; using Robust.Shared.Map; using Robust.Shared.Map.Components; @@ -300,9 +301,11 @@ namespace Content.Server.GameTicking if (jobId.Contains("Mime")) if (newMind.Comp.MimeName != null) _metaData.SetEntityName(mob, newMind.Comp.MimeName); - if (jobId.Contains("Cyborg")) - if (newMind.Comp.BorgName != null) - _metaData.SetEntityName(mob, newMind.Comp.BorgName); + if (jobId.Contains("Borg")) + if (newMind.Comp.BorgName != null && TryComp(mob, out NameIdentifierComponent? identifier)) + { + _metaData.SetEntityName(mob, $"{newMind.Comp.BorgName} {identifier.FullIdentifier}"); + } _mind.TransferTo(newMind, mob); diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs index 5645858543..7ef3206d2b 100644 --- a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs @@ -201,6 +201,7 @@ public sealed class RevolutionaryRuleSystem : GameRuleSystem(ev.Target) || + HasComp(ev.Target) || HasComp(ev.Target) || !HasComp(ev.Target) && !alwaysConvertible || diff --git a/Content.Server/Roles/RoleSystem.cs b/Content.Server/Roles/RoleSystem.cs index f7a5177357..5a5033e750 100644 --- a/Content.Server/Roles/RoleSystem.cs +++ b/Content.Server/Roles/RoleSystem.cs @@ -1,3 +1,5 @@ +using Content.Server.Changeling; +using Content.Shared._White.Cult.Components; using Content.Shared.Roles; namespace Content.Server.Roles; @@ -19,6 +21,8 @@ public sealed class RoleSystem : SharedRoleSystem SubscribeAntagEvents(); SubscribeAntagEvents(); SubscribeAntagEvents(); + SubscribeAntagEvents(); // WD EDIT + SubscribeAntagEvents(); // WD EDIT } public string? MindGetBriefing(EntityUid? mindId) diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs index 785d3678b0..821003afa3 100644 --- a/Content.Server/Station/Systems/StationSpawningSystem.cs +++ b/Content.Server/Station/Systems/StationSpawningSystem.cs @@ -20,6 +20,7 @@ using Content.Shared.Roles.Jobs; using Content.Shared.Station; using Content.Shared.StatusIcon; using Content.Shared._White.CharacterExamine; +using Content.Shared.NameIdentifier; using JetBrains.Annotations; using Robust.Shared.Configuration; using Robust.Shared.Map; @@ -215,15 +216,18 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem jobSpecial.AfterEquip(entity); } - if (prototype.ID.Contains("Cyborg")) + if (prototype.ID.Contains("Borg")) { + if (!TryComp(entity, out var identifier)) + return; + if (_randomizeCharacters || profile == null) { - _metaSystem.SetEntityName(entity, HumanoidCharacterProfile.GetBorgName()); + _metaSystem.SetEntityName(entity, $"{HumanoidCharacterProfile.GetBorgName()} {identifier.FullIdentifier}"); } else { - _metaSystem.SetEntityName(entity, profile.BorgName); + _metaSystem.SetEntityName(entity, $"{profile.BorgName} {identifier.FullIdentifier}"); } } diff --git a/Content.Server/_White/Carrying/CarryingSystem.cs b/Content.Server/_White/Carrying/CarryingSystem.cs index 197762943a..6ea8f3e5bb 100644 --- a/Content.Server/_White/Carrying/CarryingSystem.cs +++ b/Content.Server/_White/Carrying/CarryingSystem.cs @@ -110,7 +110,7 @@ namespace Content.Server.Carrying /// Basically using virtual item passthrough to throw the carried person. A new age! /// Maybe other things besides throwing should use virt items like this... /// - private void OnThrow(EntityUid uid, CarryingComponent component, BeforeThrowEvent args) + private void OnThrow(EntityUid uid, CarryingComponent component, ref BeforeThrowEvent args) { if (!TryComp(args.ItemUid, out var virtItem) || !HasComp(virtItem.BlockingEntity)) return; diff --git a/Content.Server/_White/Cult/ConstructComponent.cs b/Content.Server/_White/Cult/ConstructComponent.cs index 2f056dd460..fff47d46aa 100644 --- a/Content.Server/_White/Cult/ConstructComponent.cs +++ b/Content.Server/_White/Cult/ConstructComponent.cs @@ -7,4 +7,7 @@ public sealed partial class ConstructComponent : Component { [DataField("actions")] public List Actions = new(); + + [ViewVariables] + public List ActionEntities = new(); } diff --git a/Content.Server/_White/Cult/GameRule/CultRuleSystem.cs b/Content.Server/_White/Cult/GameRule/CultRuleSystem.cs index 06ab6927fd..9f034f465b 100644 --- a/Content.Server/_White/Cult/GameRule/CultRuleSystem.cs +++ b/Content.Server/_White/Cult/GameRule/CultRuleSystem.cs @@ -1,4 +1,5 @@ using System.Linq; +using Content.Server.Actions; using Content.Server.Chat.Managers; using Content.Server.GameTicking; using Content.Server.GameTicking.Rules; @@ -41,6 +42,7 @@ public sealed class CultRuleSystem : GameRuleSystem [Dependency] private readonly SharedRoleSystem _roleSystem = default!; [Dependency] private readonly JobSystem _jobSystem = default!; [Dependency] private readonly SharedMindSystem _mindSystem = default!; + [Dependency] private readonly ActionsSystem _actions = default!; private ISawmill _sawmill = default!; @@ -171,6 +173,11 @@ public sealed class CultRuleSystem : GameRuleSystem cultistsRule.CurrentCultists.Remove(component); + foreach (var empower in component.SelectedEmpowers) + { + _actions.RemoveAction(uid, empower); + } + RemoveCultistAppearance(uid); CheckRoundShouldEnd(); } diff --git a/Content.Server/_White/Cult/Runes/Systems/CultSystem.ConstructsAbilities.cs b/Content.Server/_White/Cult/Runes/Systems/CultSystem.ConstructsAbilities.cs index ec624f11e1..58bb189935 100644 --- a/Content.Server/_White/Cult/Runes/Systems/CultSystem.ConstructsAbilities.cs +++ b/Content.Server/_White/Cult/Runes/Systems/CultSystem.ConstructsAbilities.cs @@ -17,13 +17,11 @@ namespace Content.Server._White.Cult.Runes.Systems; public partial class CultSystem { [Dependency] private readonly TileSystem _tileSystem = default!; - [Dependency] private readonly EntityLookupSystem _lookupSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly TurfSystem _turf = default!; [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly ActionContainerSystem _actionContainer = default!; public void InitializeConstructsAbilities() { @@ -45,10 +43,9 @@ public partial class CultSystem private void OnMapInit(EntityUid uid, ConstructComponent component, MapInitEvent args) { - var comp = EnsureComp(uid); foreach (var id in component.Actions) { - _actionContainer.AddAction(uid, id, comp); + component.ActionEntities.Add(_actionsSystem.AddAction(uid, id)); } } @@ -67,6 +64,11 @@ public partial class CultSystem private void OnConstructComponentRemoved(EntityUid uid, ConstructComponent component, ComponentRemove args) { + foreach (var entity in component.ActionEntities) + { + _actionsSystem.RemoveAction(uid, entity); + } + var query = EntityQueryEnumerator(); while (query.MoveNext(out var ruleEnt, out var cultRuleComponent, out _)) { diff --git a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs index e4fe897873..560ad78688 100644 --- a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs +++ b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs @@ -32,6 +32,7 @@ using Content.Shared._White.Cult; using Content.Shared._White.Cult.Components; using Content.Shared._White.Cult.Runes; using Content.Shared._White.Cult.UI; +using Content.Shared.Mindshield.Components; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Audio.Components; @@ -61,7 +62,6 @@ public sealed partial class CultSystem : EntitySystem [Dependency] private readonly GunSystem _gunSystem = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly FlammableSystem _flammableSystem = default!; - [Dependency] private readonly SharedJobSystem _jobSystem = default!; public override void Initialize() @@ -419,15 +419,9 @@ public sealed partial class CultSystem : EntitySystem // Проверка, является ли жертва целью _entityManager.TryGetComponent(target?.CurrentEntity, out var targetMind); var isTarget = mind!.Mind!.Value == targetMind?.Mind!.Value; - var jobAllowConvert = true; - - if(_jobSystem.MindTryGetJob(mind.Mind!.Value, out var _, out var prototype)) - { - jobAllowConvert = prototype.CanBeAntag; - } // Выполнение действия в зависимости от условий - if (canBeConverted && jobAllowConvert && !isTarget) + if (canBeConverted && !HasComp(victim.Value) && !isTarget) { result = Convert(uid, victim.Value, args.User, args.Cultists); } @@ -1123,38 +1117,27 @@ public sealed partial class CultSystem : EntitySystem { var playerEntity = args.Session.AttachedEntity; - if (!playerEntity.HasValue || !TryComp(playerEntity, out var comp) || - !TryComp(playerEntity, out var actionsComponent)) + if (!playerEntity.HasValue || !TryComp(playerEntity, out var comp)) return; - var cultistsActions = 0; - - foreach (var userAction in actionsComponent.Actions) - { - var entityPrototypeId = MetaData(userAction).EntityPrototype?.ID; - if (entityPrototypeId != null && CultistComponent.CultistActions.Contains(entityPrototypeId)) - cultistsActions++; - } - var action = CultistComponent.CultistActions.FirstOrDefault(x => x.Equals(args.ActionType)); if (action == null) return; - EntityUid? actionId = null; if (component.IsRune) { - if (cultistsActions > component.MaxAllowedCultistActions) + if (comp.SelectedEmpowers.Count > component.MaxAllowedCultistActions) { _popupSystem.PopupEntity(Loc.GetString("cult-too-much-empowers"), uid); return; } - _actionsSystem.AddAction(playerEntity.Value, ref actionId, action); + comp.SelectedEmpowers.Add(_actionsSystem.AddAction(playerEntity.Value, action)); } - else if (cultistsActions < component.MinRequiredCultistActions) + else if (comp.SelectedEmpowers.Count < component.MinRequiredCultistActions) { - _actionsSystem.AddAction(playerEntity.Value, ref actionId, action); + comp.SelectedEmpowers.Add(_actionsSystem.AddAction(playerEntity.Value, action)); } } diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs index dc5dc5b90c..bfe748d8c5 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs @@ -364,6 +364,7 @@ public abstract partial class SharedGunSystem // No ammo returned. else { + CycleCartridge(uid, component, args.User); // WD EDIT return; } @@ -398,6 +399,7 @@ public abstract partial class SharedGunSystem } else { + SetBoltClosed(uid, component, false, user: args.User, appearance: appearance); // WD EDIT Appearance.SetData(uid, AmmoVisuals.MagLoaded, false, appearance); return; } diff --git a/Content.Shared/_White/Cult/Components/CultistComponent.cs b/Content.Shared/_White/Cult/Components/CultistComponent.cs index b0e806c00f..69048860ae 100644 --- a/Content.Shared/_White/Cult/Components/CultistComponent.cs +++ b/Content.Shared/_White/Cult/Components/CultistComponent.cs @@ -19,7 +19,7 @@ public sealed partial class CultistComponent : Component public CancellationTokenSource? HolyConvertToken; [NonSerialized] - public List SelectedEmpowers = new(); + public List SelectedEmpowers = new(); public static string SummonCultDaggerAction = "InstantActionSummonCultDagger"; diff --git a/Resources/Changelog/Parts/parts_22510.yaml b/Resources/Changelog/Parts/parts_22510.yaml deleted file mode 100644 index 84133098a6..0000000000 --- a/Resources/Changelog/Parts/parts_22510.yaml +++ /dev/null @@ -1,4 +0,0 @@ -author: ficcialfaint and deltanedas -changes: -- type: Add - message: Criminal records and the console that manages them have been added to the game. They also have a guidebook entry. diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index cc79c46c74..167a8ad4e2 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -237,14 +237,13 @@ components: - type: StorageFill contents: - - id: ClothingEyesHudSecurity - id: WeaponDisabler - id: ClothingOuterCoatHoSTrench - id: ClothingOuterHardsuitSecurityRed - id: ClothingMaskGasSwat - id: ClothingBeltSecurityFilled - id: ClothingHeadsetAltSecurity - - id: ClothingEyesGlassesSunglasses + - id: ClothingEyesGlassesSecurity - id: ClothingShoesBootsJack - id: CigarGoldCase prob: 0.50 @@ -263,7 +262,6 @@ components: - type: StorageFill contents: - - id: ClothingEyesHudSecurity - id: WeaponEgun - id: ClothingHeadHatBeretHoS - id: ClothingHeadHatHoshat @@ -271,7 +269,7 @@ - id: ClothingOuterCoatHoSTrench - id: ClothingBeltSecurityFilled - id: ClothingHeadsetAltSecurity - - id: ClothingEyesGlassesSunglasses + - id: ClothingEyesGlassesSecurity - id: ClothingShoesBootsJack - id: CigarGoldCase prob: 0.50 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index b73a9ce32d..909c42719e 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -10,7 +10,7 @@ prob: 0.3 - id: ClothingBeltSecurityFilled - id: Flash - - id: ClothingEyesGlassesSunglasses + - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetAltSecurity - id: ClothingHandsGlovesCombat - id: ClothingShoesBootsJack @@ -20,7 +20,6 @@ - id: DoorRemoteArmory - id: ClothingOuterHardsuitWarden - id: HoloprojectorSecurity - - id: ClothingEyesHudSecurity - id: BoxBodyCamera - type: entity @@ -36,7 +35,7 @@ - id: ClothingHeadHatBeretWarden - id: ClothingBeltSecurityFilled - id: Flash - - id: ClothingEyesGlassesSunglasses + - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetAltSecurity - id: ClothingHandsGlovesCombat - id: ClothingShoesBootsJack @@ -45,7 +44,6 @@ - id: RubberStampWarden - id: DoorRemoteArmory - id: HoloprojectorSecurity - - id: ClothingEyesHudSecurity - id: BoxBodyCamera - type: entity @@ -64,13 +62,12 @@ - id: ClothingBeltSecurityFilled - id: Flash prob: 0.5 - - id: ClothingEyesGlassesSunglasses + - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetSecurity - id: ClothingHandsGlovesColorBlack - id: ClothingShoesBootsJack - id: WeaponMeleeNeedle prob: 0.1 - - id: ClothingEyesHudSecurity - id: WeaponDisabler - id: HoloprojectorSecurity prob: 0.6 @@ -82,7 +79,6 @@ components: - type: StorageFill contents: - - id: ClothingEyesHudSecurity - id: WeaponDisabler - id: TrackingImplanter amount: 2 @@ -118,8 +114,6 @@ components: - type: StorageFill contents: - - id: ClothingEyesHudSecurity - prob: 0.3 - id: ClothingHeadHatFedoraBrown - id: ClothingNeckTieDet - id: ClothingOuterVestDetective diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index 695f7e98af..cc67a0a8dc 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -12,6 +12,7 @@ ClothingEyesGlassesSunglasses: 2 ClothingEyesHudSecurity: 2 ClothingEyesEyepatchHudSecurity: 1 + ClothingEyesGlassesSecurity: 4 ClothingBeltSecurityWebbing: 5 Zipties: 12 RiotShield: 2 diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 0e3d5521c6..13c99c54fb 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -29,8 +29,6 @@ - Command - Brig special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant ] - !type:AddComponentSpecial components: - type: CommandStaff diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 4803d67c6e..e9e9405098 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -51,8 +51,6 @@ - Atmospherics - Medical special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant ] - !type:AddComponentSpecial components: - type: CommandStaff diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index fe27a75a33..018fec37f8 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -31,8 +31,6 @@ - Atmospherics - Brig special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant ] - !type:AddComponentSpecial components: - type: CommandStaff diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index e58038055e..df38550b93 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -28,8 +28,6 @@ - ChiefMedicalOfficer - Brig special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant ] - !type:AddComponentSpecial components: - type: CommandStaff diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 0851e15e97..784c4724a8 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -25,8 +25,6 @@ - ResearchDirector - Brig special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant ] - !type:AddComponentSpecial components: - type: CommandStaff diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index cc6d9b4f85..989c831634 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -31,7 +31,7 @@ jumpsuit: ClothingUniformJumpsuitDetective back: ClothingBackpackSecurityFilledDetective shoes: ClothingShoesBootsCombatFilled - eyes: ClothingEyesGlassesSunglasses + eyes: ClothingEyesGlassesSecurity head: ClothingHeadHatFedoraBrown outerClothing: ClothingOuterVestDetective id: DetectivePDA diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index efdcbe8ee9..069afc42e3 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -44,7 +44,7 @@ back: ClothingBackpackHOSFilled shoes: ClothingShoesBootsCombatFilled outerClothing: ClothingOuterCoatHoSTrench - eyes: ClothingEyesGlassesSunglasses + eyes: ClothingEyesGlassesSecurity head: ClothingHeadHatBeretHoS id: HoSPDA gloves: ClothingHandsGlovesCombat diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 74bc03f05c..e40fb8a849 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -29,7 +29,7 @@ jumpsuit: ClothingUniformJumpsuitSec back: ClothingBackpackSecurityFilled shoes: ClothingShoesBootsCombatFilled - eyes: ClothingEyesGlassesSunglasses + eyes: ClothingEyesGlassesSecurity head: ClothingHeadHelmetBasic outerClothing: ClothingOuterArmorBasic id: SecurityPDA diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index faef96969e..64546fca80 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -32,7 +32,7 @@ jumpsuit: ClothingUniformJumpsuitWarden back: ClothingBackpackSecurityFilled shoes: ClothingShoesBootsCombatFilled - eyes: ClothingEyesGlassesSunglasses + eyes: ClothingEyesGlassesSecurity outerClothing: ClothingOuterCoatWarden id: WardenPDA ears: ClothingHeadsetSecurity diff --git a/Resources/clientCommandPerms.yml b/Resources/clientCommandPerms.yml index a724f640f1..3947a610f2 100644 --- a/Resources/clientCommandPerms.yml +++ b/Resources/clientCommandPerms.yml @@ -25,6 +25,8 @@ - gcf - gc - gc_mode + - resetent + - resetallents - cvar - midipanic - replay_recording_start @@ -50,8 +52,6 @@ - hidemechanisms - showmechanisms - menuvis - - resetent - - resetallents - togglehealthoverlay - toggledecals - nodevis