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

перенос ОСЩ #122

Closed
wants to merge 6 commits into from
Closed

перенос ОСЩ #122

wants to merge 6 commits into from

Conversation

Darkiich
Copy link
Contributor

@Darkiich Darkiich commented Jul 9, 2024 •
edited by Schrodinger71
Loading

Описание PR

Медиа

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения
no cl

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 9, 2024

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

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

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

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

Resources/Textures/Objects/Devices/pda.rsi

State Old New Status
pda-centcom Modified
pda-blueshield Added

Resources/Textures/Objects/Misc/id_cards.rsi

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

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

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/Coats/blueshield_winter.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/Underwear/Socks/socks_blueshield.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/ADT/Clothing/Underwear/Socks/stockings_blueshield.rsi

State Old New Status
equipped-SOCKS Added
icon Added

Resources/Textures/ADT/Clothing/Underwear/blueshield_boxers.rsi

State Old New Status
equipped-UNDERWEARB Added
icon Added

Resources/Textures/ADT/Clothing/Underwear/blueshield_bra.rsi

State Old New Status
equipped-UNDERWEARB Added
icon Added

Resources/Textures/ADT/Clothing/Underwear/blueshield_panties.rsi

State Old New Status
equipped-UNDERWEARB Added
icon 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/Turleneck/turtleneck_blueshield.rsi

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

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

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

Resources/Textures/ADT/Objects/Storage/underwear_boxes.rsi

State Old New Status
bsh Added

Resources/Textures/ADT/Objects/Storage/weaponcasebs.rsi

State Old New Status
closed Added
inhand-left Added
inhand-right Added
open 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
blueshield Added
blueshield_door Added
blueshield_open Added
cc Added
cc_door Added
cc_open Added

Resources/Textures/Interface/Misc/job_icons.rsi

State Old New Status
ADTBlueShieldOfficer Added

Resources/Textures/Markers/jobs.rsi

State Old New Status
blueshield Added

Resources/Textures/Mobs/Species/Vox/displacement.rsi

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

Resources/Textures/Objects/Fun/figurines.rsi

State Old New Status
blueshield Added

Edit: diff updated after dad8060

@Darkiich Darkiich mentioned this pull request Jul 9, 2024
Closed
@Darkiich
Copy link
Contributor Author

Darkiich commented Jul 9, 2024

#63

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

image
Не решённые мердж конфликты

@github-actions GitHub Actions
Copy link
Contributor

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

@Darkiich
Copy link
Contributor Author

Я откажусь пожалуй от этого переноса ПРа. Ибо мне надо закончить еще текущий

@Darkiich Darkiich closed this Jul 27, 2024
@Schrodinger71 Schrodinger71 removed a link to an issue Aug 9, 2024
Перенос ОСЩ #124
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Darkiich Darkiich

Labels
Changes: Localization Изменение локализации Changes: Map Изменение карт Changes: Sprites Изменение спрайтов Merge Conflict No C#
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Darkiich @Schrodinger71