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.

Sign up for GitHub

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

Jump to bottom

Синий щит #210

Merged
merged 14 commits into from
Aug 10, 2024
Merged

Синий щит #210

merged 14 commits into from
Aug 10, 2024

Conversation

PyotrIgn
Copy link
Contributor

@PyotrIgn PyotrIgn commented Aug 9, 2024

Синий Щит с последним апдейтом от Tamioki

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Aug 9, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 9, 2024 •
edited
Loading

RSI Diff Bot; head commit 34b1720 merging into a39ad34
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Clothing/Back/blueshield_backpack.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/blueshield_duffel.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Back/blueshield_satchel.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Belt/medical_security_belt.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Ears/Headsets/blueshield.rsi

State Old New Status
alt-equipped-EARS Added
equipped-EARS Added
icon Added
icon_alt Added

Resources/Textures/ADT/Clothing/Eyes/Glasses/blueshield.rsi

State Old New Status
equipped-EYES-hamster Added
equipped-EYES Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Head/Hardsuits/blueshield_hardsuithead.rsi

State Old New Status
equipped-HELMET-light Added
equipped-HELMET-unshading Added
equipped-HELMET Added
icon-light Added
icon Added
off-equipped-HELMET-vulp Added

Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Head/Hats/blueshield_beret_black.rsi

State Old New Status
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Neck/Cloaks/blueshield_neck.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/OuterClothing/Armor/blueshield_armor.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/blueshield_hardsuit.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/blueshield_winter.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/blueshield_suit.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Clothing/Uniforms/Turtleneck/turtleneck_blueshield_woman.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Interface/Misc/job_icons.rsi

State Old New Status
ADTBlueShieldOfficer Added

Resources/Textures/ADT/Markers/jobs.rsi

State Old New Status
blueshield Added

Resources/Textures/ADT/Objects/Devices/pda.rsi

State Old New Status
equipped-BELT Added
equipped-IDCARD Added
id_overlay Added
inhand-left Added
inhand-right Added
insert_overlay Added
light_overlay Added
pda-blueshield Added
pda-centcom Added

Resources/Textures/ADT/Objects/Fun/figurines.rsi

State Old New Status
blueshield Added

Resources/Textures/ADT/Objects/Misc/id_cards.rsi

State Old New Status
blue-inhand-left Added
blue-inhand-right Added
centcom Added
ert_chaplain Added
ert_commander Added
ert_engineer Added
ert_janitor Added
ert_medic Added
ert_security Added
idblueshield Added
idcentcom Added

Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/bluelaser.rsi

State Old New Status
beam Added
impact_laser Added
muzzle_laser Added

Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/projectiles_ss.rsi

State Old New Status
impact_bullet Added
impact_laser_greyscale Added
impact_laser_red Added
omnilaser Added
omnilaser_greyscale Added

Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/battery.rsi

State Old New Status
base Added
inhand-left Added
inhand-right Added
mag-1 Added
mag-2 Added
mag-3 Added

Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic-inhands.rsi

State Old New Status
inhand-left-blade Added
inhand-left Added
inhand-right-blade Added
inhand-right Added

Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/classic.rsi

State Old New Status
icon Added
icon_saber Added

Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy-inhands.rsi

State Old New Status
inhand-left-blade Added
inhand-left Added
inhand-right-blade Added
inhand-right Added

Resources/Textures/ADT/Objects/Weapons/Guns/Saber_revolvers/energy.rsi

State Old New Status
base Added
icon_saber Added
mag-0 Added
mag-1 Added

Resources/Textures/ADT/Structures/Storage/closet.rsi

State Old New Status
bio_paramedic Added
bio_paramedic_door Added
bio_paramedic_open Added
bio_pathologist Added
bio_pathologist_door Added
bio_pathologist_open Added
blueshield Added
blueshield_door Added
blueshield_open Added
cc Added
cc_door Added
cc_open Added
generic Added
generic_door Added
generic_icon Added
generic_open Added
locked Added
sparking Added
unlocked Added
welded Added

Resources/Textures/Clothing/Belt/belt_overlay.rsi

State Old New Status
defibrillator Added

Edit: diff updated after 34b1720

@PyotrIgn
Copy link
Contributor Author

PyotrIgn commented Aug 9, 2024

Что завтра добавлю:

Недостающие локализации
Вопрос с лодаутами
Вопрос с револьвером (из него нельзя стрелять в положении, когда клинок не активирован, потому возможно нужна замена на старый или иной аналог)

@Schrodinger71 Schrodinger71 linked an issue Aug 9, 2024 that may be closed by this pull request
Перенос ОСЩ #124
Closed
@Schrodinger71
Copy link
Collaborator

Так это только папка locаl... КХМ ща дальше пойдём

@Schrodinger71 Schrodinger71 requested a review from 1Stepka1 August 9, 2024 16:57
@Schrodinger71
Copy link
Collaborator

Всё уснул

@1Stepka1
Copy link
Collaborator

1Stepka1 commented Aug 9, 2024

Посмотрю завтра,ибо тут что-то доделывать ещё будут

@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

1Stepka1
1Stepka1 requested changes Aug 10, 2024
View reviewed changes
Copy link
Collaborator

@1Stepka1 1Stepka1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А так в основном уже неплохо

Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Back/backpack.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/cloak.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/turtleneck.ftl Outdated Show resolved Hide resolved
Resources/Textures/Clothing/Belt/belt_overlay.rsi/meta.json Outdated Show resolved Hide resolved
1Stepka1
1Stepka1 approved these changes Aug 10, 2024
View reviewed changes
Copy link
Collaborator

@1Stepka1 1Stepka1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ладно уж без меты тогда

@PyotrIgn PyotrIgn added this pull request to the merge queue Aug 10, 2024
Merged via the queue into AdventureTimeSS14:master with commit 10367a0 Aug 10, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Schrodinger71 Schrodinger71 Schrodinger71 left review comments

@1Stepka1 1Stepka1 1Stepka1 approved these changes

Assignees
No one assigned
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C# Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Перенос ОСЩ
3 participants
@PyotrIgn @Schrodinger71 @1Stepka1