fix upstream

.github/workflows/validate-rgas.yml

@@ -0,0 +1,25 @@
+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/[email protected]
+    - name: Setup Submodule
+      run: git submodule update --init
+    - name: Pull engine updates
+      uses: space-wizards/[email protected]
+    - 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

.github/workflows/validate-rsis.yml

@@ -0,0 +1,26 @@
+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/[email protected]
+      - name: Setup Submodule
+        run: git submodule update --init
+      - name: Pull engine updates
+        uses: space-wizards/[email protected]
+      - name: Install Python dependencies
+        run: |
+          pip3 install --ignore-installed --user pillow jsonschema
+      - name: Validate RSIs
+        run: |
+          python3 RobustToolbox/Schemas/validate_rsis.py Resources/

Resources/Prototypes/_Backmen/Catalog/uplink_catalog.yml

@@ -153,17 +153,6 @@
   categories:
   - UplinkWeaponry
 
-- type: listing
-  id: UplinkSpecialDelivery
-  name: особая посылка
-  description: Посылка с случайной маской психов Майами!
-  icon: { sprite: Backmen/Objects/Misc/specialdelivery.rsi, state: specialdelivery }
-  productEntity: SpecialDeliveryBox
-  cost:
-    Telecrystal: 1
-  categories:
-  - UplinkPointless
-
 - type: listing
   id: UplinkExperimentalSyndicateTeleporter
   name: uplink-experimental-syndicate-teleporter-name
@@ -172,4 +161,4 @@
   cost:
     Telecrystal: 10
   categories:
-    - UplinkDeception
+    - UplinkDeception

Resources/Prototypes/_Backmen/Entities/Clothing/Head/hats.yml

@@ -315,71 +315,6 @@
   - type: Clothing
     sprite: Backmen/Clothing/Head/Hats/anon.rsi
 
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatAlex
-  name: Алекс
-  description: Кто пригласил всех этих идиотов?
-  components:
-   - type: Sprite
-     sprite: Backmen/Clothing/Head/Hats/alex.rsi
-   - type: Clothing
-     sprite: Backmen/Clothing/Head/Hats/alex.rsi
-   - type: IngestionBlocker
-   - type: IdentityBlocker
-
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatJake
-  name: Джейк
-  description: Алло?! Кто это? Дай мне поговорить с твоим начальником!
-  components:
-   - type: Sprite
-     sprite: Backmen/Clothing/Head/Hats/jake.rsi
-   - type: Clothing
-     sprite: Backmen/Clothing/Head/Hats/jake.rsi
-   - type: IngestionBlocker
-   - type: IdentityBlocker
-
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatRasmus
-  name: Расмус
-  description: Я не знаю тебя! Зачем ты здесь? Я тебя не приглашал.
-  components:
-   - type: Sprite
-     sprite: Backmen/Clothing/Head/Hats/rasmus.rsi
-   - type: Clothing
-     sprite: Backmen/Clothing/Head/Hats/rasmus.rsi
-   - type: IngestionBlocker
-   - type: IdentityBlocker
-
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatRichter
-  name: Рихтер
-  description: Ааа, вот ты где! А я всё думал, когда ты вернёшься?
-  components:
-   - type: Sprite
-     sprite: Backmen/Clothing/Head/Hats/richter.rsi
-   - type: Clothing
-     sprite: Backmen/Clothing/Head/Hats/richter.rsi
-   - type: IngestionBlocker
-   - type: IdentityBlocker
-
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatTony
-  name: Тони
-  description: Чувак, эта вечеринка отстой. Я ненавижу этих людей.
-  components:
-   - type: Sprite
-     sprite: Backmen/Clothing/Head/Hats/tony.rsi
-   - type: Clothing
-     sprite: Backmen/Clothing/Head/Hats/tony.rsi
-   - type: IngestionBlocker
-   - type: IdentityBlocker
-
 - type: entity # backmen
   parent: ClothingMaskBase
   id: ClothingMaskBal

Resources/Prototypes/_Backmen/Entities/Objects/Misc/deliverybox.yml

@@ -1,44 +0,0 @@
-- type: entity
-  parent: PresentRandom
-  id: SpecialDeliveryBox
-  name: особая посылка
-  description: Старая помятая коробка. Пахнет диско и ретро. Интересно, что внутри?
-  components:
-  - type: Item
-    size: Normal
-  - type: Sprite
-    sprite: Backmen/Objects/Misc/specialdelivery.rsi
-    layers:
-      - state: specialdelivery
-  - type: SpawnItemsOnUse
-    items:
-      - id: SpecialDeliveryBoxTrash
-      - id: ClothingHeadHatAlex
-        orGroup: HotMask
-      - id: ClothingHeadHatJake
-        orGroup: HotMask
-      - id: ClothingHeadHatRasmus
-        orGroup: HotMask
-      - id: ClothingHeadHatRichter
-        orGroup: HotMask
-      - id: ClothingHeadHatRichard
-        orGroup: HotMask
-      - id: ClothingHeadHatTony
-        orGroup: HotMask
-
-- type: entity
-  id: SpecialDeliveryBoxTrash
-  parent: BaseItem
-  name: обертка от посылки
-  description: Пыльная обертка от посылки из картона и скотча.
-  components:
-  - type: PhysicalComposition
-    materialComposition:
-      Cardboard: 50
-  - type: Sprite
-    sprite: Backmen/Objects/Misc/specialdelivery.rsi
-    state: specialdelivery_unfolded
-  - type: Tag
-    tags:
-    - Trash
-  - type: SpaceGarbage

Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml

@@ -6,11 +6,11 @@
   description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo.
   components:
   - type: Sprite
-    sprite: Backmen/Objects/Weapons/Gunsx64/Revolver/mateba.rsi/big.rsi
+    sprite: Backmen/Objects/Weapons/Gunsx64/Revolver/mateba/big.rsi
   - type: Clothing
-    sprite: Backmen/Objects/Weapons/Gunsx64/Revolver/mateba.rsi/tiny.rsi
+    sprite: Backmen/Objects/Weapons/Gunsx64/Revolver/mateba/tiny.rsi
   - type: Item
-    sprite: Backmen/Objects/Weapons/Gunsx64/Revolver/mateba.rsi/tiny.rsi
+    sprite: Backmen/Objects/Weapons/Gunsx64/Revolver/mateba/tiny.rsi
   - type: Gun
     fireRate: 3
     cameraRecoilScalar: 2

Resources/Prototypes/_Backmen/Entities/Objects/Weapons/Guns/guns64super.yml

@@ -200,16 +200,16 @@
   suffix: Автомат Tactical
   components:
   - type: Sprite
-    sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/aksu.rsi/bigsuper.rsi
+    sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/aksu/bigsuper.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-0
       map: ["enum.GunVisualLayers.Mag"]
   - type: Clothing
-    sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/aksu.rsi/tinysuper.rsi
+    sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/aksu/tinysuper.rsi
   - type: Item
-    sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/aksu.rsi/tinysuper.rsi
+    sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/aksu/tinysuper.rsi
     size: NormalLarge
   - type: BkmGunWieldBonus
     cameraRecoilScalar: -4.5
@@ -232,16 +232,16 @@
   suffix: Пистолет-пулемёт Tactical
   components:
   - type: Sprite
-    sprite: Backmen/Objects/Weapons/Gunsx64/SMGs/p90.rsi/bigsuper.rsi
+    sprite: Backmen/Objects/Weapons/Gunsx64/SMGs/p90/bigsuper.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-0
       map: ["enum.GunVisualLayers.Mag"]
   - type: Clothing
-    sprite: Backmen/Objects/Weapons/Gunsx64/SMGs/p90.rsi/tinysuper.rsi
+    sprite: Backmen/Objects/Weapons/Gunsx64/SMGs/p90/tinysuper.rsi
   - type: Item
-    sprite: Backmen/Objects/Weapons/Gunsx64/SMGs/p90.rsi/tinysuper.rsi
+    sprite: Backmen/Objects/Weapons/Gunsx64/SMGs/p90/tinysuper.rsi
   - type: BkmGunWieldBonus
     cameraRecoilScalar: -4.5
   - type: GunWieldBonus