diff --git a/.github/workflows/validate-rgas.yml b/.github/workflows/validate-rgas.yml deleted file mode 100644 index 25191958a8c..00000000000 --- a/.github/workflows/validate-rgas.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: RGA schema validator -on: - push: - branches: [ master, staging, stable ] - merge_group: - pull_request: - types: [ opened, reopened, synchronize, ready_for_review ] - -jobs: - yaml-schema-validation: - name: YAML RGA schema validator - if: github.actor != 'PJBot' && github.event.pull_request.draft == false - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3.6.0 - - name: Setup Submodule - run: git submodule update --init - - name: Pull engine updates - uses: space-wizards/submodule-dependency@v0.1.5 - - uses: PaulRitter/yaml-schema-validator@v1 - with: - schema: RobustToolbox/Schemas/rga.yml - path_pattern: .*attributions.ya?ml$ - validators_path: RobustToolbox/Schemas/rga_validators.py - validators_requirements: RobustToolbox/Schemas/rga_requirements.txt diff --git a/.github/workflows/validate-rsis.yml b/.github/workflows/validate-rsis.yml deleted file mode 100644 index 5d30944c73f..00000000000 --- a/.github/workflows/validate-rsis.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: RSI Validator - -on: - push: - branches: [ master, staging, stable ] - merge_group: - pull_request: - paths: - - '**.rsi/**' - -jobs: - validate_rsis: - name: Validate RSIs - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3.6.0 - - name: Setup Submodule - run: git submodule update --init - - name: Pull engine updates - uses: space-wizards/submodule-dependency@v0.1.5 - - name: Install Python dependencies - run: | - pip3 install --ignore-installed --user pillow jsonschema - - name: Validate RSIs - run: | - python3 RobustToolbox/Schemas/validate_rsis.py Resources/ diff --git a/Content.Client/Holopad/HolopadSystem.cs b/Content.Client/Holopad/HolopadSystem.cs index 3bd556f1fc2..9012cb0cb47 100644 --- a/Content.Client/Holopad/HolopadSystem.cs +++ b/Content.Client/Holopad/HolopadSystem.cs @@ -53,7 +53,7 @@ private void OnTypingChanged(TypingChangedEvent ev, EntitySessionEventArgs args) if (!HasComp(uid)) return; - var netEv = new HolopadUserTypingChangedEvent(GetNetEntity(uid.Value), ev.IsTyping); + var netEv = new HolopadUserTypingChangedEvent(GetNetEntity(uid.Value), ev.State == TypingIndicatorState.Typing); RaiseNetworkEvent(netEv); } diff --git a/Content.Server/Backmen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Backmen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs index 217a8d9e627..679165c8f08 100644 --- a/Content.Server/Backmen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs +++ b/Content.Server/Backmen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs @@ -54,7 +54,7 @@ public override void Initialize() SubscribeLocalEvent(OnSwapInit); } - [ValidatePrototypeId] private const string ActionMindSwap = "ActionMindSwap"; + [ValidatePrototypeId] private const string ActionMindSwap = "ActionMindSwapPsionic"; [ValidatePrototypeId] private const string ActionMindSwapReturn = "ActionMindSwapReturn"; private void OnInit(EntityUid uid, MindSwapPowerComponent component, ComponentInit args) diff --git a/Content.Server/Chat/Systems/SpeakOnTriggerSystem.cs b/Content.Server/Chat/Systems/SpeakOnTriggerSystem.cs index d8800a85087..a90e1628373 100644 --- a/Content.Server/Chat/Systems/SpeakOnTriggerSystem.cs +++ b/Content.Server/Chat/Systems/SpeakOnTriggerSystem.cs @@ -1,4 +1,5 @@ using Content.Server.Explosion.EntitySystems; +using Content.Shared.Backmen.Chat; using Content.Shared.Timing; using Robust.Shared.Prototypes; using Robust.Shared.Random; diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs index 9a577e4e48d..e3bc36586e2 100644 --- a/Content.Server/Connection/ConnectionManager.cs +++ b/Content.Server/Connection/ConnectionManager.cs @@ -319,12 +319,6 @@ session.Status is SessionStatus.Connected or SessionStatus.InGame foreach (var whitelist in _whitelists) { - if (!IsValid(whitelist, softPlayerCount)) - { - // Not valid for current player count. - continue; - } - var whitelistStatus = await IsWhitelisted(whitelist, e.UserData, _sawmill); if (!whitelistStatus.isWhitelisted) { diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs index bd36d38bee5..8e5e00ffea4 100644 --- a/Content.Server/Holopad/HolopadSystem.cs +++ b/Content.Server/Holopad/HolopadSystem.cs @@ -296,7 +296,7 @@ private void OnTypingChanged(HolopadUserTypingChangedEvent ev, EntitySessionEven if (receiverHolopad.Comp.Hologram == null) continue; - _appearanceSystem.SetData(receiverHolopad.Comp.Hologram.Value.Owner, TypingIndicatorVisuals.IsTyping, ev.IsTyping); + _appearanceSystem.SetData(receiverHolopad.Comp.Hologram.Value.Owner, TypingIndicatorVisuals.State, ev.IsTyping); } } } @@ -557,7 +557,7 @@ private void UnlinkHolopadFromUser(Entity entity, Entity telephone.StateStartTime + TimeSpan.FromSeconds(telephone.IdlingTimeout)) EndTelephoneCalls(entity); diff --git a/Resources/Locale/ru-RU/backmen/actions/types.ftl b/Resources/Locale/ru-RU/backmen/actions/types.ftl index 5a0eb216cfb..554e1413474 100644 --- a/Resources/Locale/ru-RU/backmen/actions/types.ftl +++ b/Resources/Locale/ru-RU/backmen/actions/types.ftl @@ -10,7 +10,7 @@ ent-ActionPsionicInvisibility = action-name-psionic-invisibility .desc = action-description-psionic-invisibility ent-ActionPsionicInvisibilityOff = action-description-psionic-invisibility-off .desc = action-description-psionic-invisibility -ent-ActionMindSwap = action-name-mind-swap +ent-ActionMindSwapPsionic = action-name-mind-swap .desc = action-description-mind-swap ent-ActionMindSwapReturn = action-name-mind-swap-return .desc = action-description-mind-swap-return diff --git a/Resources/Prototypes/Corvax/Procedural/biome_templates.yml b/Resources/Prototypes/Corvax/Procedural/biome_templates.yml index ca1a9d93ba1..2523e0fb2c9 100644 --- a/Resources/Prototypes/Corvax/Procedural/biome_templates.yml +++ b/Resources/Prototypes/Corvax/Procedural/biome_templates.yml @@ -31,21 +31,9 @@ allowedTiles: - FloorPlanetGrass entities: - - FloraTree01 - - FloraTree02 - - FloraTree03 - - FloraTree04 - - FloraTree05 - - FloraTree06 - - FloraTreeLarge01 - - FloraTreeLarge02 - - FloraTreeLarge03 - - FloraTreeLarge04 - - FloraTreeLarge05 - - FloraTreeLarge06 - - FloraRockSolid01 - - FloraRockSolid02 - - FloraRockSolid03 + - FloraTree + - FloraTreeLarge + - FloraRockSolid - FloraTreeStump - !type:BiomeDecalLayer allowedTiles: @@ -89,14 +77,8 @@ allowedTiles: - FloorCaveDrought entities: - - FloraStalagmite1 - - FloraStalagmite2 - - FloraStalagmite3 - - FloraStalagmite4 - - FloraStalagmite5 - - FloraRockSolid01 - - FloraRockSolid02 - - FloraRockSolid03 + - FloraStalagmite + - FloraRockSolid - CrystalOrange - !type:BiomeEntityLayer allowedTiles: @@ -118,9 +100,7 @@ allowedTiles: - FloorAsteroidSand entities: - - FloraRockSolid01 - - FloraRockSolid02 - - FloraRockSolid03 + - FloraRockSolid - CrystalOrange - CrystalGrey - !type:BiomeEntityLayer @@ -367,11 +347,8 @@ allowedTiles: - FloorSnow entities: - - FloraTreeConifer01 - - FloraTreeConifer02 - - FloraTreeConifer03 - - FloraTreeSnow01 - - FloraTreeSnow06 + - FloraTreeConifer + - FloraTreeSnow # Snow rock formations - !type:BiomeEntityLayer allowedTiles: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index f5d8b8c5ff5..c0591a92432 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2437,16 +2437,16 @@ - type: Sprite drawdepth: Mobs layers: - - map: [ "enum.DamageStateVisualLayers.Base", "movement" ] + - map: [ "enum.DamageStateVisualLayers.Base" ] state: tarantula sprite: Mobs/Animals/spider.rsi - - type: SpriteMovement - movementLayers: - movement: - state: tarantula-moving - noMovementLayers: - movement: - state: tarantula +# - type: SpriteMovement +# movementLayers: +# movement: +# state: tarantula-moving +# noMovementLayers: +# movement: +# state: tarantula - type: Physics - type: Arachne - type: Cocooner diff --git a/Resources/Prototypes/Maps/gate.yml b/Resources/Prototypes/Maps/gate.yml index 246baa95510..554560e374e 100644 --- a/Resources/Prototypes/Maps/gate.yml +++ b/Resources/Prototypes/Maps/gate.yml @@ -50,7 +50,7 @@ SecurityOfficer: [ 6, 6 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - Lawyer: [ 2, 2 ] + IAA: [ 1, 1 ] # Corvax-IAA #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] diff --git a/Resources/Prototypes/Maps/loop.yml b/Resources/Prototypes/Maps/loop.yml index 64d1e297a59..8c2cc368a2a 100644 --- a/Resources/Prototypes/Maps/loop.yml +++ b/Resources/Prototypes/Maps/loop.yml @@ -49,7 +49,7 @@ SecurityOfficer: [ 5, 5 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - Lawyer: [ 2, 2 ] + IAA: [ 1, 1 ] # Corvax-IAA #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] diff --git a/Resources/Prototypes/_Backmen/Actions/types.yml b/Resources/Prototypes/_Backmen/Actions/types.yml index 7e896a57ef5..f9c55369dd3 100644 --- a/Resources/Prototypes/_Backmen/Actions/types.yml +++ b/Resources/Prototypes/_Backmen/Actions/types.yml @@ -69,7 +69,7 @@ event: !type:PsionicInvisibilityPowerOffActionEvent - type: entity - id: ActionMindSwap + id: ActionMindSwapPsionic name: action-name-mind-swap description: action-description-mind-swap components: diff --git a/Resources/Prototypes/_Backmen/Damage/types.yml b/Resources/Prototypes/_Backmen/Damage/types.yml deleted file mode 100644 index 0ce3a8f17d3..00000000000 --- a/Resources/Prototypes/_Backmen/Damage/types.yml +++ /dev/null @@ -1,6 +0,0 @@ -# Only affects magical beings. -- type: damageType - id: Holy - name: damage-group-holy - armorCoefficientPrice: 25 - armorFlatPrice: 150 diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Devices/radio.yml index 5b7c488b07a..5c6b8a830c3 100644 --- a/Resources/Prototypes/_Backmen/Entities/Objects/Devices/radio.yml +++ b/Resources/Prototypes/_Backmen/Entities/Objects/Devices/radio.yml @@ -18,8 +18,8 @@ delay: 10 - type: Speech speechSounds: Combine - - type: SpeakOnUse - pack: ArtilleryComander +# - type: SpeakOnUse +# pack: ArtilleryComander - type: entity id: ActionCallAirSupportMissiles diff --git a/Resources/Prototypes/_Backmen/Procedural/Shipwreck/biome_templates.yml b/Resources/Prototypes/_Backmen/Procedural/Shipwreck/biome_templates.yml index 8c78e02e267..211528ef4cd 100644 --- a/Resources/Prototypes/_Backmen/Procedural/Shipwreck/biome_templates.yml +++ b/Resources/Prototypes/_Backmen/Procedural/Shipwreck/biome_templates.yml @@ -105,12 +105,7 @@ allowedTiles: - FloorSnow entities: - - FloraTreeSnow01 - - FloraTreeSnow02 - - FloraTreeSnow03 - - FloraTreeSnow04 - - FloraTreeSnow05 - - FloraTreeSnow06 + - FloraTreeSnow - !type:BiomeDummyLayer id: Loot - !type:BiomeTileLayer