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

Реверт ИСН #1354

Merged
merged 5 commits into from
Feb 13, 2025
Merged

Реверт ИСН #1354

merged 5 commits into from
Feb 13, 2025

Conversation

pxc1984
Copy link
Contributor

@pxc1984 pxc1984 commented Feb 12, 2025

По требованию кфб и просьбе хатико. Со мной спорить не надо пжпжпж

Copy link
Contributor

github-actions bot commented Feb 12, 2025

RSI Diff Bot; head commit e0dc85a merging into 63aaada
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 Removed
icon Removed
inhand-left Removed
inhand-right Removed

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

State Old New Status
equipped-HELMET Removed
icon Removed

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

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

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

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

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

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

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

State Old New Status
equipped-NECK Removed
icon Removed

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

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

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

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

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

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

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

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

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

State Old New Status
NanotrasenGuard Removed
NanotrasenLeader Removed

Resources/Textures/_Sunrise/Markers/jobs.rsi

State Old New Status
ntrguard Removed
ntrleader Removed

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

State Old New Status
pda-isn-operator Removed

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

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

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

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

Edit: diff updated after e0dc85a

Copy link
Collaborator

@VigersRay VigersRay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А теперь попробуй запустить любую карту после этого реверта

@KaiserMaus
Copy link
Collaborator

Вместо полного удаления луче удалить спавн на станциях и их выбор как раундстарт роли

@VigersRay
Copy link
Collaborator

Вместо полного удаления луче удалить спавн на станциях и их выбор как раундстарт роли

Увы но педали будут каждый раунд их спавнить

Signed-off-by: pacable <igor.mamaev1@gmail.com>
@pxc1984
Copy link
Contributor Author

pxc1984 commented Feb 13, 2025

А теперь попробуй запустить любую карту после этого реверта

Услышал тебя родной

@pxc1984
Copy link
Contributor Author

pxc1984 commented Feb 13, 2025

Вместо полного удаления луче удалить спавн на станциях и их выбор как раундстарт роли

Требование кфб вкратце: "либо сделайте как я сказала, либо удалите мои спрайты". Поспрашивай хатико

@KaiserMaus
Copy link
Collaborator

И какие спрайты ее а какие сметаны?

@VigersRay VigersRay self-requested a review February 13, 2025 19:18
@VigersRay VigersRay self-requested a review February 13, 2025 21:37
@VigersRay VigersRay merged commit a48d785 into space-sunrise:master Feb 13, 2025
17 of 19 checks passed
@pxc1984 pxc1984 deleted the revert-ntr branch February 14, 2025 05:15
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.

3 participants