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

Отряд ИСН (Приставов НаноТрейзен) #1084

Open
wants to merge 16 commits into
base: master
Choose a base branch
from

Conversation

KaiserMaus
Copy link
Contributor

@KaiserMaus KaiserMaus commented Jan 10, 2025

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

Добавляется новые спавнеры роли ИСН, вещи ИСН и тд
Подчинение ПНТ и Магистрату

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

Попросили добавить
https://wiki.sunrise14.top/w/%D0%A1%D1%82%D0%B0%D0%BD%D0%B4%D0%B0%D1%80%D1%82%D0%BD%D1%8B%D0%B5_%D0%A0%D0%B0%D0%B1%D0%BE%D1%87%D0%B8%D0%B5_%D0%9F%D1%80%D0%BE%D1%86%D0%B5%D0%B4%D1%83%D1%80%D1%8B_(%D0%97%D0%B0%D0%BA%D0%BE%D0%BD)
Видимо будут на хотелки ПНТ прилетать давать по жопе главам

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

Снимок экрана 2025-01-10 105619
Снимок экрана 2025-01-10 002316

Проверки

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

Changelog

🆑 KaiserMaus & Non_Stop_Smetana

  • add: Добавлены приставы ИСН.

Copy link
Contributor

github-actions bot commented Jan 10, 2025

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

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

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

Resources/Textures/_Sunrise/Clothing/Head/Hardsuits/ntrguard_head.rsi

State Old New Status
equipped-HELMET Added
icon Added

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

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

Resources/Textures/_Sunrise/Clothing/Mask/ntrguard.rsi

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

Resources/Textures/_Sunrise/Clothing/Mask/ntrguard_officer.rsi

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

Resources/Textures/_Sunrise/Clothing/Neck/Cloaks/ntrg_neck.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/ntrg_armor.rsi

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

Resources/Textures/_Sunrise/Clothing/OuterClothing/Coats/ntrg_coat.rsi

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

Resources/Textures/_Sunrise/Clothing/OuterClothing/Hardsuits/ntrguard_spacesuit.rsi

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

Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/ntrg_suit.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
NanotrasenGuard Added
NanotrasenLeader Added

Resources/Textures/_Sunrise/Markers/jobs.rsi

State Old New Status
ntrguard Added
ntrleader Added

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

State Old New Status
pda-isn-operator Added

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

State Old New Status
ntr-captain Added
ntr-operator Added

Resources/Textures/_Sunrise/Objects/Weapons/Guns/Battery/pulse_revolver.rsi

State Old New Status
base Added
disabler-inhand-left Added
disabler-inhand-right Added
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added
lethal-inhand-left Added
lethal-inhand-right Added
mag-unshaded-0 Added
mag-unshaded-1 Added
mag-unshaded-2 Added
mag-unshaded-3 Added
mag-unshaded-4 Added
mode-disabler Added
mode-lethal Added
mode-lethalalt Added

Edit: diff updated after 2762b30

@KaiserMaus KaiserMaus marked this pull request as draft January 10, 2025 16:21
@KaiserMaus KaiserMaus marked this pull request as ready for review January 10, 2025 17:18
Copy link
Contributor

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

Copy link
Contributor

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

Copy link
Contributor

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

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.

1 participant