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

Добавил роль Офицер "Синий Щит" #60

Merged
merged 7 commits into from
Jun 13, 2024
Merged

Добавил роль Офицер "Синий Щит" #60

merged 7 commits into from
Jun 13, 2024

Conversation

pxc1984
Copy link
Contributor

@pxc1984 pxc1984 commented Jun 11, 2024 •
edited
Loading

Медиа(Видео/Скриншоты)

image

Технические детали

Пока сплик занят разработкой ТТСа, сервер сидит без синего щита и ждет. А там всего лишь надо было пару файлов перетащить. (#5)

Проверки

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

Changelog

🆑 Pacable

  • add: Добавлена роль Офицера "Синий Щит".
  • add: На все карты добавлен кабинет офицера Синего Щита.
  • tweak: Теперь X-01 энергетический карабин у ОСЩ.

@VigersRay VigersRay mentioned this pull request Jun 12, 2024
Closed
@github-actions GitHub Actions
Copy link
Contributor

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

@pxc1984
Copy link
Contributor Author

pxc1984 commented Jun 12, 2024

Все будет 👍

@pxc1984
review changes fix
020236a 
fixed backpacks
Fixed hardsuit
added blueshield locker
added blueshield's things to all sunrise maps
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 13, 2024 •
edited
Loading

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

Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi

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

Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi

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

Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi

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

Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi

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

Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi

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

Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi

State Old New Status
equipped-HELMET-hamster Added
equipped-HELMET Added
icon Added

Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi

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

Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi

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

Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi

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

Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi

State Old New Status
equipped-FEET-digi Added
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi

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

Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi

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

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

State Old New Status
BlueShield Added

Resources/Textures/_Sunrise/Markers/jobs.rsi

State Old New Status
blueshield Added

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

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

Resources/Textures/_Sunrise/Objects/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

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

State Old New Status
bssecure Added
bssecure_door Added
bssecure_open Added
generic Added
generic_door Added
generic_icon Added
generic_open Added
locked Added
sparking Added
unlocked Added
welded Added

Edit: diff updated after a2398b2

@pxc1984 pxc1984 requested a review from VigersRay June 13, 2024 06:20
@pxc1984
Copy link
Contributor Author

pxc1984 commented Jun 13, 2024

Все готово

@pxc1984 pxc1984 requested a review from VigersRay June 13, 2024 06:58
@VigersRay VigersRay merged commit a368270 into space-sunrise:master_shit Jun 13, 2024
7 of 9 checks passed
VigersRay pushed a commit that referenced this pull request Jun 13, 2024
@pxc1984 @VigersRay
Добавил роль Офицер "Синий Щит" (#60)
f9ace2a 
* added blueshield

* added blueshield to sunrise maps

* review changes fix

fixed backpacks
Fixed hardsuit
added blueshield locker
added blueshield's things to all sunrise maps

* Теперь X-01 у ОСЩ, и цель у предателей на него

* review changes fix
@pxc1984 pxc1984 deleted the blueshield branch July 7, 2024 16:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VigersRay VigersRay VigersRay approved these changes

Assignees
No one assigned
Labels
Changes: Sprites No C# Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pxc1984 @VigersRay