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

Пушки #267

Merged
merged 6 commits into from
Aug 8, 2024
Merged

Пушки #267

merged 6 commits into from
Aug 8, 2024

Conversation

VigersRay
Copy link
Collaborator

@VigersRay VigersRay commented Aug 8, 2024

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

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

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

Проверки

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

Changelog

🆑 Pacable

  • add: Добавлено 44 новых пушек.
  • tweak: Стандартное вооружение службы безопастности изменено
  • tweak: Стандартное вооружение охраны тюрьмы изменено

pxc1984 and others added 4 commits July 31, 2024 05:54
* Automatic changelog update

* Расширение огнестрела. (Roadmap)

Добавил 44 вида огнестрела.
Поменял стандартное вооружение СБ и КТ.

Signed-off-by: JDtrimble <[email protected]>

* исправил структуру

Signed-off-by: JDtrimble <[email protected]>

* багфикс и ребаланс

Signed-off-by: JDtrimble <[email protected]>

* теперь патроны можно делать на техфабе сб

Signed-off-by: JDtrimble <[email protected]>

* исправил цену производства .35 калибра

Signed-off-by: JDtrimble <[email protected]>

* фикс пистолетных патронов

Signed-off-by: JDtrimble <[email protected]>

* фикс локализации

Signed-off-by: JDtrimble <[email protected]>

* Убрал хуйню

Signed-off-by: JDtrimble <[email protected]>

* реверт карт

Signed-off-by: JDtrimble <[email protected]>

* реверт изменений

Signed-off-by: JDtrimble <[email protected]>

* пока я удалял хуйню я добавил хуйню

Signed-off-by: JDtrimble <[email protected]>

* комментарий

Signed-off-by: JDtrimble <[email protected]>

* надеюсь...

Signed-off-by: JDtrimble <[email protected]>

* Delete Resources/Maps/_Sunrise/planet_prison.yml

---------

Signed-off-by: JDtrimble <[email protected]>
Co-authored-by: Vigers Ray <[email protected]>
Copy link
Contributor

github-actions bot commented Aug 8, 2024

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

Resources/Textures/_Sunrise/Actions/gun_actions.rsi

State Old New Status
take_aim Added

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi

State Old New Status
0.50combat-spent Added
0.50combat Added
0.62combat-spent Added
0.62combat Added
5.56combat-spent Added
5.56combat Added
5.7x28combat-spent Added
5.7x28combat Added
7.62x39combat-spent Added
7.62x39combat Added
7.62x54combat-spent Added
7.62x54combat Added
relsotrone-combat-spent Added
relsotrone-combat Added

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi

State Old New Status
base-spent Added
base Added

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/Battery/EGE_XR/big.rsi

State Old New Status
base Added
mag-unshaded-0 Added
mag-unshaded-1 Added
mag-unshaded-2 Added
mag-unshaded-3 Added
mag-unshaded-4 Added
mag-unshaded-5 Added

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/Battery/EGE_XR/tiny.rsi

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

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/Battery/EG_C/big.rsi

State Old New Status
base Added
mag-unshaded-0 Added
mag-unshaded-1 Added
mag-unshaded-2 Added

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/Battery/EG_C/tiny.rsi

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

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/Battery/EG_MG/big.rsi

State Old New Status
base Added
mag-unshaded-0 Added
mag-unshaded-1 Added
mag-unshaded-2 Added

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/Battery/EG_MG/tiny.rsi

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

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/Battery/EG_P.rsi

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

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/Battery/EG_R/big.rsi

State Old New Status
base Added
mag-unshaded-0 Added
mag-unshaded-1 Added
mag-unshaded-2 Added

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/Battery/EG_R/tiny.rsi

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

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/Battery/EG_Sniper/big.rsi

State Old New Status
base Added
mag-unshaded-0 Added
mag-unshaded-1 Added
mag-unshaded-2 Added

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/Battery/EG_Sniper/tiny.rsi

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

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/Flamethrowers/M6/big.rsi

State Old New Status
base Added
bolt-open Added
icon Added
mag-0 Added

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/Flamethrowers/M6/tiny.rsi

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

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/gl-64/big.rsi

State Old New Status
base Added
icon Added

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/gl-64/tiny.rsi

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

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/minigun/big.rsi

State Old New Status
icon Added

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/minigun/tiny.rsi

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

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/rpg/big.rsi

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

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/rpg/tiny.rsi

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

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/mg42/big.rsi

State Old New Status
base Added
bolt-open Added
icon Added
mag-0 Added
mag-1 Added

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/mg42/tiny.rsi

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

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/mg60/big.rsi

State Old New Status
base Added
bolt-open Added
icon Added
mag-0 Added
mag-1 Added

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/mg60/tiny.rsi

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

Resources/Textures/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/rpd/big.rsi

State Old New Status
base Added
bolt-open Added
icon Added
mag-0 Added

Edit: diff updated after 15d863c

@VigersRay VigersRay merged commit c2d4a2b into master Aug 8, 2024
9 of 11 checks passed
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