Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Плащик для ОСЩ #181

Closed
wants to merge 39 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
f3412a9
added blueshield
pxc1984 Jun 11, 2024
2cfe060
added blueshield to sunrise maps
pxc1984 Jun 11, 2024
c483892
Merge branch 'master' into blueshield
pxc1984 Jun 11, 2024
851e34b
Добавил токен для update_changelog.yml
VigersRay Jun 12, 2024
151f906
Merge remote-tracking branch 'origin/master'
VigersRay Jun 12, 2024
1b43f31
пустой комит
VigersRay Jun 12, 2024
8b391a0
Тест авточейнжлога (#69)
VigersRay Jun 12, 2024
b6f16dd
пустой коммит 2
VigersRay Jun 12, 2024
9b8c40d
Test changelog (#70)
VigersRay Jun 12, 2024
fad83e5
update update_changelog.yml
VigersRay Jun 12, 2024
195b8f2
Test changelog (#71)
VigersRay Jun 12, 2024
4521fa2
update update_changelog.yml
VigersRay Jun 12, 2024
014aabb
Merge branch 'refs/heads/master' into test_changelog
VigersRay Jun 12, 2024
a298410
Test changelog (#72)
VigersRay Jun 12, 2024
8064920
update update_changelog.yml
VigersRay Jun 12, 2024
876a2e1
Merge branch 'refs/heads/master' into test_changelog
VigersRay Jun 12, 2024
e228ae1
Test changelog (#73)
VigersRay Jun 12, 2024
d099409
попробуем так...
VigersRay Jun 12, 2024
d2440bd
Merge branch 'refs/heads/master' into test_changelog
VigersRay Jun 12, 2024
11b2528
Test changelog (#74)
VigersRay Jun 12, 2024
532939e
Merge branch 'refs/heads/master' into test_changelog
VigersRay Jun 12, 2024
48a40aa
как же я заебался
VigersRay Jun 12, 2024
a853680
Test changelog (#75)
VigersRay Jun 12, 2024
c9f8976
ДА СУКА
VigersRay Jun 12, 2024
742cf7d
Merge branch 'refs/heads/master' into test_changelog
VigersRay Jun 12, 2024
0246e35
Test changelog (#76)
VigersRay Jun 12, 2024
1030166
Update update_changelog.yml
VigersRay Jun 12, 2024
3a26092
Merge branch 'refs/heads/master' into test_changelog
VigersRay Jun 12, 2024
c91fe67
ну ради бога
VigersRay Jun 12, 2024
e750854
Merge branch 'refs/heads/test_changelog' into VigersRay-patch-3
VigersRay Jun 12, 2024
99e2bcf
Update update_changelog.yml (#77)
VigersRay Jun 12, 2024
9825cf2
пустой комит
VigersRay Jun 12, 2024
bb8b1e0
Vigers ray patch 3 (#78)
VigersRay Jun 12, 2024
532baa3
Update update_changelog.yml
VigersRay Jun 12, 2024
24837c9
Merge branch 'refs/heads/VigersRay-patch-3'
VigersRay Jun 12, 2024
020236a
review changes fix
pxc1984 Jun 13, 2024
9f2727b
Merge branch 'master_shit' into blueshield
pxc1984 Jun 13, 2024
e6a6b96
Теперь X-01 у ОСЩ, и цель у предателей на него
pxc1984 Jun 13, 2024
a2398b2
review changes fix
pxc1984 Jun 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions .github/workflows/update_changelog.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
name: Update sunrise changelog

on:
push:
branches: [master]
Expand All @@ -13,22 +15,23 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.x'

- name: Install Dependencies
run: pip install pyyaml

- name: Extract Changelog from PR
run: python3 Tools/update_changelog.py "${{ github.event.pull_request.body }}" "Resources/Changelog/ChangelogSunrise.yml"

- name: Commit and Push Changes
run: |
git config --global user.name 'github-actions[bot]'
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
git config --global user.name 'VigersRay'
git config --global user.email '[email protected]'
git remote set-url origin https://${{ secrets.GH_TOKEN }}@github.com/VigersRay/repository.git
git add Resources/Changelog/ChangelogSunrise.yml
git commit -m 'Update changelog from PR #${{ github.event.pull_request.number }}'
git push
git push HEAD:master
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/_sunrise/job/department.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
department-Law = Юридический отдел
department-CentralCommand = Центральное командование
department-Blueshield = Синий Щит
86 changes: 63 additions & 23 deletions Resources/Maps/_Sunrise/Station/box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10478,6 +10478,12 @@ entities:
- type: Transform
pos: -11.5,0.5
parent: 8364
- uid: 9450
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -19.5,-11.5
parent: 8364
- uid: 15493
components:
- type: Transform
Expand Down Expand Up @@ -11013,7 +11019,7 @@ entities:
linkedPorts:
12469:
- DoorStatus: Close
- proto: AirlockExternalGlassShuttleArrivals
- proto: AirlockExternalGlassShuttleArrivalsLocked
entities:
- uid: 606
components:
Expand Down Expand Up @@ -11426,12 +11432,6 @@ entities:
rot: 3.141592653589793 rad
pos: -38.5,0.5
parent: 8364
- uid: 11913
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -19.5,-11.5
parent: 8364
- uid: 11980
components:
- type: Transform
Expand Down Expand Up @@ -11838,6 +11838,12 @@ entities:
parent: 8364
- proto: AirlockMaintCommandLocked
entities:
- uid: 11913
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -25.5,-12.5
parent: 8364
- uid: 14187
components:
- type: Transform
Expand Down Expand Up @@ -12125,12 +12131,6 @@ entities:
rot: 1.5707963267948966 rad
pos: -62.5,-13.5
parent: 8364
- uid: 14996
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -25.5,-12.5
parent: 8364
- uid: 15001
components:
- type: Transform
Expand Down Expand Up @@ -15544,6 +15544,11 @@ entities:
- type: Transform
pos: -19.5,16.5
parent: 8364
- uid: 20939
components:
- type: Transform
pos: -23.5,-9.5
parent: 8364
- uid: 21210
components:
- type: Transform
Expand Down Expand Up @@ -15677,6 +15682,14 @@ entities:
rot: 1.5707963267948966 rad
pos: 24.5,-27.5
parent: 8364
- proto: BedsheetNT
entities:
- uid: 20984
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -23.5,-9.5
parent: 8364
- proto: BedsheetOrange
entities:
- uid: 26353
Expand Down Expand Up @@ -71295,6 +71308,14 @@ entities:
- type: Transform
pos: 29.484377,-32.156303
parent: 8364
- proto: CurtainsBlueOpen
entities:
- uid: 20985
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -23.5,-9.5
parent: 8364
- proto: d10Dice
entities:
- uid: 10852
Expand Down Expand Up @@ -80608,6 +80629,11 @@ entities:
- type: Transform
pos: 20.5,4.5
parent: 8364
- uid: 21115
components:
- type: Transform
pos: -22.5,-9.5
parent: 8364
- proto: DresserCaptainFilled
entities:
- uid: 5341
Expand Down Expand Up @@ -121386,6 +121412,13 @@ entities:
- type: Transform
pos: 5.5,-49.5
parent: 8364
- proto: LockerBlueshieldFilledHardsuit
entities:
- uid: 14996
components:
- type: Transform
pos: -21.5,-9.5
parent: 8364
- proto: LockerBoozeFilled
entities:
- uid: 1718
Expand Down Expand Up @@ -125299,11 +125332,6 @@ entities:
- type: Transform
pos: 44.578045,-62.22757
parent: 8364
- uid: 21798
components:
- type: Transform
pos: -22.362862,-11.265691
parent: 8364
- proto: PlushieRGBee
entities:
- uid: 5880
Expand Down Expand Up @@ -125741,6 +125769,12 @@ entities:
- type: Transform
pos: 13.5,-14.5
parent: 8364
- uid: 17387
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -19.5,-13.5
parent: 8364
- uid: 18617
components:
- type: Transform
Expand Down Expand Up @@ -125908,11 +125942,6 @@ entities:
parent: 8364
- proto: PottedPlant0
entities:
- uid: 9450
components:
- type: Transform
pos: -23.5,-9.5
parent: 8364
- uid: 26870
components:
- type: Transform
Expand Down Expand Up @@ -128290,6 +128319,11 @@ entities:
parent: 8364
- type: ApcPowerReceiver
powerLoad: 0
- uid: 18592
components:
- type: Transform
pos: -22.5,-9.5
parent: 8364
- uid: 18619
components:
- type: Transform
Expand Down Expand Up @@ -128606,6 +128640,12 @@ entities:
parent: 8364
- type: ApcPowerReceiver
powerLoad: 0
- uid: 20887
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: -24.5,-11.5
parent: 8364
- uid: 20901
components:
- type: Transform
Expand Down
Loading
Loading