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

Conversation

pxc1984
Copy link
Contributor

@pxc1984 pxc1984 commented Jul 7, 2024

Кратное описание

По какой причине

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

Проверки

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

Changelog

pxc1984 and others added 30 commits June 11, 2024 11:47
* пустой комит

* пустой коммит 2
* пустой комит

* пустой коммит 2

* update update_changelog.yml
# Conflicts:
#	.github/workflows/update_changelog.yml
* пустой комит

* пустой коммит 2

* update update_changelog.yml

* update update_changelog.yml
# Conflicts:
#	.github/workflows/update_changelog.yml
* пустой комит

* пустой коммит 2

* update update_changelog.yml

* update update_changelog.yml

* update update_changelog.yml
# Conflicts:
#	.github/workflows/update_changelog.yml
* пустой комит

* пустой коммит 2

* update update_changelog.yml

* update update_changelog.yml

* update update_changelog.yml

* попробуем так...
* пустой комит

* пустой коммит 2

* update update_changelog.yml

* update update_changelog.yml

* update update_changelog.yml

* попробуем так...

* как же я заебался
* пустой комит

* пустой коммит 2

* update update_changelog.yml

* update update_changelog.yml

* update update_changelog.yml

* попробуем так...

* как же я заебался

* ДА СУКА
# Conflicts:
#	.github/workflows/update_changelog.yml
VigersRay and others added 9 commits June 12, 2024 18:26
* пустой комит

* пустой коммит 2

* update update_changelog.yml

* update update_changelog.yml

* update update_changelog.yml

* попробуем так...

* как же я заебался

* ДА СУКА

* Update update_changelog.yml

* ну ради бога
* пустой комит

* пустой коммит 2

* update update_changelog.yml

* update update_changelog.yml

* update update_changelog.yml

* попробуем так...

* как же я заебался

* ДА СУКА

* Update update_changelog.yml

* ну ради бога

* пустой комит
# Conflicts:
#	.github/workflows/update_changelog.yml
fixed backpacks
Fixed hardsuit
added blueshield locker
added blueshield's things to all sunrise maps
Copy link
Contributor

github-actions bot commented Jul 7, 2024

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

Copy link
Contributor

github-actions bot commented Jul 7, 2024

RSI Diff Bot; head commit a2398b2 merging into 1a99508
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

@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants