From 9c4126d3a2765cd69fa4d37d61c21feb50c137b6 Mon Sep 17 00:00:00 2001 From: ThereDrD0 <88589686+ThereDrD0@users.noreply.github.com> Date: Sat, 20 Jul 2024 05:08:01 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=81=D1=8F=D0=BA=D0=B8=D0=B5=20=D1=82?= =?UTF-8?q?=D0=B2=D0=B8=D0=BA=D0=B8=20(#467)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * tomato juice no longer slippery * flashbang rework * add starting gear support for flashbang rework * flash size and charges tweak * night and thermal vision tweaks * night vision is turned off by default * some size tweaks * cleanup * sunglasses and hardsuits tweak --- .../Explosion/EntitySystems/TriggerSystem.cs | 2 +- Content.Server/Flash/FlashSystem.cs | 8 ++- .../Components/FlashOnTriggerComponent.cs | 1 + .../Systems/SharedNightVisionSystem.cs | 6 ++- .../Systems/SharedThermalVisionSystem.cs | 6 ++- .../FlashSoundSuppressionComponent.cs | 9 ++++ .../FlashSoundSuppressionSystem.cs | 17 +++++++ .../Systems/ClothingGrantingSystem.cs | 14 ++--- .../_White/Overlays/NightVisionComponent.cs | 7 ++- .../_White/Overlays/ThermalVisionComponent.cs | 5 +- .../Audio/White/Items/Goggles/activate.ogg | Bin 0 -> 12048 bytes .../Audio/White/Items/Goggles/deactivate.ogg | Bin 0 -> 12424 bytes .../entities/clothing/ears/headsets_alt.ftl | 3 ++ .../Catalog/Fills/Lockers/dressers.yml | 2 +- .../Catalog/Fills/Lockers/heads.yml | 2 +- .../Entities/Clothing/Ears/headsets_alt.yml | 20 +++++++- .../Entities/Clothing/Eyes/glasses.yml | 6 +-- .../Clothing/Head/hardsuit-helmets.yml | 45 +++++++++++----- .../Objects/Consumable/Drinks/drinks_cans.yml | 2 + .../Prototypes/Entities/Objects/Tools/gps.yml | 1 + .../Objects/Weapons/Throwable/grenades.yml | 5 +- .../Entities/Objects/Weapons/security.yml | 6 +-- .../Loadouts/Jobs/Security/common.yml | 8 +++ .../Prototypes/Loadouts/loadout_groups.yml | 15 +++--- .../Prototypes/Loadouts/role_loadouts.yml | 12 ++--- .../Reagents/Consumable/Drink/juice.yml | 1 + .../Roles/Jobs/Cargo/quartermaster.yml | 2 +- .../Roles/Jobs/Engineering/chief_engineer.yml | 2 +- .../Roles/Jobs/Justice/inspector.yml | 2 +- .../Jobs/Medical/chief_medical_officer.yml | 2 +- .../Roles/Jobs/Science/research_director.yml | 2 +- .../Roles/Jobs/Security/detective.yml | 2 +- .../Roles/Jobs/Security/head_of_security.yml | 2 +- .../Roles/Jobs/Security/security_cadet.yml | 2 +- .../Roles/Jobs/Security/security_officer.yml | 2 +- .../Roles/Jobs/Security/senior_officer.yml | 2 +- .../Prototypes/Roles/Jobs/Security/warden.yml | 2 +- Resources/Prototypes/_White/Actions/types.yml | 2 +- .../Clothing/Head/night_vision_goggle.yml | 4 +- .../_White/Entities/Cult/Items/tome_craft.yml | 3 +- .../nightvision.rsi/equipped-EYES-off.png | Bin 0 -> 452 bytes .../Glasses/nightvision.rsi/equipped-EYES.png | Bin 0 -> 719 bytes .../Glasses}/nightvision.rsi/icon.png | Bin .../Glasses}/nightvision.rsi/inhand-left.png | Bin .../Glasses}/nightvision.rsi/inhand-right.png | Bin .../Eyes/Glasses/nightvision.rsi/meta.json | 48 ++++++++++++++++++ .../Glasses/thermal.rsi/equipped-EYES.png | Bin 0 -> 524 bytes .../Eyes/Glasses/thermal.rsi/icon.png | Bin 0 -> 510 bytes .../Eyes/Glasses/thermal.rsi/inhand-left.png | Bin 0 -> 327 bytes .../Eyes/Glasses/thermal.rsi/inhand-right.png | Bin 0 -> 325 bytes .../Glasses/thermal.rsi}/meta.json | 0 .../Head/nightvision.rsi/equipped-EYES.png | Bin 387 -> 0 bytes 52 files changed, 214 insertions(+), 68 deletions(-) create mode 100644 Content.Shared/_White/BuffedFlashGrenade/FlashSoundSuppressionComponent.cs create mode 100644 Content.Shared/_White/BuffedFlashGrenade/FlashSoundSuppressionSystem.cs create mode 100644 Resources/Audio/White/Items/Goggles/activate.ogg create mode 100644 Resources/Audio/White/Items/Goggles/deactivate.ogg create mode 100644 Resources/Textures/White/Clothing/Eyes/Glasses/nightvision.rsi/equipped-EYES-off.png create mode 100644 Resources/Textures/White/Clothing/Eyes/Glasses/nightvision.rsi/equipped-EYES.png rename Resources/Textures/White/Clothing/{Head => Eyes/Glasses}/nightvision.rsi/icon.png (100%) rename Resources/Textures/White/Clothing/{Head => Eyes/Glasses}/nightvision.rsi/inhand-left.png (100%) rename Resources/Textures/White/Clothing/{Head => Eyes/Glasses}/nightvision.rsi/inhand-right.png (100%) create mode 100644 Resources/Textures/White/Clothing/Eyes/Glasses/nightvision.rsi/meta.json create mode 100644 Resources/Textures/White/Clothing/Eyes/Glasses/thermal.rsi/equipped-EYES.png create mode 100644 Resources/Textures/White/Clothing/Eyes/Glasses/thermal.rsi/icon.png create mode 100644 Resources/Textures/White/Clothing/Eyes/Glasses/thermal.rsi/inhand-left.png create mode 100644 Resources/Textures/White/Clothing/Eyes/Glasses/thermal.rsi/inhand-right.png rename Resources/Textures/White/Clothing/{Head/nightvision.rsi => Eyes/Glasses/thermal.rsi}/meta.json (100%) delete mode 100644 Resources/Textures/White/Clothing/Head/nightvision.rsi/equipped-EYES.png diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs index 3675c214b1..b8d7389533 100644 --- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs +++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs @@ -153,7 +153,7 @@ namespace Content.Server.Explosion.EntitySystems private void HandleFlashTrigger(EntityUid uid, FlashOnTriggerComponent component, TriggerEvent args) { // TODO Make flash durations sane ffs. - _flashSystem.FlashArea(uid, args.User, component.Range, component.Duration * 1000f, probability: component.Probability); + _flashSystem.FlashArea(uid, args.User, component.Range, component.Duration * 1000f, probability: component.Probability, forceStun: component.ForceStun); // WD edit args.Handled = true; } diff --git a/Content.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs index 148c45c8a2..2e5a713192 100644 --- a/Content.Server/Flash/FlashSystem.cs +++ b/Content.Server/Flash/FlashSystem.cs @@ -4,6 +4,7 @@ using Content.Shared.Flash.Components; using Content.Server.Light.EntitySystems; using Content.Server.Popups; using Content.Server.Stunnable; +using Content.Shared._White.BuffedFlashGrenade; using Content.Shared.Charges.Components; using Content.Shared.Charges.Systems; using Content.Shared.Eye.Blinding.Components; @@ -38,6 +39,7 @@ namespace Content.Server.Flash [Dependency] private readonly TagSystem _tag = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; + [Dependency] private readonly FlashSoundSuppressionSystem _flashSoundSuppressionSystem = default!; public override void Initialize() { @@ -152,7 +154,8 @@ namespace Content.Server.Flash } } - public void FlashArea(Entity source, EntityUid? user, float range, float duration, float slowTo = 0.8f, bool displayPopup = false, float probability = 1f, SoundSpecifier? sound = null) + // WD edit + public void FlashArea(Entity source, EntityUid? user, float range, float duration, float slowTo = 0.8f, bool displayPopup = false, float probability = 1f, SoundSpecifier? sound = null, bool forceStun = false) { var transform = Transform(source); var mapPosition = _transform.GetMapCoordinates(transform); @@ -175,6 +178,9 @@ namespace Content.Server.Flash // They shouldn't have flash removed in between right? Flash(entity, user, source, duration, slowTo, displayPopup); + + if (forceStun) // WD + _flashSoundSuppressionSystem.Stun(entity, duration); } _audio.PlayPvs(sound, source, AudioParams.Default.WithVolume(1f).WithMaxDistance(3f)); diff --git a/Content.Shared/Flash/Components/FlashOnTriggerComponent.cs b/Content.Shared/Flash/Components/FlashOnTriggerComponent.cs index 7658ca0ae5..3f174db29d 100644 --- a/Content.Shared/Flash/Components/FlashOnTriggerComponent.cs +++ b/Content.Shared/Flash/Components/FlashOnTriggerComponent.cs @@ -10,4 +10,5 @@ public sealed partial class FlashOnTriggerComponent : Component [DataField] public float Range = 1.0f; [DataField] public float Duration = 8.0f; [DataField] public float Probability = 1.0f; + [DataField] public bool ForceStun; // WD } diff --git a/Content.Shared/_Miracle/Systems/SharedNightVisionSystem.cs b/Content.Shared/_Miracle/Systems/SharedNightVisionSystem.cs index b414de944d..b81792167e 100644 --- a/Content.Shared/_Miracle/Systems/SharedNightVisionSystem.cs +++ b/Content.Shared/_Miracle/Systems/SharedNightVisionSystem.cs @@ -48,7 +48,11 @@ public abstract class SharedNightVisionSystem : EntitySystem return; component.IsActive = !component.IsActive; - _audio.PlayPredicted(component.ToggleSound, uid, uid); + + if (component.IsActive && component.ActivateSound != null) + _audio.PlayPredicted(component.ActivateSound, uid, uid); + else if (component.DeactivateSound != null) + _audio.PlayPredicted(component.DeactivateSound, uid, uid); args.Handled = true; diff --git a/Content.Shared/_Miracle/Systems/SharedThermalVisionSystem.cs b/Content.Shared/_Miracle/Systems/SharedThermalVisionSystem.cs index 08bc64675a..7c36bd2cbd 100644 --- a/Content.Shared/_Miracle/Systems/SharedThermalVisionSystem.cs +++ b/Content.Shared/_Miracle/Systems/SharedThermalVisionSystem.cs @@ -48,7 +48,11 @@ public abstract class SharedThermalVisionSystem : EntitySystem return; component.IsActive = !component.IsActive; - _audio.PlayPredicted(component.ToggleSound, uid, uid); + + if (component.IsActive && component.ActivateSound != null) + _audio.PlayPredicted(component.ActivateSound, uid, uid); + else if (component.DeactivateSound != null) + _audio.PlayPredicted(component.DeactivateSound, uid, uid); args.Handled = true; diff --git a/Content.Shared/_White/BuffedFlashGrenade/FlashSoundSuppressionComponent.cs b/Content.Shared/_White/BuffedFlashGrenade/FlashSoundSuppressionComponent.cs new file mode 100644 index 0000000000..190af15af6 --- /dev/null +++ b/Content.Shared/_White/BuffedFlashGrenade/FlashSoundSuppressionComponent.cs @@ -0,0 +1,9 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._White.BuffedFlashGrenade; + +[RegisterComponent, NetworkedComponent] +public sealed partial class FlashSoundSuppressionComponent : Component +{ + +} diff --git a/Content.Shared/_White/BuffedFlashGrenade/FlashSoundSuppressionSystem.cs b/Content.Shared/_White/BuffedFlashGrenade/FlashSoundSuppressionSystem.cs new file mode 100644 index 0000000000..803538e9a3 --- /dev/null +++ b/Content.Shared/_White/BuffedFlashGrenade/FlashSoundSuppressionSystem.cs @@ -0,0 +1,17 @@ +using Content.Shared.Inventory.Events; +using Content.Shared.Stunnable; + +namespace Content.Shared._White.BuffedFlashGrenade; + +public sealed class FlashSoundSuppressionSystem : EntitySystem +{ + [Dependency] private readonly SharedStunSystem _stunSystem = default!; + + public void Stun(EntityUid target, float duration) + { + if (HasComp(target)) + return; + + _stunSystem.TryParalyze(target, TimeSpan.FromSeconds(duration / 1000f), true); + } +} diff --git a/Content.Shared/_White/ClothingGrant/Systems/ClothingGrantingSystem.cs b/Content.Shared/_White/ClothingGrant/Systems/ClothingGrantingSystem.cs index 104d6bcf0f..bd67e508e6 100644 --- a/Content.Shared/_White/ClothingGrant/Systems/ClothingGrantingSystem.cs +++ b/Content.Shared/_White/ClothingGrant/Systems/ClothingGrantingSystem.cs @@ -28,9 +28,11 @@ public sealed class ClothingGrantingSystem : EntitySystem if (_timing.ApplyingState) return; - if (!TryComp(uid, out var clothing)) return; + if (!TryComp(uid, out var clothing)) + return; - if (!clothing.Slots.HasFlag(args.SlotFlags)) return; + if (!clothing.Slots.HasFlag(args.SlotFlags)) + return; if (component.Components.Count > 8) { @@ -53,7 +55,7 @@ public sealed class ClothingGrantingSystem : EntitySystem } component.IsActive = true; - Dirty(component); + Dirty(uid, component); } private void OnCompUnequip(EntityUid uid, ClothingGrantComponentComponent component, GotUnequippedEvent args) @@ -68,7 +70,7 @@ public sealed class ClothingGrantingSystem : EntitySystem } component.IsActive = false; - Dirty(component); + Dirty(uid, component); } private void OnTagEquip(EntityUid uid, ClothingGrantTagComponent component, GotEquippedEvent args) @@ -81,7 +83,7 @@ public sealed class ClothingGrantingSystem : EntitySystem _tagSystem.AddTag(args.Equipee, component.Tag); component.IsActive = true; - Dirty(component); + Dirty(uid, component); } private void OnTagUnequip(EntityUid uid, ClothingGrantTagComponent component, GotUnequippedEvent args) @@ -91,6 +93,6 @@ public sealed class ClothingGrantingSystem : EntitySystem _tagSystem.RemoveTag(args.Equipee, component.Tag); component.IsActive = false; - Dirty(component); + Dirty(uid, component); } } diff --git a/Content.Shared/_White/Overlays/NightVisionComponent.cs b/Content.Shared/_White/Overlays/NightVisionComponent.cs index 3ffb5b860d..9c27c271a8 100644 --- a/Content.Shared/_White/Overlays/NightVisionComponent.cs +++ b/Content.Shared/_White/Overlays/NightVisionComponent.cs @@ -12,10 +12,13 @@ public sealed partial class NightVisionComponent : BaseNvOverlayComponent public override Color Color { get; set; } = Color.FromHex("#98FB98"); [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] - public bool IsActive = true; + public bool IsActive; [DataField] - public SoundSpecifier? ToggleSound = new SoundPathSpecifier("/Audio/Items/flashlight_pda.ogg"); + public SoundSpecifier? ActivateSound = new SoundPathSpecifier("/Audio/White/Items/Goggles/activate.ogg"); + + [DataField] + public SoundSpecifier? DeactivateSound = new SoundPathSpecifier("/Audio/White/Items/Goggles/deactivate.ogg"); [DataField] public EntProtoId? ToggleAction = "ToggleNightVision"; diff --git a/Content.Shared/_White/Overlays/ThermalVisionComponent.cs b/Content.Shared/_White/Overlays/ThermalVisionComponent.cs index cbd786d225..7e081a138b 100644 --- a/Content.Shared/_White/Overlays/ThermalVisionComponent.cs +++ b/Content.Shared/_White/Overlays/ThermalVisionComponent.cs @@ -15,7 +15,10 @@ public sealed partial class ThermalVisionComponent : BaseNvOverlayComponent public bool IsActive = true; [DataField] - public SoundSpecifier? ToggleSound = new SoundPathSpecifier("/Audio/Items/flashlight_pda.ogg"); + public SoundSpecifier? ActivateSound = new SoundPathSpecifier("/Audio/White/Items/Goggles/activate.ogg"); + + [DataField] + public SoundSpecifier? DeactivateSound = new SoundPathSpecifier("/Audio/White/Items/Goggles/deactivate.ogg"); [DataField] public EntProtoId? ToggleAction = "ToggleThermalVision"; diff --git a/Resources/Audio/White/Items/Goggles/activate.ogg b/Resources/Audio/White/Items/Goggles/activate.ogg new file mode 100644 index 0000000000000000000000000000000000000000..96cdb288fe07d0e1d3c0f38774cb7ffe01624724 GIT binary patch literal 12048 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 literal 0 HcmV?d00001 diff --git a/Resources/Audio/White/Items/Goggles/deactivate.ogg b/Resources/Audio/White/Items/Goggles/deactivate.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e1e8f4fd82fcfa0b0c01c28b4ec93f53bbb2c2de GIT binary patch literal 12424 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 Z{kT65Jzel|`M;>-Z+o;iR#cM${||7Ja3cT! literal 0 HcmV?d00001 diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl index e7676f2a40..4d12d4c353 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl @@ -13,6 +13,9 @@ ent-ClothingHeadsetAltMedical = полноразмерная медицинск ent-ClothingHeadsetAltSecurity = полноразмерная охранная гарнитура .desc = { ent-ClothingHeadsetAlt.desc } .suffix = { "" } +ent-ClothingHeadsetAltSecurityCommand = { ent-ClothingHeadsetAltSecurity } + .desc = { ent-ClothingHeadsetAlt.desc } + .suffix = { "" } ent-ClothingHeadsetAltEngineering = полноразмерная инженерная гарнитура .desc = { ent-ClothingHeadsetAlt.desc } .suffix = { "" } diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index 17f00d091f..dc1a0325e3 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -93,7 +93,7 @@ - id: ClothingHandsGlovesCombat - id: ClothingShoesBootsJack - id: ClothingEyesGlassesSecurity - - id: ClothingHeadsetAltSecurity + - id: ClothingHeadsetAltSecurityCommand - id: ClothingMaskGasSwat - id: ClothingOuterCoatHoSTrench diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 8ab18cbcb8..876150fe6f 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -324,5 +324,5 @@ - id: ClothingUniformJumpskirtInspector - id: ClothingUniformJumpskirtInspectorFormal - id: ClothingHandsGlovesInspector - - id: ClothingHeadsetAltSecurity + - id: ClothingHeadsetAltSecurityCommand - id: RubberStampInspector diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index 9dd72691b5..0d1c1b8131 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -9,6 +9,9 @@ state: icon_alt - type: Clothing equippedPrefix: alt + - type: ClothingGrantComponent # WD + component: + - type: FlashSoundSuppression - type: entity parent: ClothingHeadsetAlt @@ -108,13 +111,28 @@ containers: key_slots: - EncryptionKeySecurity - - EncryptionKeyCommand - EncryptionKeyCommon - type: Sprite sprite: Clothing/Ears/Headsets/security.rsi - type: Clothing sprite: Clothing/Ears/Headsets/security.rsi +- type: entity # WD + parent: ClothingHeadsetAlt + id: ClothingHeadsetAltSecurityCommand + name: head of security's over-ear headset + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeySecurity + - EncryptionKeyCommand + - EncryptionKeyCommon + - type: Sprite + sprite: Clothing/Ears/Headsets/command.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/command.rsi + - type: entity parent: ClothingHeadsetAlt id: ClothingHeadsetAltScience diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 3191f44b3f..d0b671151d 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -148,7 +148,6 @@ components: - type: FlashImmunity - type: EyeProtection - protectionTime: 5 - type: Tag tags: - Sunglasses @@ -167,7 +166,6 @@ sprite: Clothing/Eyes/Glasses/secglasses.rsi - type: FlashImmunity - type: EyeProtection - protectionTime: 5 - type: Construction graph: GlassesSecHUD node: glassesSec @@ -232,9 +230,9 @@ description: Thermals in the shape of glasses. components: - type: Sprite - sprite: Clothing/Eyes/Glasses/thermal.rsi + sprite: White/Clothing/Eyes/Glasses/thermal.rsi - type: Clothing - sprite: Clothing/Eyes/Glasses/thermal.rsi + sprite: White/Clothing/Eyes/Glasses/thermal.rsi - type: ClothingGrantComponent component: - type: ThermalVision diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 31b659e492..95077cdf5c 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -61,6 +61,7 @@ - type: TemperatureProtection coefficient: 0.005 - type: EyeProtection # WD edit + - type: FlashImmunity # WD #Engineering Hardsuit - type: entity @@ -80,6 +81,7 @@ highPressureMultiplier: 0.1 lowPressureMultiplier: 1000 - type: EyeProtection # WD edit + - type: FlashImmunity # WD #Spationaut Hardsuit - type: entity @@ -183,6 +185,9 @@ Piercing: 0.9 Heat: 0.9 - type: FlashImmunity # WD edit + - type: ClothingGrantComponent # WD + component: + - type: FlashSoundSuppression #Brigmedic Hardsuit - type: entity @@ -210,6 +215,9 @@ - type: PressureProtection highPressureMultiplier: 0.6 lowPressureMultiplier: 1000 + - type: ClothingGrantComponent # WD + component: + - type: FlashSoundSuppression #Warden's Hardsuit - type: entity @@ -236,6 +244,9 @@ Piercing: 0.9 Heat: 0.9 - type: FlashImmunity # WD edit + - type: ClothingGrantComponent # WD + component: + - type: FlashSoundSuppression #Captain's Hardsuit - type: entity @@ -252,6 +263,9 @@ - type: PressureProtection highPressureMultiplier: 0.3 lowPressureMultiplier: 1000 + - type: ClothingGrantComponent # WD + component: + - type: FlashSoundSuppression #Inspector's Hardsuit - type: entity @@ -287,6 +301,7 @@ highPressureMultiplier: 0.08 lowPressureMultiplier: 1000 - type: EyeProtection # WD edit + - type: FlashImmunity # WD #Chief Medical Officer's Hardsuit - type: entity @@ -349,6 +364,9 @@ Piercing: 0.9 Heat: 0.9 - type: FlashImmunity + - type: ClothingGrantComponent # WD + component: + - type: FlashSoundSuppression #Luxury Mining Hardsuit - type: entity @@ -368,6 +386,7 @@ - type: PointLight radius: 7 energy: 3 + - type: EyeProtection # WD edit #Head of Personnel's Hardsuit WD - type: entity @@ -410,8 +429,8 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 - - type: FlashImmunity # WD edit - type: EyeProtection # WD edit + - type: FlashImmunity # WD #Blood-red Medic Hardsuit - type: entity @@ -437,8 +456,8 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 - - type: FlashImmunity # WD edit - type: EyeProtection # WD edit + - type: FlashImmunity # WD #Syndicate Elite Hardsuit - type: entity @@ -466,8 +485,8 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 - - type: FlashImmunity # WD edit - type: EyeProtection # WD edit + - type: FlashImmunity # WD #Syndicate Commander Hardsuit - type: entity @@ -493,8 +512,8 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 - - type: FlashImmunity # WD edit - type: EyeProtection # WD edit + - type: FlashImmunity # WD #Cybersun Juggernaut Hardsuit - type: entity @@ -518,8 +537,8 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 - - type: FlashImmunity # WD edit - type: EyeProtection # WD edit + - type: FlashImmunity # WD #Wizard Hardsuit - type: entity @@ -546,8 +565,6 @@ Piercing: 0.9 Heat: 0.9 - type: WizardClothes - - type: FlashImmunity - - type: EyeProtection #Organic Space Suit - type: entity @@ -621,8 +638,8 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 - - type: FlashImmunity # WD edit - type: EyeProtection # WD edit + - type: FlashImmunity # WD #ERT Chaplain Hardsuit - type: entity @@ -660,8 +677,8 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 - - type: FlashImmunity # WD edit - type: EyeProtection # WD edit + - type: FlashImmunity # WD #ERT Medical Hardsuit - type: entity @@ -677,8 +694,8 @@ sprite: Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi - type: PointLight color: "#adffec" - - type: FlashImmunity # WD edit - type: EyeProtection # WD edit + - type: FlashImmunity # WD #ERT Security Hardsuit - type: entity @@ -701,8 +718,8 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 - - type: FlashImmunity # WD edit - type: EyeProtection # WD edit + - type: FlashImmunity # WD #ERT Janitor Hardsuit - type: entity @@ -718,8 +735,8 @@ sprite: Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi - type: PointLight color: "#cbadff" - - type: FlashImmunity # WD edit - type: EyeProtection # WD edit + - type: FlashImmunity # WD #CBURN Hardsuit - type: entity @@ -759,8 +776,8 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 - - type: FlashImmunity # WD edit - type: EyeProtection # WD edit + - type: FlashImmunity # WD #Deathsquad Hardsuit - type: entity @@ -786,8 +803,8 @@ Heat: 0.80 Radiation: 0.80 Caustic: 0.95 - - type: FlashImmunity # WD edit - type: EyeProtection # WD edit + - type: FlashImmunity # WD - type: ShowHealthBars damageContainers: - Biological diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index ba53e455c9..1379a25c89 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -4,6 +4,8 @@ id: DrinkCanBaseFull abstract: true components: + - type: Item + size: Tiny - type: Drink - type: Openable - type: Shakeable diff --git a/Resources/Prototypes/Entities/Objects/Tools/gps.yml b/Resources/Prototypes/Entities/Objects/Tools/gps.yml index 8ae34573ff..482ea96307 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gps.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gps.yml @@ -11,6 +11,7 @@ - state: active - type: Item sprite: Objects/Devices/gps.rsi + size: Tiny - type: HandheldGPS - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index 5b39fd357d..c58c7f7113 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -66,7 +66,8 @@ - type: Sprite sprite: Objects/Weapons/Grenades/flashbang.rsi - type: FlashOnTrigger - range: 7 + range: 5 + forceStun: true # WD - type: SoundOnTrigger sound: path: "/Audio/Effects/flash_bang.ogg" @@ -350,7 +351,7 @@ parent: GrenadeBase id: SmokeGrenade name: smoke grenade - description: A tactical grenade that releases a large, long-lasting cloud of smoke when used. + description: A tactical grenade that releases a large, long-lasting cloud of smoke when used. components: - type: Sprite sprite: Objects/Weapons/Grenades/smoke.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index 0c547cae22..21097aac66 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -138,8 +138,8 @@ shader: unshaded - type: Flash - type: LimitedCharges - maxCharges: 5 - charges: 5 + maxCharges: 7 + charges: 7 - type: MeleeWeapon canHeavyAttack: false wideAnimationRotation: 180 @@ -148,7 +148,7 @@ Blunt: 0 # melee weapon to allow flashing individual targets angle: 10 - type: Item - size: Small + size: Tiny sprite: Objects/Weapons/Melee/flash.rsi - type: UseDelay - type: StaticPrice diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/common.yml b/Resources/Prototypes/Loadouts/Jobs/Security/common.yml index 5a64004a35..ac569befe4 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/common.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/common.yml @@ -22,6 +22,14 @@ equipment: SecurityCommandHeadset - type: startingGear id: SecurityCommandHeadset + equipment: + ears: ClothingHeadsetAltSecurityCommand + +- type: itemLoadout + id: SecurityHeadsetFull + equipment: SecurityHeadsetFull +- type: startingGear + id: SecurityHeadsetFull equipment: ears: ClothingHeadsetAltSecurity diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 97a6baf8aa..aa255fe71c 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -161,7 +161,6 @@ id: CommonCommandHeadset name: loadout-group-ears loadouts: - - CommandHeadset - CommandHeadsetAlt # Civilian @@ -767,7 +766,6 @@ id: QuartermasterHeadset name: loadout-group-ears loadouts: - - QuartermasterHeadset - QuartermasterHeadsetAlt - type: loadoutGroup @@ -985,7 +983,6 @@ id: ChiefEngineerHeadset name: loadout-group-ears loadouts: - - ChiefEngineerHeadset - ChiefEngineerHeadsetAlt - type: loadoutGroup @@ -1224,7 +1221,6 @@ id: ResearchDirectorHeadset name: loadout-group-ears loadouts: - - ResearchDirectorHeadset - ResearchDirectorHeadsetAlt - type: loadoutGroup @@ -1604,6 +1600,12 @@ loadouts: - SecurityCommandHeadset +- type: loadoutGroup + id: CommonSecurityHeadsetFull + name: loadout-group-ears + loadouts: + - SecurityHeadsetFull + - type: loadoutGroup id: CommonSecurityBackpack name: loadout-group-backpack @@ -1636,10 +1638,9 @@ - CowboyWhite - type: loadoutGroup # WD - id: ChiefMedicalOfficerEars + id: ChiefMedicalOfficerHeadset name: loadout-group-ears loadouts: - - CMOHeadset - CMOHeadsetAlt - type: loadoutGroup @@ -2029,9 +2030,7 @@ id: InspectorBackpack name: loadout-group-backpack loadouts: - - InspectorBackpack - InspectorSatchel - - InspectorDuffel - CommonSatchelLeather - type: loadoutGroup # WD diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index f14a9b5069..e2d7aba241 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -385,7 +385,7 @@ id: JobWarden groups: - WardenHead - - CommonSecurityCommandHeadset # WD + - CommonSecurityHeadsetFull # WD - CommonSecurityCommandMask # WD - CommonSecurityNeck - WardenJumpsuit @@ -399,7 +399,7 @@ id: JobSeniorOfficer groups: - CommonSecurityHead - - CommonSecurityHeadset # WD + - CommonSecurityHeadsetFull # WD - CommonSecurityCommandMask # WD - CommonSecurityNeck - SeniorOfficerJumpsuit @@ -414,7 +414,7 @@ id: JobSecurityOfficer groups: - CommonSecurityHead - - CommonSecurityHeadset # WD + - CommonSecurityHeadsetFull # WD - CommonSecurityMask # WD - CommonSecurityNeck # WD - SecurityJumpsuit @@ -430,7 +430,7 @@ id: JobDetective groups: - DetectiveHead - - CommonSecurityHeadset # WD + - CommonSecurityHeadsetFull # WD - CommonMaskCigarette # WD - CommonSecurityNeck - DetectiveJumpsuit @@ -445,7 +445,7 @@ id: JobSecurityCadet groups: - CommonSecurityHead - - CommonSecurityHeadset # WD + - CommonSecurityHeadsetFull # WD - CommonSecurityNeck - SecurityCadetJumpsuit - CommonSecurityBackpack @@ -459,7 +459,7 @@ id: JobChiefMedicalOfficer groups: - ChiefMedicalOfficerHead - - ChiefMedicalOfficerEars # WD + - ChiefMedicalOfficerHeadset # WD - CommonMedicalMask # WD - ChiefMedicalOfficerNeck - ChiefMedicalOfficerJumpsuit diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml index ee1492b45e..1edef943a1 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml @@ -116,6 +116,7 @@ physicalDesc: reagent-physical-desc-saucey flavor: tomato color: "#731008" + slippery: false - type: reagent id: JuiceWatermelon diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 5ece5e04a3..a53cb1c3dc 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -42,4 +42,4 @@ back: ClothingBackpackQuartermasterFilled shoes: ClothingShoesColorBrown id: QuartermasterPDA - ears: ClothingHeadsetQM + ears: ClothingHeadsetAltCargo diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 6849bf25e3..bcd5a14890 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -43,4 +43,4 @@ back: ClothingBackpackChiefEngineerFilled shoes: ClothingShoesColorBrown id: CEPDA - ears: ClothingHeadsetCE + ears: ClothingHeadsetAltEngineering diff --git a/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml b/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml index e4fdf5d1c8..9f28aa1a09 100644 --- a/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml +++ b/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml @@ -28,6 +28,6 @@ back: ClothingBackpackFilled shoes: ClothingShoesBootsInspector id: InspectorPDA - ears: ClothingHeadsetAltSecurity + ears: ClothingHeadsetAltSecurityCommand inhand: - BriefcaseBrownFilled diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index f659057461..74f023b60d 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -40,4 +40,4 @@ back: ClothingBackpackCMOFilled shoes: ClothingShoesColorBrown id: CMOPDA - ears: ClothingHeadsetCMO + ears: ClothingHeadsetAltMedical diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 9498e1a9e0..fddecee013 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -37,4 +37,4 @@ back: ClothingBackpackResearchDirectorFilled shoes: ClothingShoesColorBrown id: RnDPDA - ears: ClothingHeadsetRD + ears: ClothingHeadsetAltScience diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 4fd6c14a98..d7d9776350 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -31,4 +31,4 @@ back: ClothingBackpackSecurityFilledDetective shoes: ClothingShoesBootsCombatFilled id: DetectivePDA - ears: ClothingHeadsetSecurity + ears: ClothingHeadsetAltSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index eb2f6dee42..5eebae74c7 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -45,4 +45,4 @@ back: ClothingBackpackHOSFilled shoes: ClothingShoesBootsCombatFilled id: HoSPDA - ears: ClothingHeadsetAltSecurity + ears: ClothingHeadsetAltSecurityCommand diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index c199f9bf06..e4bcb4c3c0 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -33,5 +33,5 @@ back: ClothingBackpackSecurityFilled shoes: ClothingShoesBootsCombatFilled id: SecurityCadetPDA - ears: ClothingHeadsetSecurity + ears: ClothingHeadsetAltSecurity pocket1: BookSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 3fb4fda7db..9e9e4d6569 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -30,4 +30,4 @@ back: ClothingBackpackSecurityFilled shoes: ClothingShoesBootsCombatFilled id: SecurityPDA - ears: ClothingHeadsetSecurity + ears: ClothingHeadsetAltSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml index a519e086dd..7bac01133e 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml @@ -39,4 +39,4 @@ back: ClothingBackpackSecurityFilled shoes: ClothingShoesBootsCombatFilled id: SeniorOfficerPDA - ears: ClothingHeadsetSecurity + ears: ClothingHeadsetAltSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index aaad42d38a..88acbf9e13 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -32,4 +32,4 @@ back: ClothingBackpackSecurityFilled shoes: ClothingShoesBootsCombatFilled id: WardenPDA - ears: ClothingHeadsetSecurity + ears: ClothingHeadsetAltSecurity diff --git a/Resources/Prototypes/_White/Actions/types.yml b/Resources/Prototypes/_White/Actions/types.yml index b5967a28b9..237c7bf44d 100644 --- a/Resources/Prototypes/_White/Actions/types.yml +++ b/Resources/Prototypes/_White/Actions/types.yml @@ -38,7 +38,7 @@ itemIconStyle: BigAction priority: -20 icon: - sprite: White/Clothing/Head/nightvision.rsi + sprite: White/Clothing/Eyes/Glasses/nightvision.rsi state: icon event: !type:ToggleNightVisionEvent diff --git a/Resources/Prototypes/_White/Entities/Clothing/Head/night_vision_goggle.yml b/Resources/Prototypes/_White/Entities/Clothing/Head/night_vision_goggle.yml index a46e119761..420cc163d9 100644 --- a/Resources/Prototypes/_White/Entities/Clothing/Head/night_vision_goggle.yml +++ b/Resources/Prototypes/_White/Entities/Clothing/Head/night_vision_goggle.yml @@ -6,9 +6,9 @@ description: Теперь ты видишь во тьме! components: - type: Sprite - sprite: White/Clothing/Head/nightvision.rsi + sprite: White/Clothing/Eyes/Glasses/nightvision.rsi - type: Clothing - sprite: White/Clothing/Head/nightvision.rsi + sprite: White/Clothing/Eyes/Glasses/nightvision.rsi - type: ClothingGrantComponent component: - type: NightVision diff --git a/Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml b/Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml index cb5494e9cf..4cd0e39620 100644 --- a/Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml +++ b/Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml @@ -41,7 +41,8 @@ component: - type: NightVision toggleAction: null - toggleSound: null + activateSound: null + deactivateSound: null color: White - type: ShowHealthBars damageContainers: diff --git a/Resources/Textures/White/Clothing/Eyes/Glasses/nightvision.rsi/equipped-EYES-off.png b/Resources/Textures/White/Clothing/Eyes/Glasses/nightvision.rsi/equipped-EYES-off.png new file mode 100644 index 0000000000000000000000000000000000000000..b63f30fc713a739b08ea1070559e2d3b6abf3f6d GIT binary patch literal 452 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R53 zr;B4q#hkaZ9K8-ZNVLvZ2+=sg&GN=-_pVLq1q&5k=x)-e5L(!M$7$j6723PGU#)W5 z#>Fc#EA)*#M@!aG&dIJ7@0$-8IDayh|E%7wZ z^T!=~_Ut$ULtZq`>HPbLKH)0w_^@&grxzQ>o$a;58P>sLRUl^pFqX^AoC_sf|- zH%2Ayz4<4?T9&WSOzL5xS@Ej(Dhux2*`~2dY(w&WnfHDSyN;9=|6h33dcn>2wQv7Q z)v`MDu{6kVGFS>R6sa&g@nASHkpbcsG>L}w?5&9rY>pRx?sqz^_N1~;=k%T{AC(Rm zG2dQv;OyJEoDS0?dVgL{4!!Iyw=mT1fxtA;7qilMCvVtaXE^hK>f#Gp@*kwHG1Z^^ z*m`w?mzopr E058M1eE(56?F=2Egz13RyoeI)BL=X2J-)z>E(+4Mi& z``V*l_3ymve|Dv^z9`%Mw14qp2|nd*k7}x7qyA(GUV8htZvRHt70;F*_3u~oEMBed zc=@ya`}foLpF8*H{L!QK+xJGq_L{$b{qgAoh3vYphFATszgRt0$cz7$X)W>QUfjM) zHn+*EeunSf9vxt6U-fzB{M|eH4KM$1*!^2~mj_6geB4wJioOZ>O~p_I#bo`3qqpU10zeil#S_HtVs`1;xNlV{^+F!)a;-)*Vv z9_pv%`j1~e@5I(HFMj*XIL4O_ET3xre)(gS${z7^i_rAFr(ZtZ!tp)7e)nc!-+71a zWm^nyJbiXu*V^INqLwYJBK$dwzVi>;*CsMs?$5i)_+t9slT10* zRF7M8H5dr69j}nF@vcztmTUGcLZM@bZhhV_L6f^To+GC)ukuUkvCh+_+)$V*aYbQomVd z3Im?al0?L61)98Q1L z)#F>sdhq7KjZ2(YT=?OrFX4Ca{>(`+c|}Fb9R5u#KDTbBl&-^KhAj-eOf7jQHtF#1 z{C9t4d)|k8(ccUI#O#}Q&3d|_)#1}Q)9TlSZM*xH?^>P|Z}zsRYx2E|CRDSr8yMfN zS#$PGj%DfLb4$XH>{x5(@Z$8}R*(CP;eAXOm`u1FxG!ihz-%B|faSlOKEG4N`?p{J z=Kd?*S5b7>yJPO6-xqG5SG%+QJzJs7|0w@SOK$ya_{4n40aY>v4(UjYnXdl9N2msQpJGL%i!ti=d#Wzp$Py!<<~I) literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/Eyes/Glasses/thermal.rsi/icon.png b/Resources/Textures/White/Clothing/Eyes/Glasses/thermal.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3d5f8ef9b65ccfe2ed64fbc2d10c725c5fad51d2 GIT binary patch literal 510 zcmV~YL`2emQAsH<`}Ol@aPemfRt!=?oD8Bs z_Iz7&h65FI{vYZ{A?OH_900N$L{IK-!7zBCTjc*0Kwsw;*8IP9^%BFvci$Q2H-Gux zR9k@85kxs)>deJpi)|epQTQ;>tT~TiYH$(*15|v)ig}D6#~!fX$nb)p0I%5u9RQ2# z_wU}|RFn3~A4t9htI^O2@kk}_Q@h%{p%Af$|gDeMy z0!0o0fy>j@!r35SKRIv_%m&diTpTEBLGldK&Vt#*SWeIZAVX4t@pvN37|h?^vy>s{ zBOhFT3d1J`R|kCt784yX-vVekwj4sX13&;|pfWW3iAriPteAv@xb1_FVDPUrWmc)9n>XTSEY{`*wGJ@BP4Y`g2W{ z@4IJdS4$$NUAC-T6)(0v=IQU!-9o0C?{~LXu3q)Z-*x{E`|_1p%PfD!?BaNAaVzNkM_opU zgBm^@;?~~-AyO{a$J#D)zw?~=-)Xhw?t3cy`g2}!MkH6I6yIl9=FY(2cjgU8R89XJ TA;as_K-xWB{an^LB{Ts51B{c1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/Eyes/Glasses/thermal.rsi/inhand-right.png b/Resources/Textures/White/Clothing/Eyes/Glasses/thermal.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..4ede078291d212cabdf7a4d5731153a85f0963c1 GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC3<1aSW-L^Y)gZUvq-Qv5(vN zVoi8@dM9^JHV&WAyO49uUdR4NymLM>y%4l$l5Q?cQFwc)^;u?9W)7>Pko}kc-ZOqE zoOia1sNe;f2?Rgl(_(WE8?3oLJ^$Ojn>Szm+*gzr=`xV)W7BD z7WgIbUuIddqrert>EU)yL*kx>{X1yh{dh-RsxpJvySiOlcf;n zfXIf6JpYn!l?xpXT`Q~zopr06im!bN~PV literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Clothing/Head/nightvision.rsi/meta.json b/Resources/Textures/White/Clothing/Eyes/Glasses/thermal.rsi/meta.json similarity index 100% rename from Resources/Textures/White/Clothing/Head/nightvision.rsi/meta.json rename to Resources/Textures/White/Clothing/Eyes/Glasses/thermal.rsi/meta.json diff --git a/Resources/Textures/White/Clothing/Head/nightvision.rsi/equipped-EYES.png b/Resources/Textures/White/Clothing/Head/nightvision.rsi/equipped-EYES.png deleted file mode 100644 index 7d15515f7ad7d92ea8ecc536d8f5c06b83633aa0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVD$2IaSW+oe0$5@+bK}u_{VsK zmc{=Mln57fwy8aQMS4BMO|5y)xJM&sW{DT+Ur+HP`sGE$7e0hfaN4p#5d)g4}&Km{s$+pREi3_*Uj-+Sk0%FD o-l-)SUA^y^Fg~k(_&$&}IPYm+xyRrwFmM?>UHx3vIVCg!09<{XZ2$lO