diff --git a/Content.Client/_White/Cult/ShowCultHudSystem.cs b/Content.Client/_White/Cult/ShowCultHudSystem.cs index 4b4b54dd33..c5faa8f274 100644 --- a/Content.Client/_White/Cult/ShowCultHudSystem.cs +++ b/Content.Client/_White/Cult/ShowCultHudSystem.cs @@ -25,25 +25,35 @@ public sealed class ShowCultHudSystem : EntitySystem private void OnComponentInit(EntityUid uid, CultistComponent component, ComponentInit args) { - if (_player.LocalPlayer?.ControlledEntity != uid) return; + if (_player.LocalSession?.AttachedEntity != uid) + return; + _overlayManager.AddOverlay(_overlay); } private void OnComponentRemoved(EntityUid uid, CultistComponent component, ComponentRemove args) { - if (_player.LocalPlayer?.ControlledEntity != uid) return; + if (_player.LocalSession?.AttachedEntity != uid) + return; + _overlayManager.RemoveOverlay(_overlay); } private void OnPlayerAttached(EntityUid uid, CultistComponent component, PlayerAttachedEvent args) { + if (_player.LocalSession != args.Player) + return; + _overlayManager.AddOverlay(_overlay); } private void OnPlayerDetached(EntityUid uid, CultistComponent component, PlayerDetachedEvent args) { + if (_player.LocalSession != args.Player) + return; + _overlayManager.RemoveOverlay(_overlay); } } diff --git a/Content.Client/_White/EntityHealthBar/ShowHealthBarsSystem.cs b/Content.Client/_White/EntityHealthBar/ShowHealthBarsSystem.cs index 203f55e199..e96d7af75c 100644 --- a/Content.Client/_White/EntityHealthBar/ShowHealthBarsSystem.cs +++ b/Content.Client/_White/EntityHealthBar/ShowHealthBarsSystem.cs @@ -27,30 +27,36 @@ namespace Content.Client._White.EntityHealthBar private void OnInit(EntityUid uid, ShowWhiteHealthBarsComponent component, ComponentInit args) { - if (_player.LocalPlayer?.ControlledEntity == uid) - { - _overlayMan.AddOverlay(_overlay); - _overlay.DamageContainers = component.DamageContainers; - } + if (_player.LocalSession?.AttachedEntity != uid) + return; + + _overlayMan.AddOverlay(_overlay); + _overlay.DamageContainers = component.DamageContainers; } private void OnRemove(EntityUid uid, ShowWhiteHealthBarsComponent component, ComponentRemove args) { - if (_player.LocalPlayer?.ControlledEntity == uid) - { - _overlayMan.RemoveOverlay(_overlay); - } + if (_player.LocalSession?.AttachedEntity != uid) + return; + + _overlayMan.RemoveOverlay(_overlay); } private void OnPlayerAttached(EntityUid uid, ShowWhiteHealthBarsComponent component, PlayerAttachedEvent args) { + if (_player.LocalSession != args.Player) + return; + _overlayMan.AddOverlay(_overlay); _overlay.DamageContainers = component.DamageContainers; } private void OnPlayerDetached(EntityUid uid, ShowWhiteHealthBarsComponent component, PlayerDetachedEvent args) { + if (_player.LocalSession != args.Player) + return; + _overlayMan.RemoveOverlay(_overlay); } diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs index 5c04970daa..c6a9533c39 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs @@ -172,7 +172,7 @@ public sealed partial class AdminVerbSystem { Text = "Сделать культистом.", Category = VerbCategory.Antag, - Icon = new SpriteSpecifier.Texture(new("/Textures//White/Cult/interface.rsi/icon.png")), + Icon = new SpriteSpecifier.Rsi(new("/Textures/White/Cult/interface.rsi"), "icon"), Act = () => { if (!_minds.TryGetSession(targetMindComp.Mind, out var session)) diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index 8cbf052693..34ccc4eb5f 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -508,14 +508,14 @@ public sealed partial class ChatSystem : SharedChatSystem ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))), ("fontType", speech.FontId), ("fontSize", speech.FontSize), - ("message", FormattedMessage.EscapeText(message))); + ("message", message)); //WD-EDIT if (TryComp(source, out var comp)) { wrappedMessage = Loc.GetString(comp.ChatLoc, ("entityName", name), - ("message", FormattedMessage.EscapeText(message)), + ("message", message), ("color", comp.ChatColor) ); } diff --git a/Content.Shared/Sound/SharedEmitSoundSystem.cs b/Content.Shared/Sound/SharedEmitSoundSystem.cs index 74591dc671..1f43fd1883 100644 --- a/Content.Shared/Sound/SharedEmitSoundSystem.cs +++ b/Content.Shared/Sound/SharedEmitSoundSystem.cs @@ -6,7 +6,6 @@ using Content.Shared.Popups; using Content.Shared.Sound.Components; using Content.Shared.Throwing; using Content.Shared._White.EndOfRoundStats.EmitSoundStatSystem; -using Content.Shared._White.Sounds; using JetBrains.Annotations; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; @@ -44,9 +43,6 @@ public abstract class SharedEmitSoundSystem : EntitySystem SubscribeLocalEvent(OnEmitSoundOnPickup); SubscribeLocalEvent(OnEmitSoundOnDrop); - // WD edit - SubscribeLocalEvent(EmitSoundOnGotRemoved); - SubscribeLocalEvent(OnEmitSoundUnpaused); SubscribeLocalEvent(OnEmitSoundOnCollide); } @@ -103,12 +99,6 @@ public abstract class SharedEmitSoundSystem : EntitySystem TryEmitSound(uid, component, args.User); } - // WD edit - private void EmitSoundOnGotRemoved(EntityUid uid, EmitSoundOnPickupComponent component, GotRemovedEvent args) - { - TryEmitSound(uid, component, args.User, false); - } - private void OnEmitSoundOnDrop(EntityUid uid, EmitSoundOnDropComponent component, DroppedEvent args) { TryEmitSound(uid, component, args.User); diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs index cc31c0cc15..4be2b59ece 100644 --- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs @@ -17,7 +17,6 @@ using Content.Shared.Stacks; using Content.Shared.Storage.Components; using Content.Shared.Timing; using Content.Shared.Verbs; -using Content.Shared._White.Sounds; using Robust.Shared.Audio.Systems; using Robust.Shared.Containers; using Robust.Shared.GameStates; @@ -431,13 +430,6 @@ public abstract class SharedStorageSystem : EntitySystem && storageComp.StorageRemoveSound != null) Audio.PlayPredicted(storageComp.StorageRemoveSound, uid, player); { - // WD edit - if (hands.ActiveHand != null) - { - var gotRemoved = new GotRemovedEvent(player, entity, hands.ActiveHand); - RaiseLocalEvent(entity, gotRemoved, false); - } - return; } } diff --git a/Content.Shared/_White/Sounds/GotRemovedEvent.cs b/Content.Shared/_White/Sounds/GotRemovedEvent.cs deleted file mode 100644 index 43a8e68ed4..0000000000 --- a/Content.Shared/_White/Sounds/GotRemovedEvent.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Content.Shared.Hands; -using Content.Shared.Hands.Components; - -namespace Content.Shared._White.Sounds; - - -public sealed class GotRemovedEvent : EquippedHandEvent -{ - public GotRemovedEvent(EntityUid user, EntityUid unequipped, Hand hand) : base(user, unequipped, hand) { } -} diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 2d361cb882..3aa668a4b8 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -77,6 +77,7 @@ 120: Dead stateAlertDict: Alive: BorgHealth + Dead: BorgDead showOverlays: false - type: Stamina critThreshold: 120 diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml index 549a42c264..3f199d2628 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -95,6 +95,8 @@ components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/syndicate.rsi + - type: Airlock + openUnlitVisible: false - type: entity parent: Airlock @@ -103,6 +105,8 @@ components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/mining.rsi + - type: Airlock + openUnlitVisible: false - type: entity parent: Airlock @@ -113,6 +117,8 @@ sprite: Structures/Doors/Airlocks/Standard/centcomm.rsi - type: WiresPanelSecurity securityLevel: medSecurity + - type: Airlock + openUnlitVisible: false - type: entity parent: Airlock @@ -121,6 +127,8 @@ components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/hatch.rsi + - type: Airlock + openUnlitVisible: false - type: entity parent: Airlock @@ -129,6 +137,8 @@ components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/hatch_maint.rsi + - type: Airlock + openUnlitVisible: false # Glass @@ -284,6 +294,8 @@ sprite: Structures/Doors/Airlocks/Glass/syndicate.rsi - type: PaintableAirlock group: Glass + - type: Airlock + openUnlitVisible: false - type: entity parent: AirlockGlass @@ -292,6 +304,8 @@ components: - type: Sprite sprite: Structures/Doors/Airlocks/Glass/mining.rsi + - type: Airlock + openUnlitVisible: false - type: entity parent: AirlockGlass @@ -302,4 +316,6 @@ sprite: Structures/Doors/Airlocks/Glass/centcomm.rsi - type: WiresPanelSecurity securityLevel: medSecurity + - type: Airlock + openUnlitVisible: false diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 2f2af08d54..41956f22dd 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -1,4 +1,4 @@ -# vocal emotes +# vocal emotes - type: emote id: Scream category: Vocal @@ -76,7 +76,7 @@ id: Crying category: Vocal buttonText: Плакать - chatMessages: [ плакать ] + chatMessages: [ плачет ] chatTriggers: - плачет - заплакал diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/bolted_open_unlit.png new file mode 100644 index 0000000000..4c59d3a28c Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/emergency_open_unlit.png new file mode 100644 index 0000000000..4c59d3a28c Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json index 8408176365..7b8b103ca7 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json @@ -10,6 +10,15 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closed" }, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/open_unlit.png new file mode 100644 index 0000000000..4c59d3a28c Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/bolted_open_unlit.png new file mode 100644 index 0000000000..4c59d3a28c Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/emergency_open_unlit.png new file mode 100644 index 0000000000..4c59d3a28c Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json index d9058e3372..a6ef03c1b2 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json @@ -10,6 +10,15 @@ { "name": "bolted_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closed" }, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/open_unlit.png new file mode 100644 index 0000000000..4c59d3a28c Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/open_unlit.png differ