diff --git a/Content.Server/Doors/Systems/AirlockSystem.cs b/Content.Server/Doors/Systems/AirlockSystem.cs index 7dfdebf367..a2142b554b 100644 --- a/Content.Server/Doors/Systems/AirlockSystem.cs +++ b/Content.Server/Doors/Systems/AirlockSystem.cs @@ -7,7 +7,7 @@ using Content.Shared.Interaction; using Content.Shared.Power; using Content.Shared.Wires; using Robust.Shared.Player; - +using Content.Shared.Silicons.StationAi; namespace Content.Server.Doors.Systems; public sealed class AirlockSystem : SharedAirlockSystem @@ -62,6 +62,11 @@ public sealed class AirlockSystem : SharedAirlockSystem panel.Open && TryComp(args.User, out var actor)) { + //Sunrise-start + if (HasComp(args.User)) + return; + //Sunrise-end + if (TryComp(uid, out var wiresPanelSecurity) && !wiresPanelSecurity.WiresAccessible) return; diff --git a/Content.Server/VoiceMask/VoiceMaskSystem.cs b/Content.Server/VoiceMask/VoiceMaskSystem.cs index fc1a647386..d7a8b4c90e 100644 --- a/Content.Server/VoiceMask/VoiceMaskSystem.cs +++ b/Content.Server/VoiceMask/VoiceMaskSystem.cs @@ -38,7 +38,7 @@ public sealed partial class VoiceMaskSystem : EntitySystem InitializeTTS(); // Sunrise-TTS - //Subs.CVar(_cfgManager, CCVars.MaxNameLength, value => _maxNameLength = value, true); + Subs.CVar(_cfgManager, CCVars.MaxNameLength, value => _maxNameLength = value, true); } private void OnTransformSpeakerName(Entity entity, ref InventoryRelayedEvent args) diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/animals/dogs/dogs.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/animals/dogs/dogs.ftl new file mode 100644 index 0000000000..d7aaa9f1e7 --- /dev/null +++ b/Resources/Locale/ru-RU/_strings/_sunrise/animals/dogs/dogs.ftl @@ -0,0 +1,5 @@ +ghost-role-information-pibble-vent-name = Вентибуль +ghost-role-information-pibble-vent-description = Какая-то помесь питбуля... или, может быть, это следующий этап эволюции питбуля? + +ghost-role-information-pibble-name = Питбуль +ghost-role-information-pibble-description = Собака-няня. Или помесь с лабрадором, зависит от того, кого спросить. diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index ee34f74592..090d2f1839 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -24,7 +24,7 @@ EnergyShotgunStealObjective: 0.5 # Sunrise-Start PlutoniumCoreStealObjective: 0.5 - MultiphaseEnergygunStealObjective: 1 + #MultiphaseEnergygunStealObjective: 1 # Sunrise-Edit: ОСЩ больше не появляется на станции CMOAdvancedDefibrillatorStealObjective: 1 StealSupermatterSliverObjective: 1 HandheldFaxStealObjective: 1 diff --git a/Resources/Prototypes/Objectives/paradoxClone.yml b/Resources/Prototypes/Objectives/paradoxClone.yml index 34b41050c7..6c15778c3e 100644 --- a/Resources/Prototypes/Objectives/paradoxClone.yml +++ b/Resources/Prototypes/Objectives/paradoxClone.yml @@ -32,9 +32,10 @@ name: Fix the space-time paradox. description: Replace your original to fix the paradox. Remember, your mission is to blend in, do not kill anyone else unless you have to! components: + #Sunrise-start + - type: TargetObjective + title: objective-condition-kill-head-title # kill , - type: PickSpecificPerson - type: KillPersonCondition requireDead: true - - type: TargetObjective - title: objective-condition-kill-head-title # kill , - + #Sunrise-end diff --git a/Resources/Prototypes/_Sunrise/AssaultOps/roundstart.yml b/Resources/Prototypes/_Sunrise/AssaultOps/roundstart.yml index f60bcee810..818c4faa39 100644 --- a/Resources/Prototypes/_Sunrise/AssaultOps/roundstart.yml +++ b/Resources/Prototypes/_Sunrise/AssaultOps/roundstart.yml @@ -32,6 +32,11 @@ - type: NpcFactionMember factions: - Syndicate + - type: RandomMetadata + nameSegments: + - NamesFirst + - NamesLast + nameFormat: name-format-standard mindRoles: - MindRoleAssaultCommander - prefRoles: [ AssaultOperative ] @@ -47,5 +52,10 @@ - type: NpcFactionMember factions: - Syndicate + - type: RandomMetadata + nameSegments: + - NamesFirst + - NamesLast + nameFormat: name-format-standard mindRoles: - MindRoleAssaultOperative