Skip to content

Commit

Permalink
fix upstream
Browse files Browse the repository at this point in the history
Update attributions.yml

fix

Delete attributions.yml

Update attributions.yml
  • Loading branch information
Rxup committed Dec 23, 2024
1 parent 1be2c8c commit c6c7527
Show file tree
Hide file tree
Showing 168 changed files with 184 additions and 512 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/validate-rgas.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: RGA schema validator
on:
push:
branches: [ master, staging, stable ]
merge_group:
pull_request:
types: [ opened, reopened, synchronize, ready_for_review ]

jobs:
yaml-schema-validation:
name: YAML RGA schema validator
if: github.actor != 'PJBot' && github.event.pull_request.draft == false
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- name: Setup Submodule
run: git submodule update --init
- name: Pull engine updates
uses: space-wizards/[email protected]
- uses: PaulRitter/yaml-schema-validator@v1
with:
schema: RobustToolbox/Schemas/rga.yml
path_pattern: .*attributions.ya?ml$
validators_path: RobustToolbox/Schemas/rga_validators.py
validators_requirements: RobustToolbox/Schemas/rga_requirements.txt
26 changes: 26 additions & 0 deletions .github/workflows/validate-rsis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: RSI Validator

on:
push:
branches: [ master, staging, stable ]
merge_group:
pull_request:
paths:
- '**.rsi/**'

jobs:
validate_rsis:
name: Validate RSIs
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- name: Setup Submodule
run: git submodule update --init
- name: Pull engine updates
uses: space-wizards/[email protected]
- name: Install Python dependencies
run: |
pip3 install --ignore-installed --user pillow jsonschema
- name: Validate RSIs
run: |
python3 RobustToolbox/Schemas/validate_rsis.py Resources/
122 changes: 61 additions & 61 deletions Resources/Audio/Ambience/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,65 +3,65 @@
copyright: "Created by Joao_Janz, edited and converted to Mono by EmoGarbage"
source: "https://freesound.org/people/Joao_Janz/sounds/478472/"

- files: ["ambiatmos.ogg,
ambiatmos2.ogg,
ambicave.ogg,
ambicha1.ogg,
ambicha2.ogg,
ambicha3.ogg,
ambicha4.ogg,
ambidanger.ogg,
ambidanger2.ogg,
ambigen1.ogg,
ambigen2.ogg,
ambigen3.ogg,
ambigen4.ogg,
ambigen5.ogg,
ambigen6.ogg,
ambigen7.ogg,
ambigen8.ogg,
ambigen9.ogg,
ambigen10.ogg,
ambigen11.ogg,
ambigen12.ogg,
ambigen13.ogg,
ambigen14.ogg,
ambigen15.ogg,
ambiholy.ogg,
ambiholy2.ogg,
ambiholy3.ogg,
ambilava1.ogg,
ambilava2.ogg,
ambilava3.ogg,
ambimaint1.ogg,
ambimaint2.ogg,
ambimaint3.ogg,
ambimaint4.ogg,
ambimaint5.ogg,
ambimine.ogg,
ambimo1.ogg,
ambimo2.ogg,
ambimystery.ogg,
ambinice.ogg,
ambiodd.ogg,
ambireebe1.ogg,
ambireebe3.ogg,
ambiruin.ogg,
ambiruin2.ogg,
ambiruin3.ogg,
ambiruin4.ogg,
ambiruin5.ogg,
ambiruin6.ogg,
ambiruin7.ogg,
ambisin1.ogg,
ambisin2.ogg,
ambisin3.ogg,
ambisin4.ogg,
ambitech.ogg,
ambitech2.ogg,
ambitech3.ogg,
maintambience.ogg,
ambispace2.ogg"]
- files: ["ambiatmos.ogg",
"ambiatmos2.ogg",
"ambicave.ogg",
"ambicha1.ogg",
"ambicha2.ogg",
"ambicha3.ogg",
"ambicha4.ogg",
"ambidanger.ogg",
"ambidanger2.ogg",
"ambigen1.ogg",
"ambigen2.ogg",
"ambigen3.ogg",
"ambigen4.ogg",
"ambigen5.ogg",
"ambigen6.ogg",
"ambigen7.ogg",
"ambigen8.ogg",
"ambigen9.ogg",
"ambigen10.ogg",
"ambigen11.ogg",
"ambigen12.ogg",
"ambigen13.ogg",
"ambigen14.ogg",
"ambigen15.ogg",
"ambiholy.ogg",
"ambiholy2.ogg",
"ambiholy3.ogg",
"ambilava1.ogg",
"ambilava2.ogg",
"ambilava3.ogg",
"ambimaint1.ogg",
"ambimaint2.ogg",
"ambimaint3.ogg",
"ambimaint4.ogg",
"ambimaint5.ogg",
"ambimine.ogg",
"ambimo1.ogg",
"ambimo2.ogg",
"ambimystery.ogg",
"ambinice.ogg",
"ambiodd.ogg",
"ambireebe1.ogg",
"ambireebe3.ogg",
"ambiruin.ogg",
"ambiruin2.ogg",
"ambiruin3.ogg",
"ambiruin4.ogg",
"ambiruin5.ogg",
"ambiruin6.ogg",
"ambiruin7.ogg",
"ambisin1.ogg",
"ambisin2.ogg",
"ambisin3.ogg",
"ambisin4.ogg",
"ambitech.ogg",
"ambitech2.ogg",
"ambitech3.ogg",
"maintambience.ogg",
"ambispace2.ogg"]
license: "CC-BY-SA-3.0"
copyright: "Taken from /tg/station"
source: "https://github.com/tgstation/tgstation/tree/ae9767664701396501af5dcef8e34c4b5add3d47/sound/ambience"
Expand Down Expand Up @@ -96,8 +96,8 @@
copyright: "Created by Discord handle pigeonpeas, Soundcloud handle pigeonbeans"
source: "https://soundcloud.com/pigeonbeans/unanchored"

- files: ["spookyspace1.ogg,
spookyspace2.ogg"]
- files: ["spookyspace1.ogg",
"spookyspace2.ogg"]
license: "CC0-1.0"
copyright: "Taken from /vg/station"
source: "https://github.com/vgstation-coders/vgstation13/commit/23303188abe6fe31b114a218a1950d7325a23730"
Expand Down
Empty file.
2 changes: 1 addition & 1 deletion Resources/Audio/Misc/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@
- files: ["white.ogg"]
license: "CC-BY-SA-3.0"
copyright: "GTT_EDMI"
source:
source: "https://t.me/silero_voice_bot"
6 changes: 3 additions & 3 deletions Resources/Audio/Nyanotrasen/Mobs/GlimmerWisp/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
license: "CC-BY-SA-4.0"
copyright: "From battle for wesnoth"
source: "https://github.com/wesnoth/wesnoth"

- files: ["magic_missile_3.ogg"]
license: "CC-BY-SA-4.0"
copyright: "From battle for wesnoth"
source: "https://github.com/wesnoth/wesnoth"

- files: ["wisp_ambience.ogg"]
license: "CC-BY-4.0"
copyright: "Created by AlienXXX, touched up by Rane""
copyright: "Created by AlienXXX, touched up by Rane"
source: "https://freesound.org/people/AlienXXX/sounds/123647/"
13 changes: 1 addition & 12 deletions Resources/Prototypes/_Backmen/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,17 +153,6 @@
categories:
- UplinkWeaponry

- type: listing
id: UplinkSpecialDelivery
name: особая посылка
description: Посылка с случайной маской психов Майами!
icon: { sprite: Backmen/Objects/Misc/specialdelivery.rsi, state: specialdelivery }
productEntity: SpecialDeliveryBox
cost:
Telecrystal: 1
categories:
- UplinkPointless

- type: listing
id: UplinkExperimentalSyndicateTeleporter
name: uplink-experimental-syndicate-teleporter-name
Expand All @@ -172,4 +161,4 @@
cost:
Telecrystal: 10
categories:
- UplinkDeception
- UplinkDeception
65 changes: 0 additions & 65 deletions Resources/Prototypes/_Backmen/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -315,71 +315,6 @@
- type: Clothing
sprite: Backmen/Clothing/Head/Hats/anon.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatAlex
name: Алекс
description: Кто пригласил всех этих идиотов?
components:
- type: Sprite
sprite: Backmen/Clothing/Head/Hats/alex.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Hats/alex.rsi
- type: IngestionBlocker
- type: IdentityBlocker

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatJake
name: Джейк
description: Алло?! Кто это? Дай мне поговорить с твоим начальником!
components:
- type: Sprite
sprite: Backmen/Clothing/Head/Hats/jake.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Hats/jake.rsi
- type: IngestionBlocker
- type: IdentityBlocker

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatRasmus
name: Расмус
description: Я не знаю тебя! Зачем ты здесь? Я тебя не приглашал.
components:
- type: Sprite
sprite: Backmen/Clothing/Head/Hats/rasmus.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Hats/rasmus.rsi
- type: IngestionBlocker
- type: IdentityBlocker

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatRichter
name: Рихтер
description: Ааа, вот ты где! А я всё думал, когда ты вернёшься?
components:
- type: Sprite
sprite: Backmen/Clothing/Head/Hats/richter.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Hats/richter.rsi
- type: IngestionBlocker
- type: IdentityBlocker

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatTony
name: Тони
description: Чувак, эта вечеринка отстой. Я ненавижу этих людей.
components:
- type: Sprite
sprite: Backmen/Clothing/Head/Hats/tony.rsi
- type: Clothing
sprite: Backmen/Clothing/Head/Hats/tony.rsi
- type: IngestionBlocker
- type: IdentityBlocker

- type: entity # backmen
parent: ClothingMaskBase
id: ClothingMaskBal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,44 +0,0 @@
- type: entity
parent: PresentRandom
id: SpecialDeliveryBox
name: особая посылка
description: Старая помятая коробка. Пахнет диско и ретро. Интересно, что внутри?
components:
- type: Item
size: Normal
- type: Sprite
sprite: Backmen/Objects/Misc/specialdelivery.rsi
layers:
- state: specialdelivery
- type: SpawnItemsOnUse
items:
- id: SpecialDeliveryBoxTrash
- id: ClothingHeadHatAlex
orGroup: HotMask
- id: ClothingHeadHatJake
orGroup: HotMask
- id: ClothingHeadHatRasmus
orGroup: HotMask
- id: ClothingHeadHatRichter
orGroup: HotMask
- id: ClothingHeadHatRichard
orGroup: HotMask
- id: ClothingHeadHatTony
orGroup: HotMask

- type: entity
id: SpecialDeliveryBoxTrash
parent: BaseItem
name: обертка от посылки
description: Пыльная обертка от посылки из картона и скотча.
components:
- type: PhysicalComposition
materialComposition:
Cardboard: 50
- type: Sprite
sprite: Backmen/Objects/Misc/specialdelivery.rsi
state: specialdelivery_unfolded
- type: Tag
tags:
- Trash
- type: SpaceGarbage
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo.
components:
- type: Sprite
sprite: Backmen/Objects/Weapons/Gunsx64/Revolver/mateba.rsi/big.rsi
sprite: Backmen/Objects/Weapons/Gunsx64/Revolver/mateba/big.rsi
- type: Clothing
sprite: Backmen/Objects/Weapons/Gunsx64/Revolver/mateba.rsi/tiny.rsi
sprite: Backmen/Objects/Weapons/Gunsx64/Revolver/mateba/tiny.rsi
- type: Item
sprite: Backmen/Objects/Weapons/Gunsx64/Revolver/mateba.rsi/tiny.rsi
sprite: Backmen/Objects/Weapons/Gunsx64/Revolver/mateba/tiny.rsi
- type: Gun
fireRate: 3
cameraRecoilScalar: 2
Expand Down
Loading

0 comments on commit c6c7527

Please sign in to comment.