Bugfixes (#2680)
This commit is contained in:
parent
f52833ed5c
commit
c4aaa9ef05
6 changed files with 27 additions and 6 deletions
|
|
@ -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<ActorComponent>(args.User, out var actor))
|
||||
{
|
||||
//Sunrise-start
|
||||
if (HasComp<StationAiHeldComponent>(args.User))
|
||||
return;
|
||||
//Sunrise-end
|
||||
|
||||
if (TryComp<WiresPanelSecurityComponent>(uid, out var wiresPanelSecurity) &&
|
||||
!wiresPanelSecurity.WiresAccessible)
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -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<VoiceMaskComponent> entity, ref InventoryRelayedEvent<TransformSpeakerNameEvent> args)
|
||||
|
|
|
|||
|
|
@ -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 = Собака-няня. Или помесь с лабрадором, зависит от того, кого спросить.
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
EnergyShotgunStealObjective: 0.5
|
||||
# Sunrise-Start
|
||||
PlutoniumCoreStealObjective: 0.5
|
||||
MultiphaseEnergygunStealObjective: 1
|
||||
#MultiphaseEnergygunStealObjective: 1 # Sunrise-Edit: ОСЩ больше не появляется на станции
|
||||
CMOAdvancedDefibrillatorStealObjective: 1
|
||||
StealSupermatterSliverObjective: 1
|
||||
HandheldFaxStealObjective: 1
|
||||
|
|
|
|||
|
|
@ -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 <name>, <job>
|
||||
- type: PickSpecificPerson
|
||||
- type: KillPersonCondition
|
||||
requireDead: true
|
||||
- type: TargetObjective
|
||||
title: objective-condition-kill-head-title # kill <name>, <job>
|
||||
|
||||
#Sunrise-end
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue