diff --git a/.github/workflows/close-master-pr.yml b/.github/workflows/close-master-pr.yml index 63a618cfdf..4ea39bb2de 100644 --- a/.github/workflows/close-master-pr.yml +++ b/.github/workflows/close-master-pr.yml @@ -11,7 +11,6 @@ jobs: steps: - uses: superbrothers/close-pull-request@v3 with: - github_token: ${{ secrets.BOT_TOKEN }} comment: "Благодарим вас за вклад в наш репозиторий. К сожалению, похоже, что вы отправили ПР из master ветки. Мы рекомендуем вам следовать [документации](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html). \n\n Вы можете перенести свою текущую работу из основной ветки в другую ветку с помощью [создания новой](https://git-scm.com/docs/git-branch) и [очистки](https://git-scm.com/docs/git-reset) master ветки." # If you prefer to just comment on the pr and not close it, uncomment the bellow and comment the above diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml index 7e79617b1c..b91b9203bb 100644 --- a/.github/workflows/conflict-labeler.yml +++ b/.github/workflows/conflict-labeler.yml @@ -15,5 +15,5 @@ jobs: uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142 with: dirtyLabel: "Статус: Конфликт" - repoToken: "${{ secrets.BOT_TOKEN }}" + repoToken: "${{ secrets.GITHUB_TOKEN }}" commentOnDirty: "В этом ПР'е есть конфликты, пожалуйста, устраните их, прежде чем мы сможем оценить ваш ПР." diff --git a/.github/workflows/labeler-needsreview.yml b/.github/workflows/labeler-needsreview.yml index caa0140889..75d27643bf 100644 --- a/.github/workflows/labeler-needsreview.yml +++ b/.github/workflows/labeler-needsreview.yml @@ -11,8 +11,6 @@ jobs: - uses: actions-ecosystem/action-add-labels@v1 with: labels: "Статус: Требуется одобрение" - repo-token: "${{ secrets.BOT_TOKEN }}" - uses: actions-ecosystem/action-remove-labels@v1 with: labels: "Статус: Ожидание изменений" - repo-token: "${{ secrets.BOT_TOKEN }}" diff --git a/.github/workflows/labeler-pr.yml b/.github/workflows/labeler-pr.yml index 7197eec0bf..cd56f345da 100644 --- a/.github/workflows/labeler-pr.yml +++ b/.github/workflows/labeler-pr.yml @@ -10,4 +10,4 @@ jobs: steps: - uses: actions/labeler@v3 with: - repo-token: "${{ secrets.BOT_TOKEN }}" + repo-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/rsi-diff.yml b/.github/workflows/rsi-diff.yml index 2b65b3b439..5e9a5a2a8e 100644 --- a/.github/workflows/rsi-diff.yml +++ b/.github/workflows/rsi-diff.yml @@ -44,7 +44,6 @@ jobs: uses: peter-evans/create-or-update-comment@v1 with: issue-number: ${{ github.event.number }} - token: ${{ secrets.BOT_TOKEN }} body: | ${{ steps.diff.outputs.summary-details }} @@ -53,7 +52,6 @@ jobs: uses: peter-evans/create-or-update-comment@v1 with: comment-id: ${{ steps.fc.outputs.comment-id }} - token: ${{ secrets.BOT_TOKEN }} edit-mode: replace body: | ${{ steps.diff.outputs.summary-details }} @@ -63,7 +61,6 @@ jobs: uses: peter-evans/create-or-update-comment@v1 with: comment-id: ${{ steps.fc.outputs.comment-id }} - token: ${{ secrets.BOT_TOKEN }} edit-mode: append body: | Edit: diff updated after ${{ github.event.pull_request.head.sha }} diff --git a/.github/workflows/test-secrets1.yml b/.github/workflows/test-secrets1.yml index 6954c8c846..2f048e4a4c 100644 --- a/.github/workflows/test-secrets1.yml +++ b/.github/workflows/test-secrets1.yml @@ -3,14 +3,11 @@ name: YAML Linter Secrets on: push: branches: [ master, staging, trying ] - merge_group: - pull_request: - types: [ opened, reopened, synchronize, ready_for_review ] jobs: build: name: YAML Linter Secrets - if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot' + if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot' && github.repository == 'Lost-Paradise-Project/Lost-Paradise' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3.6.0 diff --git a/.github/workflows/test-secrets2.yml b/.github/workflows/test-secrets2.yml index cc6eb8c943..6faeb40d51 100644 --- a/.github/workflows/test-secrets2.yml +++ b/.github/workflows/test-secrets2.yml @@ -13,23 +13,11 @@ on: # why not just do both - 'RobustToolbox' - 'RobustToolbox/**' - merge_group: - pull_request: - types: [ opened, reopened, synchronize, ready_for_review ] - branches: [ master ] - paths: - - '**.cs' - - '**.csproj' - - '**.sln' - - '**.git**' - - '**.yml' - - 'RobustToolbox' - - 'RobustToolbox/**' jobs: build: name: Test Packaging Secrets - if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'Lost-Paradise-Bot' + if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'Lost-Paradise-Bot' && github.repository == 'Lost-Paradise-Project/Lost-Paradise' runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test-secrets3.yml b/.github/workflows/test-secrets3.yml index 0ece1e06ff..8416302e8d 100644 --- a/.github/workflows/test-secrets3.yml +++ b/.github/workflows/test-secrets3.yml @@ -1,16 +1,14 @@ name: Build & Test Debug Secrets + on: push: branches: [ master, staging, trying ] merge_group: - pull_request: - types: [ opened, reopened, synchronize, ready_for_review ] - branches: [ master ] jobs: build: - if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot' + if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14' && github.actor != 'Lost-Paradise-Bot' && github.repository == 'Lost-Paradise-Project/Lost-Paradise strategy: matrix: os: [ubuntu-latest] diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index 7f004ed560..ceeb46cfc1 100644 --- a/Resources/Changelog/ChangelogLPP.yml +++ b/Resources/Changelog/ChangelogLPP.yml @@ -181,3 +181,10 @@ Entries: id: 20 time: '2024-09-07T18:06:06.0000000+00:00' url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/85 +- author: JayJacobs + changes: + - type: Tweak + message: Изменены иконки интентов. + id: 21 + time: '2024-09-08T11:38:09.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/90 diff --git a/Resources/Locale/ru-RU/deltav/advertisements/vending/pride.ftl b/Resources/Locale/ru-RU/deltav/advertisements/vending/pride.ftl index e1a0332848..3a05e47d22 100644 --- a/Resources/Locale/ru-RU/deltav/advertisements/vending/pride.ftl +++ b/Resources/Locale/ru-RU/deltav/advertisements/vending/pride.ftl @@ -1,5 +1,5 @@ advertisement-pride-1 = Будь геем! advertisement-pride-2 = Полный цветов! advertisement-pride-3 = Ты правильный! -thankyou-pride-1 = Вперёд, делай нарушения законов! -thankyou-pride-2 = Хорошего цветного дня! +thankyou-pride-1 = Вперёд, не нарушай законы! +thankyou-pride-2 = Хорошего белого дня! diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml index 6341042bf8..61c3d74924 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml @@ -4,7 +4,7 @@ sprite: Objects/Weapons/Guns/SMGs/wt550.rsi state: icon product: CrateArmorySMG - cost: 9000 + cost: 13000 category: cargoproduct-category-name-armory group: market @@ -14,7 +14,7 @@ sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi state: icon product: CrateArmoryShotgun - cost: 7000 + cost: 11000 category: cargoproduct-category-name-armory group: market @@ -44,7 +44,7 @@ sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi state: icon product: CrateArmoryLaser - cost: 4800 + cost: 8800 category: cargoproduct-category-name-armory group: market @@ -54,6 +54,6 @@ sprite: Objects/Weapons/Guns/Pistols/mk58.rsi state: icon product: CrateArmoryPistols - cost: 5200 + cost: 6000 category: cargoproduct-category-name-armory group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index b20e52004b..49873a763a 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml @@ -34,7 +34,7 @@ sprite: DeltaV/Clothing/OuterClothing/Armor/riot.rsi # DeltaV - resprite state: icon product: CrateSecurityRiot - cost: 5500 + cost: 8000 category: cargoproduct-category-name-security group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index ca459f1783..5e29e706bb 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -164,7 +164,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockSecTechFilled - cost: 2200 + cost: 2590 category: cargoproduct-category-name-security group: market diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index a6e9e02f44..770e8e8fdb 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -61,10 +61,16 @@ LPPClothingUniformBlackTracksuit: 4 LPPClothingUniformBlueTracksuit: 4 LPPClothingUniformRedTracksuit: 4 + LPPClothingNeckShemagGreen: 4 + LPPClothingNeckShemagRed: 4 + LPPClothingNeckShemagBrown: 4 + LPPClothingNeckShemagPurple: 4 + LPPClothingNeckShemagBlue: 4 + LPPClothingNeckShemagWhite: 4 contrabandInventory: ClothingMaskNeckGaiter: 2 - ClothingUniformJumpsuitTacticool: 1 - ClothingUniformJumpskirtTacticool: 1 + ClothingUniformJumpsuitTacticool: 2 + ClothingUniformJumpskirtTacticool: 2 ClothingEyesGlassesSunglasses: 2 ClothingHandsGlovesColorBlack: 4 ClothingHandsGlovesColorGray: 4 @@ -74,4 +80,5 @@ ClothingHandsGlovesColorBlue: 2 ClothingHandsGlovesColorGreen: 2 ClothingHandsGlovesColorOrange: 2 - ClothingHandsGlovesColorPurple: 2 \ No newline at end of file + ClothingHandsGlovesColorPurple: 2 + LPPClothingNeckShemagNPZ: 4 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index cf2e71e490..97247659dd 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -25,9 +25,10 @@ ClothingOuterArmorDuraVest: 2 ClothingHeadHelmetBasic: 2 # DeltaV - added helmets to the SecTech. Another line of defense between the tide and your grey matter. BreachingCharge: 8 + LPPWeaponEnergyGunSoleil: 2 #LPP + LPPTelebaton: 3 #LPP # security officers need to follow a diet regimen! contrabandInventory: FoodDonutHomer: 12 FoodBoxDonut: 2 #box evidence - LPPTelebaton: 3 #LPP diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index e5ee3cf86c..4d2af4767f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -49,5 +49,6 @@ ClothingHeadBandBlack: 2 ClothingHeadBandSkull: 1 LPPClothingHeadSecHat: 2 - # contrabandInventory: - # ClothingMaskClownSecurity: 1 + LPPClothingBalaclavawide: 4 + contrabandInventory: + LPPClothingMaskKinkyMuzzle: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index e44b498973..ce7a5f6a8c 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1736,7 +1736,7 @@ id: LPPUplinkhelmetswat name: шлем спецназа синдиката description: Крепкий шлем, что защитит вашу голову от ненужных свинцовых, а так же лазерных выстрелов. - icon: { sprite: Clothing/Head/Helmets/swat_syndicate.rsi, state: icon } + icon: { sprite: /Textures/Clothing/Head/Helmets/swat_syndicate.rsi, state: icon } productEntity: ClothingHeadHelmetSwatSyndicate cost: Telecrystal: 2 diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml index 343ec4d533..257e97ec8e 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml @@ -4,6 +4,6 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockPrideFilled - cost: 1100 + cost: 2330 category: Service group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml index 6b59a93261..249fbeae6d 100644 --- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml +++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml @@ -1,12 +1,18 @@ - type: messagePack id: PrideDrobeAds messages: - - advertisement-pride-1 - - advertisement-pride-2 - - advertisement-pride-3 + # - advertisement-pride-1 + # - advertisement-pride-2 + # - advertisement-pride-3 +# Увы (Нет бля УвУ) + - advertisement-sectech-1 + - advertisement-sectech-2 + - advertisement-sectech-3 + - advertisement-sectech-4 + - advertisement-sectech-5 - type: messagePack id: PrideDrobeGoodbyes messages: - - thankyou-pride-1 - - thankyou-pride-2 + - thankyou-pride-1 + - thankyou-pride-2 diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml index 9e1de27fa4..581f4d9b1e 100644 --- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml +++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml @@ -1,29 +1,15 @@ - type: vendingMachineInventory id: PrideDrobeInventory startingInventory: - ClothingNeckLGBTPin: 3 - ClothingNeckAromanticPin: 3 - ClothingNeckAsexualPin: 3 - ClothingNeckBisexualPin: 3 - ClothingNeckIntersexPin: 3 - ClothingNeckLesbianPin: 3 - ClothingNeckNonBinaryPin: 3 - ClothingNeckPansexualPin: 3 - ClothingNeckTransPin: 3 - PlushieSharkBlue: 2 - PlushieSharkPink: 2 - PlushieSharkGrey: 2 - ClothingNeckCloakTrans: 2 - ClothingNeckCloakAro: 2 - ClothingNeckCloakAce: 2 - ClothingNeckCloakBi: 2 - ClothingNeckCloakIntersex: 2 - ClothingNeckCloakEnby: 2 - ClothingNeckCloakPan: 2 - ClothingNeckCloakGay: 2 - ClothingNeckCloakLesbian: 2 - ClothingHeadHatXmasCrown: 2 - BedsheetRainbow: 2 - ClothingUniformColorRainbow: 2 - ClothingUnderSocksCoder: 1 - ClothingUnderSocksBee: 1 \ No newline at end of file + ClothingNeckRussianPin: 99 + ClothingUnderSocksCoder: 99 + ClothingNeckCloakTrans: 3 + ClothingNeckCloakAce: 3 + ClothingNeckCloakAro: 3 + ClothingNeckCloakBi: 3 + ClothingNeckCloakIntersex: 3 + ClothingNeckCloakLesbian: 3 + ClothingNeckCloakGay: 3 + ClothingNeckCloakEnby: 3 + ClothingNeckCloakPan: 3 + #Простите Дельтовцы, но мы русские с нами УК и КОАП РФ \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml index 819122d51a..98e5636a52 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml @@ -9,7 +9,7 @@ species: Vulpkanin - type: Hunger baseDecayRate: 0.02083333332 # 25% more than default - - type: Carriable # Carrying system from nyanotrasen. + #- type: Carriable # Carrying system from nyanotrasen. - type: Inventory # Allows vulps to wear properly shaped helmets speciesId: vulpkanin - type: Thirst diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 5d9b57bfe4..087a40ae25 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -13,7 +13,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: bat sprite: Mobs/Animals/bat.rsi - - type: Carriable + #- type: Carriable - type: Speech speechSounds: Squeak speechVerb: SmallMob @@ -189,8 +189,8 @@ noMovementLayers: movement: state: chicken-0 - - type: Carriable - freeHandsRequired: 1 + #- type: Carriable + # freeHandsRequired: 1 - type: Fixtures fixtures: fix1: @@ -589,8 +589,8 @@ - MobMask layer: - MobLayer - - type: Carriable - freeHandsRequired: 1 + #- type: Carriable + # freeHandsRequired: 1 - type: Tag tags: - DoorBumpOpener @@ -850,8 +850,8 @@ noMovementLayers: movement: state: crab - - type: Carriable - freeHandsRequired: 1 + #- type: Carriable + # freeHandsRequired: 1 - type: Physics - type: Fixtures fixtures: @@ -919,7 +919,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: goat sprite: Mobs/Animals/goat.rsi - - type: Carriable + #- type: Carriable - type: Fixtures fixtures: fix1: @@ -1011,7 +1011,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: goose sprite: Mobs/Animals/goose.rsi - - type: Carriable + #- type: Carriable - type: Fixtures fixtures: fix1: @@ -1258,7 +1258,7 @@ sprite: "Effects/creampie.rsi" state: "creampie_human" visible: false - - type: Carriable + #- type: Carriable - type: Hands - type: GenericVisualizer visuals: @@ -1784,7 +1784,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: lizard sprite: Mobs/Animals/lizard.rsi - - type: Carriable + #- type: Carriable - type: Physics - type: Fixtures fixtures: @@ -1839,8 +1839,8 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: slug sprite: Mobs/Animals/slug.rsi - - type: Carriable - freeHandsRequired: 1 + #- type: Carriable + # freeHandsRequired: 1 - type: Physics - type: Fixtures fixtures: @@ -1893,7 +1893,7 @@ noMovementLayers: movement: state: frog - - type: Carriable + #- type: Carriable - type: Physics - type: Fixtures fixtures: @@ -1957,8 +1957,8 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: parrot sprite: Mobs/Animals/parrot.rsi - - type: Carriable - freeHandsRequired: 1 + #- type: Carriable + # freeHandsRequired: 1 - type: Fixtures fixtures: fix1: @@ -2014,7 +2014,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: penguin sprite: Mobs/Animals/penguin.rsi - - type: Carriable + #- type: Carriable - type: Physics - type: Fixtures fixtures: @@ -2148,7 +2148,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: snake sprite: Mobs/Animals/snake.rsi - - type: Carriable + #- type: Carriable - type: Physics - type: Fixtures fixtures: @@ -2211,7 +2211,7 @@ noMovementLayers: movement: state: tarantula - - type: Carriable + #- type: Carriable - type: Physics - type: Fixtures fixtures: @@ -2397,7 +2397,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: possum - - type: Carriable + #- type: Carriable - type: Physics - type: Fixtures fixtures: @@ -2479,7 +2479,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: raccoon - - type: Carriable + #- type: Carriable - type: Physics - type: Fixtures fixtures: @@ -2549,7 +2549,7 @@ noMovementLayers: movement: state: fox - - type: Carriable + #- type: Carriable - type: Physics - type: Fixtures fixtures: @@ -2630,7 +2630,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: corgi - - type: Carriable + #- type: Carriable - type: Physics - type: Speech speechVerb: Canine @@ -2787,7 +2787,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: cat - - type: Carriable + #- type: Carriable - type: Physics - type: Fixtures fixtures: @@ -2978,8 +2978,8 @@ Base: kitten_dead Dead: Base: kitten_dead - - type: Carriable - freeHandsRequired: 1 + #- type: Carriable + # freeHandsRequired: 1 - type: Butcherable spawned: - id: FoodMeat @@ -3021,7 +3021,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: sloth - - type: Carriable + #- type: Carriable - type: Physics - type: Fixtures fixtures: @@ -3088,7 +3088,7 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: ferret - - type: Carriable + #- type: Carriable - type: Physics - type: Fixtures fixtures: @@ -3298,7 +3298,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: pig sprite: Mobs/Animals/pig.rsi - - type: Carriable + #- type: Carriable - type: Fixtures fixtures: fix1: @@ -3374,7 +3374,7 @@ - map: ["enum.DamageStateVisualLayers.Base"] state: nymph sprite: Mobs/Animals/nymph.rsi - - type: Carriable + #- type: Carriable - type: Physics - type: Fixtures fixtures: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index 9e1259994d..0265d5fb15 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -22,7 +22,7 @@ layers: - map: [ "enum.DamageStateVisualLayers.Base" ] state: alive - - type: Carriable # This one is for you, deltanedas o7 + #- type: Carriable # This one is for you, deltanedas o7 - type: CombatMode - type: Physics - type: Fixtures diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index 5779413947..129484420d 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -171,8 +171,8 @@ description: He's da mini rat. He don't make da roolz. noSpawn: true #Must be configured to a King or the AI breaks. components: - - type: Carriable - freeHandsRequired: 1 + #- type: Carriable + # freeHandsRequired: 1 - type: CombatMode - type: MovementSpeedModifier baseWalkSpeed : 3.5 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index f5a500c6b8..8efb0574d2 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml @@ -17,7 +17,7 @@ layers: - map: [ "enum.DamageStateVisualLayers.Base" ] state: blue_adult_slime - - type: Carriable + #- type: Carriable - type: Fixtures fixtures: fix1: diff --git a/Resources/Prototypes/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/Entities/Mobs/Player/ipc.yml index 0b6db530b0..64c6fd8a29 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/ipc.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/ipc.yml @@ -122,7 +122,7 @@ - type: PsionicInsulation - type: OfferItem - type: LayingDown - - type: Carriable + #- type: Carriable - type: entity save: false diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index 84df9ac412..22a5bc0d32 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -12,7 +12,7 @@ species: Arachnid - type: Hunger baseDecayRate: 0.0125 # Spiders have slow metabolisms all things considered, so I decided to just make their hunger drain slower. - - type: Carriable # Carrying system from nyanotrasen. + #- type: Carriable # Carrying system from nyanotrasen. - type: Thirst - type: Sericulture action: ActionSericulture diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml index 42383d9a42..77df89b7f0 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml @@ -11,7 +11,7 @@ baseDecayRate: 0.0083 - type: Thirst baseDecayRate: 0.0083 - - type: Carriable # Carrying system from nyanotrasen. + #- type: Carriable # Carrying system from nyanotrasen. - type: Icon sprite: Mobs/Species/Diona/parts.rsi state: full diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml index 055c6522dd..d2f075383a 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml @@ -7,7 +7,7 @@ components: - type: Hunger - type: Thirst - - type: Carriable # Carrying system from nyanotrasen. + #- type: Carriable # Carrying system from nyanotrasen. - type: Icon sprite: Mobs/Species/Slime/parts.rsi # It was like this beforehand, no idea why. state: full diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index ac373725ce..06de920aaf 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml @@ -10,7 +10,7 @@ sprite: Mobs/Species/Human/parts.rsi state: full - type: Thirst - - type: Carriable # Carrying system from nyanotrasen. + #- type: Carriable # Carrying system from nyanotrasen. - type: Butcherable butcheringType: Spike spawned: diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index 24555486cd..a9db891b52 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -9,7 +9,7 @@ species: Moth - type: Hunger - type: Thirst - - type: Carriable # Carrying system from nyanotrasen. + #- type: Carriable # Carrying system from nyanotrasen. - type: Icon sprite: Mobs/Species/Moth/parts.rsi state: full diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index 0c93f283f4..2baead2d33 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -11,7 +11,7 @@ - type: Puller needsHands: false - type: Thirst - - type: Carriable # Carrying system from nyanotrasen. + #- type: Carriable # Carrying system from nyanotrasen. - type: Icon sprite: Mobs/Species/Reptilian/parts.rsi state: full diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml index 28ea5b030f..e0137505dd 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml @@ -9,7 +9,7 @@ components: - type: HumanoidAppearance species: Skeleton - - type: Carriable # Carrying system from nyanotrasen. + #- type: Carriable # Carrying system from nyanotrasen. - type: Icon sprite: Mobs/Species/Skeleton/parts.rsi state: full diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index 0e05b0c827..c10e68b2bb 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -6,7 +6,7 @@ components: - type: Hunger - type: Thirst - - type: Carriable # Carrying system from nyanotrasen. + #- type: Carriable # Carrying system from nyanotrasen. - type: Icon sprite: Mobs/Species/Slime/parts.rsi state: full diff --git a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml index 61162edf2c..0e68144980 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml @@ -37,8 +37,8 @@ - type: entity parent: BaseItem id: LGBTQHandyFlag - name: LGBTQ handheld flag - description: "The be gay do crime handy flag." + name: флаг Франции #6.21 КОАП РФ + description: Национальный флаг французов #6.21 КОАП РФ components: - type: Sprite sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 9fa5e17cc3..b42604da00 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -90,6 +90,7 @@ - SeniorOfficer - Detective - Warden + - LPPSecurityEnginer - PrisonGuard # Nyanotrasen - PrisonGuard, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml - Brigmedic # DeltaV - Brigmedic, see Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/backpack.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/backpack.yml index 850ea5153d..3675f64140 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/backpack.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/backpack.yml @@ -1,3 +1,12 @@ +- type: entity + parent: LPPClothingBackpackBlueshield + id: LPPClothingBackpackBlueshieldFilled + components: + - type: StorageFill + contents: + - id: Flash + - id: LPPClothingOuterHardsuitBlueshield + - type: entity parent: ClothingBackpackERTLeader id: LPPClothingBackpackIIC diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/duffel.yml index b1be5a5266..cf97d072be 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/duffel.yml @@ -7,6 +7,15 @@ - type: Sprite sprite: _LostParadise/Clothing/Back/Duffels/hop.rsi +- type: entity + parent: LPPClothingBackpackDuffelBlueshield + id: LPPClothingBackpackDuffelBlueshieldFilled + components: + - type: StorageFill + contents: + - id: Flash + - id: LPPClothingOuterHardsuitBlueshield + - type: entity parent: ClothingBackpackDuffel id: LPPClothingBackpackDuffelSecurityEngineer diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/satchel.yml index c87413bcd4..c6a521cd98 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Back/satchel.yml @@ -47,3 +47,12 @@ components: - type: Sprite sprite: _LostParadise/Clothing/Back/Satchels/expeditor.rsi + +- type: entity + parent: LPPClothingBackpackSatchelBlueshield + id: LPPClothingBackpackSatchelBlueshieldFilled + components: + - type: StorageFill + contents: + - id: Flash + - id: LPPClothingOuterHardsuitBlueshield diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hats.yml index 2b7f65fd18..a414d670f8 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hats.yml @@ -119,68 +119,3 @@ sprite: _LostParadise/Clothing/Head/Hats/anon.rsi - type: Clothing sprite: _LostParadise/Clothing/Head/Hats/anon.rsi - -- type: entity - parent: ClothingHeadBase - id: LPPClothingHeadHatAlex - name: Алекс - description: Кто пригласил всех этих идиотов? - components: - - type: Sprite - sprite: _LostParadise/Clothing/Head/Hats/alex.rsi - - type: Clothing - sprite: _LostParadise/Clothing/Head/Hats/alex.rsi - - type: IngestionBlocker - - type: IdentityBlocker - -- type: entity - parent: ClothingHeadBase - id: LPPClothingHeadHatJake - name: Джейк - description: Алло?! Кто это? Дай мне поговорить с твоим начальником! - components: - - type: Sprite - sprite: _LostParadise/Clothing/Head/Hats/jake.rsi - - type: Clothing - sprite: _LostParadise/Clothing/Head/Hats/jake.rsi - - type: IngestionBlocker - - type: IdentityBlocker - -- type: entity - parent: ClothingHeadBase - id: LPPClothingHeadHatRasmus - name: Расмус - description: Я не знаю тебя! Зачем ты здесь? Я тебя не приглашал. - components: - - type: Sprite - sprite: _LostParadise/Clothing/Head/Hats/rasmus.rsi - - type: Clothing - sprite: _LostParadise/Clothing/Head/Hats/rasmus.rsi - - type: IngestionBlocker - - type: IdentityBlocker - -- type: entity - parent: ClothingHeadBase - id: LPPClothingHeadHatRichter - name: Рихтер - description: Ааа, вот ты где! А я всё думал, когда ты вернёшься? - components: - - type: Sprite - sprite: _LostParadise/Clothing/Head/Hats/richter.rsi - - type: Clothing - sprite: _LostParadise/Clothing/Head/Hats/richter.rsi - - type: IngestionBlocker - - type: IdentityBlocker - -- type: entity - parent: ClothingHeadBase - id: LPPClothingHeadHatTony - name: Тони - description: Чувак, эта вечеринка отстой. Я ненавижу этих людей. - components: - - type: Sprite - sprite: _LostParadise/Clothing/Head/Hats/tony.rsi - - type: Clothing - sprite: _LostParadise/Clothing/Head/Hats/tony.rsi - - type: IngestionBlocker - - type: IdentityBlocker diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml index 35f0808dfe..8c9f077bcd 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml @@ -360,6 +360,32 @@ Heat: 0.95 - type: Tag tags: - - HidesHair + # - HidesHair - WhitelistChameleon - - HidesNose \ No newline at end of file + # - HidesNose + +- type: entity + parent: ClothingMaskGas + id: LPPClothingMaskNPZGasmask + name: противогаз спецназа НПЗ + description: Усовершенствованная модель противогаза спецназа из далёких корпоративных воин. Сможет защитить лицо от различных осколков. Защита глаз от вспышек и сварки гарантирована. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Mask/NPZgas.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Mask/NPZgas.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + - type: Tag + tags: + # - HidesHair + - WhitelistChameleon +# - HidesNose + - type: IdentityBlocker + - type: FlashImmunity + - type: EyeProtection \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml index df8878c4e0..3a88a420e8 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml @@ -27,6 +27,7 @@ sprite: _LostParadise/Clothing/Neck/shemags/greenup.rsi - type: Clothing sprite: _LostParadise/Clothing/Neck/shemags/greenup.rsi + - type: IdentityBlocker - type: entity parent: ClothingNeckBase @@ -57,6 +58,7 @@ sprite: _LostParadise/Clothing/Neck/shemags/redup.rsi - type: Clothing sprite: _LostParadise/Clothing/Neck/shemags/redup.rsi + - type: IdentityBlocker - type: entity parent: ClothingNeckBase @@ -87,6 +89,7 @@ sprite: _LostParadise/Clothing/Neck/shemags/blueup.rsi - type: Clothing sprite: _LostParadise/Clothing/Neck/shemags/blueup.rsi + - type: IdentityBlocker - type: entity parent: ClothingNeckBase @@ -117,6 +120,7 @@ sprite: _LostParadise/Clothing/Neck/shemags/brownup.rsi - type: Clothing sprite: _LostParadise/Clothing/Neck/shemags/brownup.rsi + - type: IdentityBlocker - type: entity parent: ClothingNeckBase @@ -147,6 +151,7 @@ sprite: _LostParadise/Clothing/Neck/shemags/purpleup.rsi - type: Clothing sprite: _LostParadise/Clothing/Neck/shemags/purpleup.rsi + - type: IdentityBlocker - type: entity parent: ClothingNeckBase @@ -177,3 +182,37 @@ sprite: _LostParadise/Clothing/Neck/shemags/NPZup.rsi - type: Clothing sprite: _LostParadise/Clothing/Neck/shemags/NPZup.rsi + - type: IdentityBlocker + +- type: entity + parent: ClothingNeckBase + id: LPPClothingNeckShemagWhite + name: белый шемаг + description: тёплая шёлковая ткань, защищающая от пыли и холода, а так же придающая брутальности и тактикульности носителю. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Neck/shemags/whitedown.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Neck/shemags/whitedown.rsi + - type: ToggleableClothing + clothingPrototype: LPPClothingMaskShemagWhite + requiredSlot: + - neck + slot: mask + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} + storagebase: !type:Container + ents: [] + +- type: entity + parent: ClothingMaskBase + id: LPPClothingMaskShemagWhite + noSpawn: true + name: белый шемаг + components: + - type: Sprite + sprite: _LostParadise/Clothing/Neck/shemags/whiteup.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Neck/shemags/whiteup.rsi + - type: IdentityBlocker diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Shoes/boots.yml index 87b13f3717..32de71c901 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Shoes/boots.yml @@ -88,7 +88,7 @@ parent: ClothingShoesMilitaryBase id: LPPClothingShoesBootsNPZ name: Сапоги НПЗ - description: Нет, вы не перепутали обувь цветами, это такой стиль. + description: Крепкие берцы для любой труднопроходимой местности. components: - type: Sprite sprite: _LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Shark/Entities/Mobs/Species/Shark.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Shark/Entities/Mobs/Species/Shark.yml index 19f84064c5..34e7903bbd 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Shark/Entities/Mobs/Species/Shark.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Shark/Entities/Mobs/Species/Shark.yml @@ -63,7 +63,7 @@ - GalacticCommon # # - type: EmotePanel # race: Shark - - type: Carriable + #- type: Carriable - type: entity save: false diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Entities/Mobs/Species/Tajaran.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Entities/Mobs/Species/Tajaran.yml index 1a3e117546..2fe2de7a09 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Entities/Mobs/Species/Tajaran.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Entities/Mobs/Species/Tajaran.yml @@ -15,7 +15,7 @@ Male: MaleTajaran Female: FemaleTajaran Unsexed: FemaleTajaran - - type: Carriable + #- type: Carriable - type: Hunger starvationDamage: types: diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/deliverybox.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/deliverybox.yml deleted file mode 100644 index 0286c6ce81..0000000000 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/deliverybox.yml +++ /dev/null @@ -1,44 +0,0 @@ -- type: entity - parent: PresentRandom - id: LPPSpecialDeliveryBox - name: особая посылка - description: Старая помятая коробка. Пахнет диско и ретро. Интересно, что внутри? - components: - - type: Item - size: Normal - - type: Sprite - sprite: _LostParadise/Objects/Misc/specialdelivery.rsi - layers: - - state: specialdelivery - - type: SpawnItemsOnUse - items: - - id: LPPSpecialDeliveryBoxTrash - - id: LPPClothingHeadHatAlex - orGroup: HotMask - - id: LPPClothingHeadHatJake - orGroup: HotMask - - id: LPPClothingHeadHatRasmus - orGroup: HotMask - - id: LPPClothingHeadHatRichter - orGroup: HotMask -# - id: LPPClothingHeadHatRichard -# orGroup: HotMask - - id: LPPClothingHeadHatTony - orGroup: HotMask - -- type: entity - id: LPPSpecialDeliveryBoxTrash - parent: BaseItem - name: обертка от посылки - description: Пыльная обертка от посылки из картона и скотча. - components: - - type: PhysicalComposition - materialComposition: - Cardboard: 50 - - type: Sprite - sprite: _LostParadise/Objects/Misc/specialdelivery.rsi - state: specialdelivery_unfolded - - type: Tag - tags: - - Trash - - type: SpaceGarbage diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateHunter.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateHunter.yml index 610d7f0ac5..d399755e81 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateHunter.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Storage/CrateHunter.yml @@ -22,5 +22,5 @@ - id: LPPweaponPibodi - id: LPPMagazineBoxHunting - id: LPPClothingOuterHardsuitHunter -# - id: LPPWeaponBattleCutter - - id: LPPWeaponCutterMagazine + # - id: LPPWeaponBattleCutter + # - id: LPPWeaponCutterMagazine diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/BattleCutterammo.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/BattleCutterammo.yml index 3828365f89..13270edd93 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/BattleCutterammo.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/BattleCutterammo.yml @@ -1,38 +1,38 @@ -- type: entity - name: заряд боевого резака - id: LPPWeaponCutterMagazine - parent: BaseItem - components: - - type: Item - size: Small - shape: - - 0,0,2,0 - storedRotation: -90 - - type: Battery - pricePerJoule: 0.15 - maxCharge: 2500 - startingCharge: 2500 - - type: Sprite - sprite: _LostParadise/Objects/Weapons/Guns/Ammunition/Magazine/battlecuttercartridge.rsi - layers: - - map: [ "enum.PowerCellVisualLayers.Base" ] - state: small - - map: [ "enum.PowerCellVisualLayers.Unshaded" ] - state: o2 - - type: SolutionContainerManager - solutions: - battery: - maxVol: 7 - - type: InjectableSolution - solution: battery - - type: DrawableSolution - solution: battery - - type: Tag - tags: - - PowerCell - - type: Appearance - - type: PowerCellVisuals - - type: Riggable - - type: ProjectileBatteryAmmoProvider - proto: BulletCutter - fireCost: 125 +# - type: entity +# name: заряд боевого резака +# id: LPPWeaponCutterMagazine +# parent: BaseItem +# components: +# - type: Item +# size: Small +# shape: +# - 0,0,2,0 +# storedRotation: -90 +# - type: Battery +# pricePerJoule: 0.15 +# maxCharge: 2500 +# startingCharge: 2500 +# - type: Sprite +# sprite: _LostParadise/Objects/Weapons/Guns/Ammunition/Magazine/battlecuttercartridge.rsi +# layers: +# - map: [ "enum.PowerCellVisualLayers.Base" ] +# state: small +# - map: [ "enum.PowerCellVisualLayers.Unshaded" ] +# state: o2 +# - type: SolutionContainerManager +# solutions: +# battery: +# maxVol: 7 +# - type: InjectableSolution +# solution: battery +# - type: DrawableSolution +# solution: battery +# - type: Tag +# tags: +# - PowerCell +# - type: Appearance +# - type: PowerCellVisuals +# - type: Riggable +# - type: ProjectileBatteryAmmoProvider +# proto: BulletCutter +# fireCost: 125 diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/BattleCutter.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/BattleCutter.yml index 727a8bf0b2..e083a79367 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/BattleCutter.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/BattleCutter.yml @@ -1,41 +1,41 @@ -#- type: entity -# name: боевой резак -# parent: BaseWeaponPowerCellSmall -# id: LPPWeaponBattleCutter -# description: Старая модель резаков, что, вроде как, предназначались для горной добычи, теперь же для рубки ксеносов. -# components: -# - type: Sprite -# sprite: _LostParadise/Objects/Weapons/Guns/Pistols/battlecutter.rsi -# layers: -# - state: base -# map: ["enum.GunVisualLayers.Base"] -# - state: mag-unshaded-4 -# map: ["enum.GunVisualLayers.MagUnshaded"] -# shader: unshaded -# - type: Item -# size: Small -# shape: -# - 0,0,1,0 -# - 0,1,0,1 -# - type: Clothing -# sprite: _LostParadise/Objects/Weapons/Guns/Pistols/battlecutter.rsi -# soundForce: true -# slots: -# - Belt -# - suitStorage -# - type: Gun -# soundGunshot: +# - type: entity +# name: боевой резак +# parent: BaseWeaponPowerCellSmall +# id: LPPWeaponBattleCutter +# description: Старая модель резаков, что, вроде как, предназначались для горной добычи, теперь же для рубки ксеносов. +# components: +# - type: Sprite +# sprite: _LostParadise/Objects/Weapons/Guns/Pistols/battlecutter.rsi +# layers: +# - state: base +# map: ["enum.GunVisualLayers.Base"] +# - state: mag-unshaded-4 +# map: ["enum.GunVisualLayers.MagUnshaded"] +# shader: unshaded +# - type: Item +# size: Small +# shape: +# - 0,0,1,0 +# - 0,1,0,1 +# - type: Clothing +# sprite: _LostParadise/Objects/Weapons/Guns/Pistols/battlecutter.rsi +# soundForce: true +# slots: +# - Belt +# - suitStorage +# - type: Gun +# soundGunshot: # path: "/Audio/_LostParadise/Weapons/Guns/Gunshots/BattleCutterFire.ogg" # params: # volume: 100 -# soundForce: true -# - type: AmmoCounter -# - type: ItemSlots -# slots: +# soundForce: true +# - type: AmmoCounter +# - type: ItemSlots +# slots: # gun_magazine: # name: Magazine # startingItem: LPPWeaponCutterMagazine -# - type: MagazineVisuals -# magState: mag -# steps: 5 -# zeroVisible: true +# - type: MagazineVisuals +# magState: mag +# steps: 5 +# zeroVisible: true diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index d75052d5a8..9c072ed7ea 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -218,3 +218,60 @@ startingCharge: 4000 - type: Item size: Large + +- type: entity + name: гибридный модуль S.O.L.E.I.L. + parent: BaseWeaponBatterySmall + id: LPPWeaponEnergyGunSoleil + description: Прототип гибридного лазерного "пистолета", представляющего из себя устройство, что цепляется на локоть, имеет летальный и нелетальный режимы стрельбы. + components: + - type: Sprite + sprite: _LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mode-disabler + shader: unshaded + map: [ "Firemode" ] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: _LostParadise/Objects/Weapons/Guns/Battery/soleil.rsi + - type: Gun + soundGunshot: + path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg + soundEmpty: + path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg + - type: Battery + maxCharge: 750 + startingCharge: 750 + - type: ProjectileBatteryAmmoProvider + proto: BulletDisabler + fireCost: 50 + - type: EnergyGun + fireModes: + - proto: BulletDisabler + fireCost: 50 + name: disable + state: disabler + - proto: BulletEnergyGunLaser + fireCost: 75 + name: lethal + state: lethal + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: GenericVisualizer + visuals: + enum.EnergyGunFireModeVisuals.State: + Firemode: + Disabler: { state: mode-disabler } + Lethal: { state: mode-lethal } + - type: Tag + tags: + - Sidearm + - type: StaticPrice + price: 750 \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 5d43045183..af6b2dc486 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -128,7 +128,7 @@ # Короткий срок пули - type: TimedDespawn lifetime: 0.2 -# + # - type: entity # name : Cutter bolt # id: BulletCutter2 @@ -161,22 +161,22 @@ # - Impassable # - BulletImpassable # fly-by: *flybyfixture - # - type: Ammo - # - type: StaminaDamageOnCollide - # damage: 13 - # - type: Projectile - # impactEffect: BulletImpactEffectDisabler - # # deleteOnCollide: false - # damage: - # types: - # Heat: 5 - # Slash: 8 - # soundHit: - # path: "/Audio/_LostParadise/Weapons/Guns/Gunshots/ion_hit_1.ogg" - # - type: TimedDespawn - # lifetime: 0.4 - # - type: GatheringProjectile -# +# - type: Ammo +# - type: StaminaDamageOnCollide +# damage: 13 +# - type: Projectile +# impactEffect: BulletImpactEffectDisabler +# # deleteOnCollide: false +# damage: +# types: +# Heat: 5 +# Slash: 8 +# soundHit: +# path: "/Audio/_LostParadise/Weapons/Guns/Gunshots/ion_hit_1.ogg" +# - type: TimedDespawn +# lifetime: 0.4 +# - type: GatheringProjectile + # - type: entity # name : battlecutter1 # id: battlecuttershot @@ -190,11 +190,11 @@ # sound: # collection: EnergyMiss # params: -# volume: 5 +# volume: 6 # - type: Sprite # sprite: _LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi # layers: -# - state: ion +# - state: omnilaser # shader: unshaded # - type: Physics # - type: Fixtures @@ -215,3 +215,7 @@ # types: # Blunt: 5 # Slash: 10 +# soundHit: +# collection: WeakHit +# - type: IgniteOnCollide +# fireStacks: 0.2 diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/blueshieldoficer.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/blueshieldoficer.yml index 4141f94ce9..d7aeafcc2a 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/blueshieldoficer.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/CentCom/blueshieldoficer.yml @@ -31,6 +31,8 @@ equipment: jumpsuit: LPPClothingUniformJumpsuitBlueshield head: LPPClothingHeadHatBeretBlueshield + back: LPPClothingBackpackBlueshieldFilled + shoes: ClothingShoesBootsCombatFilled eyes: LPPBlueHudGlasses gloves: ClothingHandsGlovesCombat outerClothing: LPPClothingOuterArmorBlueshield @@ -43,6 +45,8 @@ underwear: LPPBoxer underwear: LPPBriefs breast: LPPBraAltWhite + satchel: LPPClothingBackpackSatchelBlueshieldFilled + duffelbag: LPPClothingBackpackDuffelBlueshieldFilled storage: back: - Flash diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml index 253b43b54d..410b5106b0 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/adjutant.yml @@ -45,9 +45,15 @@ - type: startingGear id: AdjutantGear equipment: + jumpsuit: ClothingUniformJumpsuitAdjutant + back: ClothingBackpackHOPFilled + shoes: ClothingShoesColorBlack id: LPPAdjutantPDA ears: ClothingHeadsetCommand - socks: LPPClothingUnderSocksNorm - underwear: LPPBoxer - underwear: LPPBriefs - breast: LPPBraAltWhite + socks: LPPClothingUnderSocksNormBlue + underwear: LPPBoxerBlue + underwear: LPPBriefsBlue + breast: LPPBraAltBlue + innerClothingSkirt: ClothingUniformJumpskirtAdjutant + satchel: ClothingBackpackSatchelHOPFilled + duffelbag: ClothingBackpackDuffelHOPFilled diff --git a/Resources/Textures/Clothing/Belt/holster.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Belt/holster.rsi/equipped-NECK.png deleted file mode 100644 index 95e9e5713c..0000000000 Binary files a/Resources/Textures/Clothing/Belt/holster.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND-vox.png b/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND-vox.png deleted file mode 100644 index b7f2122c19..0000000000 Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/equipped-HAND-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/equipped-HELMET-hamster.png deleted file mode 100644 index 3b89ea8bdf..0000000000 Binary files a/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/equipped-HELMET-hamster.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json index 100644ef69..2fa646d79a 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json @@ -52,6 +52,14 @@ { "name": "on-equipped-HELMET-vulpkanin", "directions": 4 + }, + { + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET-vox.png deleted file mode 100644 index e24011cc92..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index 5ad3f9c79a..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET-vox.png deleted file mode 100644 index 34d61a07ca..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index 99955187a8..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET-vox.png deleted file mode 100644 index f79fe95b57..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index f94eecb411..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET-vox.png deleted file mode 100644 index 17790bee54..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index d25030e13a..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET-vox.png deleted file mode 100644 index d300533c20..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index a9b1843872..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light-vox.png deleted file mode 100644 index 879ce40a74..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light.png deleted file mode 100644 index 058dc8a0e6..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded-vox.png deleted file mode 100644 index 40f2eca45a..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded.png deleted file mode 100644 index c107e174a5..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-vox.png deleted file mode 100644 index f61a157050..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-vulpkanin.png deleted file mode 100644 index 04d0a81524..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head.png deleted file mode 100644 index f0a064cde4..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-unshaded.png deleted file mode 100644 index b249bec8dc..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-light.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-light.png deleted file mode 100644 index b8ab172934..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-light.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-unshaded.png deleted file mode 100644 index e315b2ba66..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png deleted file mode 100644 index 56dd973dc2..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-light.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-light.png deleted file mode 100644 index 4e69fec7f0..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-light.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-unshaded.png deleted file mode 100644 index 61d8843f40..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png deleted file mode 100644 index 031abbeb5e..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/light-overlay.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/light-overlay.png deleted file mode 100644 index 5347ab016e..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/light-overlay.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json index fe13676420..78c9ef4619 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json @@ -13,12 +13,6 @@ { "name": "icon-flash" }, - { - "name": "icon-unshaded" - }, - { - "name": "light-overlay" - }, { "name": "on-inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET_XENO_LEEP.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET_XENO_LEEP.png deleted file mode 100644 index c6c429696a..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET_XENO_LEEP.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-harpy.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-harpy.png deleted file mode 100644 index 4c614ca87c..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-harpy.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-vox.png deleted file mode 100644 index f02e33c658..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET.png deleted file mode 100644 index 7079528ae6..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-left.png deleted file mode 100644 index 5216ba5dd9..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-right.png deleted file mode 100644 index 2ffe013c12..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-harpy.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-harpy.png deleted file mode 100644 index d5caee7ec0..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-harpy.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index 9a0101f09a..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET.png deleted file mode 100644 index 6f4caecb98..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-left.png deleted file mode 100644 index 6a5d075d80..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-right.png deleted file mode 100644 index 25796fc014..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-vox.png deleted file mode 100644 index 40d1f9a0c6..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-vox.png deleted file mode 100644 index cc2fa16917..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 02363a7faa..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET.png deleted file mode 100644 index 6815576fb6..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-left.png deleted file mode 100644 index ee1c8d1c4b..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-right.png deleted file mode 100644 index fa19eea1f7..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 1a7ed3b866..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET-vulpkanin.png deleted file mode 100644 index 3a48de05d6..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png deleted file mode 100644 index fe62e15b50..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/inhand-left.png deleted file mode 100644 index 6be2c34d76..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/inhand-right.png deleted file mode 100644 index e3c056ada0..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-left.png deleted file mode 100644 index f7375fd600..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-right.png deleted file mode 100644 index c2adc46cdb..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-left.png deleted file mode 100644 index 7c6e7831c8..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-right.png deleted file mode 100644 index 5ee7bc104c..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-left.png deleted file mode 100644 index cafca9a938..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-right.png deleted file mode 100644 index 9645b59e2d..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-left.png deleted file mode 100644 index bff16d72c4..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-right.png deleted file mode 100644 index 355977d540..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-left.png deleted file mode 100644 index b26ae9a31f..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-right.png deleted file mode 100644 index fc0edd4a97..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-left.png deleted file mode 100644 index 3f5034da6c..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-right.png deleted file mode 100644 index 45776a03b8..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-left.png deleted file mode 100644 index 81e8a07fdd..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-right.png deleted file mode 100644 index e10648fd9b..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-left.png deleted file mode 100644 index 8fbfbbf6c6..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-right.png deleted file mode 100644 index 035c6fc061..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-left.png deleted file mode 100644 index 85cbfb321a..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-right.png deleted file mode 100644 index c876fefb6c..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vox.png deleted file mode 100644 index 9f2f5c41df..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index b577d32feb..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-left.png deleted file mode 100644 index b11a533c26..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-right.png deleted file mode 100644 index b9c9df2350..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-left.png deleted file mode 100644 index 12d13f0e18..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-right.png deleted file mode 100644 index 141dc492a4..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/inhand-left.png deleted file mode 100644 index c0c5863a3b..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/inhand-right.png deleted file mode 100644 index f29877bf5a..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/meta.json index afc9f219ac..1c837bb506 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/meta.json @@ -17,6 +17,22 @@ { "name": "equipped-HELMET-vox", "directions": 4 + }, + { + "name": "equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-left.png deleted file mode 100644 index c81cf30dc9..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-right.png deleted file mode 100644 index f5b449d7b9..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-left.png deleted file mode 100644 index 32f699cb47..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-right.png deleted file mode 100644 index 71d2a09325..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vox.png deleted file mode 100644 index 2a3619db8e..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index 5b9e2b19ad..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-left.png deleted file mode 100644 index 68329b89c1..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-right.png deleted file mode 100644 index 38cc8ca8a6..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-left.png deleted file mode 100644 index 742af4cd00..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-right.png deleted file mode 100644 index 79f70ac121..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-light.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-light.png deleted file mode 100644 index fc79dd02ed..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-light.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-reptilian.png deleted file mode 100644 index 388719a0b3..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-shark.png deleted file mode 100644 index 4fd5488d33..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-shark.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-tajaran.png deleted file mode 100644 index 064bb88c32..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-tajaran.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-unshaded.png deleted file mode 100644 index f5741b045f..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-vulpkanin.png deleted file mode 100644 index c76fd2e2a9..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET.png deleted file mode 100644 index a75086dfb5..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light.png deleted file mode 100644 index 8f20cb8114..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded.png deleted file mode 100644 index d29322a71c..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-vulpkanin.png deleted file mode 100644 index 64b43450f4..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head.png deleted file mode 100644 index 4581e3275d..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-unshaded.png deleted file mode 100644 index b6e9cb615d..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/icon-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-light.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-light.png deleted file mode 100644 index 7f1657d9e5..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-light.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-unshaded.png deleted file mode 100644 index fe450b8df1..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left.png deleted file mode 100644 index 81cecd01c2..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-light.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-light.png deleted file mode 100644 index 7749494c56..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-light.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-unshaded.png deleted file mode 100644 index be08f2c257..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right.png deleted file mode 100644 index 2bbec0f04c..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/light-overlay.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/light-overlay.png deleted file mode 100644 index 477e8008ba..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/light-overlay.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json index b9edbe65ef..18e3c07af3 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json @@ -11,35 +11,9 @@ { "name": "icon" }, - { - "name": "icon-unshaded" - }, { "name": "icon-flash" }, - { - "name": "light-overlay" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "equipped-HELMET-tajaran", - "directions": 4 - }, - { - "name": "equipped-HELMET-shark", - "directions": 4 - }, - { - "name": "equipped-HELMET-reptilian", - "directions": 4 - }, { "name": "off-equipped-HELMET", "directions": 4 @@ -79,14 +53,6 @@ { "name": "on-equipped-HELMET-reptilian", "directions": 4 - }, - { - "name": "equipped-HELMET-light", - "directions": 4 - }, - { - "name": "equipped-HELMET-unshaded", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/combat-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/combat-equipped-HELMET.png deleted file mode 100644 index 2f587c5797..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/combat-equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png deleted file mode 100644 index 1b108753b3..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png deleted file mode 100644 index dc0500af77..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png deleted file mode 100644 index c1350c8242..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png deleted file mode 100644 index db67f97b6f..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vox.png deleted file mode 100644 index 5276e3f681..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index 65069f91c7..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-vox.png deleted file mode 100644 index 4f4b2f0f77..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index bf7243ed32..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-vox.png deleted file mode 100644 index 4d5f2cf4b7..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index 8c072609c9..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-left.png deleted file mode 100644 index 90b7c2574a..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-right.png deleted file mode 100644 index de647331f9..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-left.png deleted file mode 100644 index fc11467e8f..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-right.png deleted file mode 100644 index 131989b592..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json index 6154f16edd..6230e5d173 100644 --- a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json index 648760ce17..a9a9848db1 100644 --- a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET-vox.png deleted file mode 100644 index a51c268041..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 81601c6c2b..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 24ea1365cd..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/equipped-HELMET-vulpkanin.png deleted file mode 100644 index 16c2c48bfc..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET-vox.png deleted file mode 100644 index ea6e7edce8..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index 301ff00e34..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET-vulpkanin.png deleted file mode 100644 index c4e6351d9d..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 62ff233af1..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET-vulpkanin.png deleted file mode 100644 index 669368c2bb..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 522a2eb923..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET-vulpkanin.png deleted file mode 100644 index be3734842f..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json index 3cf0b8d484..b2c0264864 100644 --- a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json @@ -14,10 +14,6 @@ "name": "equipped-HELMET", "directions": 4 }, - { - "name": "equipped-HELMET-vox", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 1f6b8adceb..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 47a6bfb145..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png deleted file mode 100644 index e1ed2d59ae..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png deleted file mode 100644 index 634828f1b3..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json index 20fb373db6..183601219a 100644 --- a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json @@ -14,10 +14,6 @@ "name": "equipped-HELMET", "directions": 4 }, - { - "name": "equipped-HELMET-vox", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 59f1e3263b..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET-vulpkanin.png deleted file mode 100644 index f10c9173ff..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Helmets/templar.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 3572a5de9f..0000000000 Binary files a/Resources/Textures/Clothing/Head/Helmets/templar.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 35cfa8ddc0..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET-vulpkanin.png deleted file mode 100644 index 00ba0d43cd..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 90ad846f9b..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET-vulpkanin.png deleted file mode 100644 index c63759a064..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 35cfa8ddc0..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET-vulpkanin.png deleted file mode 100644 index 5a06dac6f9..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 2a8f1b0cdb..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET-vulpkanin.png deleted file mode 100644 index c9c0d6c90e..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 4b90b700a8..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET-vulpkanin.png deleted file mode 100644 index 17a9bfdbd3..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET-vox.png deleted file mode 100644 index 402d6bf76a..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET-vulpkanin.png deleted file mode 100644 index be2125f535..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json index 5e5c1cf2e0..e71a5ed68f 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vox", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET-vox.png deleted file mode 100644 index d4a1f0848e..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET-vulpkanin.png deleted file mode 100644 index 43e99670fd..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vox.png deleted file mode 100644 index ab6cf612af..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vulpkanin.png deleted file mode 100644 index 5f7368e432..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json index 04f0d87cf2..717ba4eee1 100644 --- a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json @@ -13,10 +13,6 @@ { "name": "equipped-HELMET", "directions": 4 - }, - { - "name": "equipped-HELMET-vox", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json index f863987313..b2b547ba43 100644 --- a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json @@ -93,6 +93,14 @@ { "name": "equipped-MASK-kangaroo", "directions": 4 + }, + { + "name": "equipped-MASK-secdog", + "directions": 4 + }, + { + "name": "up-equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-vox.png deleted file mode 100644 index 0a7c6fc327..0000000000 Binary files a/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-vox.png deleted file mode 100644 index 7170d7ebdf..0000000000 Binary files a/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-vox.png deleted file mode 100644 index 8975b1eb04..0000000000 Binary files a/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-vox.png deleted file mode 100644 index bc0f5e9011..0000000000 Binary files a/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json b/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json index bec80f22c2..b3c07ef7cd 100644 --- a/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json @@ -25,6 +25,18 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-tajaran", + "directions": 4 + }, + { + "name": "equipped-MASK-shark", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vox.png deleted file mode 100644 index f504228f7d..0000000000 Binary files a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-vox.png deleted file mode 100644 index ff33f30944..0000000000 Binary files a/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/up-equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/up-equipped-MASK-vox.png deleted file mode 100644 index e701323f55..0000000000 Binary files a/Resources/Textures/Clothing/Mask/gassecurity.rsi/up-equipped-MASK-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-vox.png deleted file mode 100644 index 59a80479f7..0000000000 Binary files a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-vox.png deleted file mode 100644 index 9bd2b35d77..0000000000 Binary files a/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json index 6da3a8f83c..a934bcd912 100644 --- a/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json @@ -25,6 +25,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vox.png deleted file mode 100644 index c3fa7f5917..0000000000 Binary files a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK-vox.png deleted file mode 100644 index 770ad70cf5..0000000000 Binary files a/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK-vulpkanin.png deleted file mode 100644 index 99c3205640..0000000000 Binary files a/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json index 0ea6a0c5ba..9c86b362b2 100644 --- a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json @@ -65,6 +65,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/up-equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/up-equipped-MASK-vulpkanin.png deleted file mode 100644 index d8ae1134fb..0000000000 Binary files a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/up-equipped-MASK-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-vox.png deleted file mode 100644 index cab47297f0..0000000000 Binary files a/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-vox.png deleted file mode 100644 index 529c87878e..0000000000 Binary files a/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-vox.png deleted file mode 100644 index 924742fa94..0000000000 Binary files a/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json index 769271bf05..45fdbe5212 100644 --- a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json @@ -25,6 +25,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-vox.png deleted file mode 100644 index 4ceaf59677..0000000000 Binary files a/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/sterile.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/sterile.rsi/equipped-MASK-vox.png deleted file mode 100644 index 18c64e1048..0000000000 Binary files a/Resources/Textures/Clothing/Mask/sterile.rsi/equipped-MASK-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json b/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json index c6ca846cf5..741615e460 100644 --- a/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json @@ -33,6 +33,10 @@ { "name": "equipped-MASK-reptilian", "directions": 4 + }, + { + "name": "up-equipped-MASK-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/sterile.rsi/up-equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/sterile.rsi/up-equipped-MASK-vox.png deleted file mode 100644 index 770ad70cf5..0000000000 Binary files a/Resources/Textures/Clothing/Mask/sterile.rsi/up-equipped-MASK-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/equipped-NECK.png index 1bf0eeba71..3dc4a73feb 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/icon.png index b81ad3dddb..679e4c7640 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/ace.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/equipped-NECK.png index 80a27e48f6..1e02dea8ac 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/icon.png index 0426a30945..3201545532 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/aro.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/equipped-NECK.png index 77e9c2bd4d..929c5ade05 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/icon.png index 51353910da..c140f1895f 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/bi.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/equipped-NECK.png index 6983acd036..97b01ccf5c 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/icon.png index 191de8786a..115d226bbc 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/enby.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/equipped-NECK.png index cf6c7acdac..adf65f34f2 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/icon.png index 3e864b37be..e0623b2d15 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/gay.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/equipped-NECK.png index 30334415f1..7215d38698 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/icon.png index 2c1054e46a..92ac14c8d8 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/intersex.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/equipped-NECK.png index 257de32121..b4069cde17 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/icon.png index 3518554230..8420c0cbd6 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/les.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/equipped-NECK.png index db81ed15ee..c545e6cc6c 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/icon.png index 1bac95d0e4..448c42a6b0 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/pan.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/equipped-NECK.png index a71e8ae3a9..7de1bb6e71 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/icon.png index 6aeeeff755..9ecf2bca6d 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/trans.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 115119720c..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index a6404231f9..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json index f8f2fba961..820fba5a30 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json @@ -14,10 +14,6 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-reptilian", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index c84901fb25..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 0a1a8fb684..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 27a1d51e6a..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index f0e99ee3c3..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json index c429d1116c..d5cd1c5bad 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json @@ -14,10 +14,6 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 33dcf1b75b..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index e08fcd7229..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/general.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index 480e65bcf0..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index a75abc22ea..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index ce03591b44..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING-reptilian.png deleted file mode 100644 index d9ab22b435..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi/equipped-OUTERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341324.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341324.png deleted file mode 100644 index ae51ad43da..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341324.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341325.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341325.png deleted file mode 100644 index 88fa7daa7a..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341325.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341326.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341326.png deleted file mode 100644 index 4e4a1911e6..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341326.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341327.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341327.png deleted file mode 100644 index e813524516..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341327.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 488d58f186..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 1b47cb65f0..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 881cdffd80..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 7c5ac81dd3..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 8023b4caeb..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET-reptilian.png deleted file mode 100644 index fa46fdac0e..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 03d004ae76..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET-reptilian.png deleted file mode 100644 index dadd841efc..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 710685c250..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on-i.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on-i.png deleted file mode 100644 index 8ac7d47e22..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on-i.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET-reptilian.png deleted file mode 100644 index 3a7fa01664..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 4d6abd4fbc..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET-reptilian.png deleted file mode 100644 index 5be3860724..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 659e9d1593..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index f5a2082efd..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 9e1049cf81..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/duck-slippers.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Misc/duck-slippers.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index d177a998f0..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Misc/duck-slippers.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 854d6baa16..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/leather.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Misc/leather.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 93d4ad4826..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Misc/leather.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 8c15a41b57..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 9c1fd2efe3..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index fdd0b43ae9..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index c23e5508f0..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 867acd10b7..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index e1517b2365..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi/meta.json index f4db66aa0e..08d784ecc0 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi/meta.json @@ -13,10 +13,6 @@ { "name": "equipped-FEET", "directions": 4 - }, - { - "name": "equipped-FEET-reptilian", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 3d9317f18c..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index bd005129e3..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index d763a37f36..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/large_clown.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/large_clown.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index c859474285..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Specific/large_clown.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 0e523c6704..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index ef90b174d7..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/equipped-FEET-reptilian.png deleted file mode 100644 index 2b090cdfd9..0000000000 Binary files a/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/equipped-FEET-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json index 2b78bcd698..2cfe8371a7 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json @@ -13,6 +13,18 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json index 2b78bcd698..2cfe8371a7 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json @@ -13,6 +13,18 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json index 2b78bcd698..2cfe8371a7 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json @@ -13,6 +13,18 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index d8960add98..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 317f89c00f..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index cba1d28f0e..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 49851b9bb7..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 9255751a8e..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 0391ee21e8..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 546b81558a..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index cc0cf452b7..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 3f34c5be8b..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index f4d7057e87..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_syndie.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_syndie.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 2ba22afa79..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_syndie.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index b4fbf22af0..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index a26665a2c3..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 8f1055ef54..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 4dddbe160b..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index deaa8f3ce8..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 8e73b8c062..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index bf5c3aa1d9..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index f10a193710..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 4301ebaa08..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cossack.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cossack.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 6776388d92..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cossack.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 63a349a59f..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 00c03e85a7..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 25cd1faabf..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index fff9f1e87e..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 14a9971cab..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 24580f676c..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index be62f857dc..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index dc75131489..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 4e04083a25..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index a0e52e41f0..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index e748677ae1..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 6d943fcc54..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/meta.json index 9235d22fb2..05e967ad19 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/meta.json @@ -13,7 +13,7 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 777e7bab93..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 34418d86b8..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 1bd7b93004..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index a1f7b446dd..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 46f37517fc..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index d7e3353385..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json index 8fe98eacbe..e643f2360d 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json @@ -21,6 +21,18 @@ { "name": "overlay-inhand-right", "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index b653b9098e..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 6f3f702482..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 18c92442de..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 4719a7a743..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index c531ba4c59..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 25cc127d5f..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index a55e3438e7..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index d0d66766d8..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index d867c165bc..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index c06401e4c0..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index e87050158f..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 39ded499d7..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 29774ea42f..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 8bc1e48d5f..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index f6bef563e2..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index cbfa0a9076..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index d790925131..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 871b47e6b5..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 3660f96127..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 0647feb1d2..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 9adb7abaa5..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 132e70f822..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index b2f938c3f7..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index bba33b69ed..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 6842498c43..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index f895a9776d..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 7a22c7020a..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 76d8c46426..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index ca780d602e..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 36b904794e..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 5fb74c2e39..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 51c23ec028..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index e77a48829f..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 9dec46b1ee..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 6346716b45..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_nt.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_nt.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index b83d03df51..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_nt.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index eb0e370471..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_nt.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_nt.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 038a02fe1b..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_nt.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 11da9384bd..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index e33e2de670..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index a91e1ee91b..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index f873addd83..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json index d09b8a7004..6296d199e7 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json @@ -18,10 +18,6 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, - { - "name": "equipped-INNERCLOTHING-reptilian", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index e6126fdabe..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 84702a9ceb..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index e47e18d589..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index fdf5e0f005..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json index 8fe98eacbe..e643f2360d 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json @@ -21,6 +21,18 @@ { "name": "overlay-inhand-right", "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 260b3f8506..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index cce036889c..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 41b388bc1d..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json index 77a81ca75e..50b4189c5c 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 5061c7cfd1..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 44f7070114..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/syndieformal.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/syndieformal.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 41e3359f1c..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/syndieformal.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING-reptilian.png deleted file mode 100644 index 01d359edce..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING-reptilian.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json index 8fe98eacbe..e643f2360d 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json @@ -21,6 +21,18 @@ { "name": "overlay-inhand-right", "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Interface/Actions/disarm.png b/Resources/Textures/Interface/Actions/disarm.png index cfda495f74..386139f262 100644 Binary files a/Resources/Textures/Interface/Actions/disarm.png and b/Resources/Textures/Interface/Actions/disarm.png differ diff --git a/Resources/Textures/Interface/Actions/disarmOff.png b/Resources/Textures/Interface/Actions/disarmOff.png index 57414f6f74..4efd92db95 100644 Binary files a/Resources/Textures/Interface/Actions/disarmOff.png and b/Resources/Textures/Interface/Actions/disarmOff.png differ diff --git a/Resources/Textures/Interface/Actions/harm.png b/Resources/Textures/Interface/Actions/harm.png index e4cd2fb834..2f8dd94e13 100644 Binary files a/Resources/Textures/Interface/Actions/harm.png and b/Resources/Textures/Interface/Actions/harm.png differ diff --git a/Resources/Textures/Interface/Actions/harmOff.png b/Resources/Textures/Interface/Actions/harmOff.png index e68c585073..8941487f8a 100644 Binary files a/Resources/Textures/Interface/Actions/harmOff.png and b/Resources/Textures/Interface/Actions/harmOff.png differ diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png index ff4e3eb2cf..740cb2102c 100644 Binary files a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png and b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png index 63005e5416..93e0e03631 100644 Binary files a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png and b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png index fbdf7c7e77..0402da86b3 100644 Binary files a/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png and b/Resources/Textures/Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/equipped-HELMET.png deleted file mode 100644 index 5fb14a963a..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/icon.png deleted file mode 100644 index c30c4ad9a1..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/inhand-left.png deleted file mode 100644 index 8c99eeab52..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/inhand-right.png deleted file mode 100644 index a3d3f6923a..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/meta.json deleted file mode 100644 index 69b8f9a187..0000000000 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hats/alex.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Qwerlink(discord dago#7393) for SS220 https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] - } diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/equipped-HELMET.png deleted file mode 100644 index eb704c7448..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/icon.png deleted file mode 100644 index 911c34495e..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/inhand-left.png deleted file mode 100644 index 05ef585d3b..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/inhand-right.png deleted file mode 100644 index ef8d37d417..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/meta.json deleted file mode 100644 index 69b8f9a187..0000000000 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hats/jake.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Qwerlink(discord dago#7393) for SS220 https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] - } diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/equipped-HELMET.png deleted file mode 100644 index a2366c0d38..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/icon.png deleted file mode 100644 index a0965b8432..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/inhand-left.png deleted file mode 100644 index 804848e3d3..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/inhand-right.png deleted file mode 100644 index d96e0fc8f8..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/meta.json deleted file mode 100644 index 69b8f9a187..0000000000 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hats/rasmus.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Qwerlink(discord dago#7393) for SS220 https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] - } diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/equipped-HELMET.png deleted file mode 100644 index 327501fb7c..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/icon.png deleted file mode 100644 index 1fb03a90c3..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/inhand-left.png deleted file mode 100644 index b0f88f388c..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/inhand-right.png deleted file mode 100644 index eb34e1f176..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/meta.json deleted file mode 100644 index 69b8f9a187..0000000000 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hats/richter.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Qwerlink(discord dago#7393) for SS220 https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] - } diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/equipped-HELMET.png deleted file mode 100644 index b43cb8f5f0..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/icon.png deleted file mode 100644 index 2c35c57f95..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/inhand-left.png deleted file mode 100644 index d8bc6539e5..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/inhand-right.png deleted file mode 100644 index 4153c9042c..0000000000 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/meta.json deleted file mode 100644 index 69b8f9a187..0000000000 --- a/Resources/Textures/_LostParadise/Clothing/Head/Hats/tony.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Qwerlink(discord dago#7393) for SS220 https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] - } diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/winterhardsuithelm.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/winterhardsuithelm.rsi/meta.json index b6df9ad690..1741026542 100644 --- a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/winterhardsuithelm.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/winterhardsuithelm.rsi/meta.json @@ -36,6 +36,38 @@ { "name": "on-inhand-right", "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/equipped-MASK.png b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/equipped-MASK.png new file mode 100644 index 0000000000..683d4505b1 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/icon.png new file mode 100644 index 0000000000..1f9f520351 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/inhand-left.png new file mode 100644 index 0000000000..40a7979685 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/inhand-right.png new file mode 100644 index 0000000000..c677b51ad6 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/meta.json new file mode 100644 index 0000000000..f0f9546ac8 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Mask/NPZgas.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Resprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/NPZdown.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/NPZdown.rsi/equipped-NECK.png index a498e80879..06cd3c7fa6 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/NPZdown.rsi/equipped-NECK.png and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/NPZdown.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/NPZup.rsi/equipped-MASK.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/NPZup.rsi/equipped-MASK.png index 7da4c3ea99..1ccd2dd8f6 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/NPZup.rsi/equipped-MASK.png and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/NPZup.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi/equipped-NECK.png new file mode 100644 index 0000000000..3fa44c9e39 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi/icon.png new file mode 100644 index 0000000000..f1e31fd108 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi/meta.json new file mode 100644 index 0000000000..e8ed079623 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whitedown.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Bluemoon https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi/equipped-MASK.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi/equipped-MASK.png new file mode 100644 index 0000000000..d32665f2b7 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi/icon.png new file mode 100644 index 0000000000..f1e31fd108 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi/meta.json new file mode 100644 index 0000000000..28729e502b --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/whiteup.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "evgen99, Spac__", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/winterhunter.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/winterhunter.rsi/meta.json index d45b473678..7bc2f5c71f 100644 --- a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/winterhunter.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/winterhunter.rsi/meta.json @@ -21,6 +21,22 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 } ] } diff --git a/Resources/Textures/_LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi/equipped-FEET.png b/Resources/Textures/_LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi/equipped-FEET.png index 3c326a2bf5..4071a8160f 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi/equipped-FEET.png and b/Resources/Textures/_LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi/icon.png index ef0ca81714..1478918e0d 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi/icon.png and b/Resources/Textures/_LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/maidenNPZ.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/maidenNPZ.rsi/equipped-INNERCLOTHING.png index 52a2ecf2fa..ef972068fe 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/maidenNPZ.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/maidenNPZ.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/meta.json b/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/meta.json index 02580f30fb..451acd6c3b 100644 --- a/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Interface/Misc/lpp_job_icons.rsi/meta.json @@ -39,6 +39,24 @@ }, { "name": "LPPSecurityEnginer" + }, + { + "name": "Passenger" + }, + { + "name": "NoId" + }, + { + "name": "Prisoner" + }, + { + "name": "Geneticist" + }, + { + "name": "Lawyer" + }, + { + "name": "Nanotrasen" } ] } diff --git a/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/moth_antenna.png b/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/moth_antenna.png deleted file mode 100644 index dce2646aea..0000000000 Binary files a/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/moth_antenna.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/moth_markings.png b/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/moth_markings.png deleted file mode 100644 index 2429b0aa12..0000000000 Binary files a/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/moth_markings.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/moth_wings.png b/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/moth_wings.png deleted file mode 100644 index c3461b3be7..0000000000 Binary files a/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/moth_wings.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/stan.png b/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/stan.png deleted file mode 100644 index a454cc87f8..0000000000 Binary files a/Resources/Textures/_LostParadise/Mobs/Customization/moth_parts.rsi/stan.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Mobs/Customization/protogen.rsi/meta.json b/Resources/Textures/_LostParadise/Mobs/Customization/protogen.rsi/meta.json index 535513e2ab..56b022a7d5 100644 --- a/Resources/Textures/_LostParadise/Mobs/Customization/protogen.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Mobs/Customization/protogen.rsi/meta.json @@ -106,6 +106,20 @@ { "name": "protogen_legs_r_rgb", "directions": 4 + }, + { + "name": "protogen_torso_gif000", + "directions": 4, + "delays": [ + [1.0, 0.13, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], + [1.0, 0.13, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], + [1.0, 0.13, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], + [1.0, 0.13, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1] + ] + }, + { + "name": "protogen_torso_rgb000", + "directions": 4 } ] } diff --git a/Resources/Textures/_LostParadise/Mobs/Species/Moth/parst.rsi/meta.json b/Resources/Textures/_LostParadise/Mobs/Species/Moth/parst.rsi/meta.json index 9fc3c4fbd8..4b9d0ac69f 100644 --- a/Resources/Textures/_LostParadise/Mobs/Species/Moth/parst.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Mobs/Species/Moth/parst.rsi/meta.json @@ -60,6 +60,9 @@ { "name": "torso_m", "directions": 4 + }, + { + "name": "nian_m" } ] } \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Mobs/Species/Tajaran/parts.rsi/meta.json b/Resources/Textures/_LostParadise/Mobs/Species/Tajaran/parts.rsi/meta.json index 7f99e6a7c6..8cf79bb156 100644 --- a/Resources/Textures/_LostParadise/Mobs/Species/Tajaran/parts.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Mobs/Species/Tajaran/parts.rsi/meta.json @@ -69,6 +69,9 @@ { "name": "tail_m", "directions": 4 + }, + { + "name": "full" } ] } diff --git a/Resources/Textures/_LostParadise/Mobs/Species/Vulpkanin/parts.rsi/meta.json b/Resources/Textures/_LostParadise/Mobs/Species/Vulpkanin/parts.rsi/meta.json index 1dcfef60e1..a64c329a93 100644 --- a/Resources/Textures/_LostParadise/Mobs/Species/Vulpkanin/parts.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Mobs/Species/Vulpkanin/parts.rsi/meta.json @@ -70,6 +70,10 @@ { "name": "vulpkanin_m", "directions": 4 + }, + { + "name": "eyes", + "directions": 4 } ] } diff --git a/Resources/Textures/_LostParadise/Objects/Fun/belka.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Fun/belka.rsi/meta.json index 7c20ce9918..2363e01cfc 100644 --- a/Resources/Textures/_LostParadise/Objects/Fun/belka.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Fun/belka.rsi/meta.json @@ -9,6 +9,14 @@ "states": [ { "name": "belka-toy" + }, + { + "name": "belka-toy-inhand-right", + "directions": 4 + }, + { + "name": "belka-toy-inhand-left", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Fun/toys.rsi/meta.json index 4bbe9fa5c2..4933d5998b 100644 --- a/Resources/Textures/_LostParadise/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Fun/toys.rsi/meta.json @@ -238,6 +238,22 @@ { "name": "pebbles-inhand-right", "directions": 4 + }, + { + "name": "amina-inhand-left", + "directions": 4 + }, + { + "name": "amina-inhand-right", + "directions": 4 + }, + { + "name": "crab-inhand-left", + "directions": 4 + }, + { + "name": "crab-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/_LostParadise/Objects/Misc/specialdelivery.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Misc/specialdelivery.rsi/meta.json deleted file mode 100644 index 9e64816e71..0000000000 --- a/Resources/Textures/_LostParadise/Objects/Misc/specialdelivery.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Qwerlink(discord dago#7393) for SS220 https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "specialdelivery" - }, - { - "name": "specialdelivery_unfolded" - } - ] - } diff --git a/Resources/Textures/_LostParadise/Objects/Misc/specialdelivery.rsi/specialdelivery.png b/Resources/Textures/_LostParadise/Objects/Misc/specialdelivery.rsi/specialdelivery.png deleted file mode 100644 index 16963643de..0000000000 Binary files a/Resources/Textures/_LostParadise/Objects/Misc/specialdelivery.rsi/specialdelivery.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Objects/Misc/specialdelivery.rsi/specialdelivery_unfolded.png b/Resources/Textures/_LostParadise/Objects/Misc/specialdelivery.rsi/specialdelivery_unfolded.png deleted file mode 100644 index b807215164..0000000000 Binary files a/Resources/Textures/_LostParadise/Objects/Misc/specialdelivery.rsi/specialdelivery_unfolded.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/hos-laser.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/hos-laser.rsi/meta.json index eafe3e519b..8357d8efea 100644 --- a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/hos-laser.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/hos-laser.rsi/meta.json @@ -32,6 +32,13 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "mag-unshaded-0" } ] } diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/lato.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/lato.rsi/meta.json index f66a392475..6fba53ac04 100644 --- a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/lato.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Pistols/lato.rsi/meta.json @@ -29,6 +29,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/ion.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/ion.png deleted file mode 100644 index 25f46e32b0..0000000000 Binary files a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/ion.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/meta.json index 1443b5465a..f87ad790f6 100644 --- a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/meta.json @@ -10,9 +10,6 @@ { "name": "omnilaser" }, - { - "name": "ion" - }, { "name": "omnilaser_greyscale" }, diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/omnilaser.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/omnilaser.png index 34ddcc86ba..25f46e32b0 100644 Binary files a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/omnilaser.png and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi/omnilaser.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-12.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-12.png deleted file mode 100644 index 39e06d114e..0000000000 Binary files a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-12.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-20.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-20.png deleted file mode 100644 index 20e7201092..0000000000 Binary files a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-20.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-32.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-32.png deleted file mode 100644 index d98af343e6..0000000000 Binary files a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-32.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-8.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-8.png deleted file mode 100644 index 6d2b3fd034..0000000000 Binary files a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Rifles/old-rifle.rsi/mag-unshaded-8.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Structures/cryostorage.rsi/meta.json b/Resources/Textures/_LostParadise/Structures/cryostorage.rsi/meta.json deleted file mode 100644 index ed9f72a60e..0000000000 --- a/Resources/Textures/_LostParadise/Structures/cryostorage.rsi/meta.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "sleeper_0", - "directions": 4 - }, - { - "name": "sleeper_1", - "directions": 4, - "delays": [ - [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05], - [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05], - [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05], - [1.5, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05] - ] - } - ] -} diff --git a/Resources/Textures/_LostParadise/Structures/cryostorage.rsi/sleeper_0.png b/Resources/Textures/_LostParadise/Structures/cryostorage.rsi/sleeper_0.png deleted file mode 100644 index 0274cafa44..0000000000 Binary files a/Resources/Textures/_LostParadise/Structures/cryostorage.rsi/sleeper_0.png and /dev/null differ diff --git a/Resources/Textures/_LostParadise/Structures/cryostorage.rsi/sleeper_1.png b/Resources/Textures/_LostParadise/Structures/cryostorage.rsi/sleeper_1.png deleted file mode 100644 index 041e54c075..0000000000 Binary files a/Resources/Textures/_LostParadise/Structures/cryostorage.rsi/sleeper_1.png and /dev/null differ