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

Revert "Добавление лорных фракций v.2 (более корректная)" #40

Merged
merged 1 commit into from
Nov 11, 2024
Merged

Revert "Добавление лорных фракций v.2 (более корректная)" #40

merged 1 commit into from
Nov 11, 2024

Conversation

FireNameFN
Copy link
Collaborator

@FireNameFN FireNameFN commented Nov 11, 2024 •
edited
Loading

Reverts #12

Должности ПРа вливаются в список должностей в консоли ID карт.
Не раскидано по папкам (_CorvaxNext).
Сам Пингвин сказал, что нашёл недочёты, и можно ревёртать.

@github-actions github-actions bot added Changes: Sprites Changes: Map Изменяет карты Changes: Localization Изменяет локализацию No C# labels Nov 11, 2024
@github-actions GitHub Actions
Copy link

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

Resources/Textures/Corvax/Lore/KMLG/Armor/kmlg_armor.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Armor/kmlg_hardsuits.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Armor/kmlg_hardsuits_helmet.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Armor/kmlg_nooc_hardsuits_field.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Armor/kmlg_nooc_hardsuits_helmet_field.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_backpack_rad.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_backpack_std.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_bandans.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_belt.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_beret.rsi

State Old New Status
equipped-HELMET Removed
icon Removed

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_boots.rsi

State Old New Status
equipped-FEET-reptilian Removed
equipped-FEET Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_boots_work.rsi

State Old New Status
equipped-FEET-reptilian Removed
equipped-FEET Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_cap.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_cap_p.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_cepka.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_coat.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_coat_hood.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_encryption_keys.rsi

State Old New Status
crypt_gray Removed
label Removed

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_epaulet_10.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_epaulet_20.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_epaulet_30.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_garniture.rsi

State Old New Status
equipped-EARS Removed
icon Removed

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_gloves_battle.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_id_cards.rsi

State Old New Status
cargotech Removed
ce Removed
cs Removed
default-inhand-left Removed
default-inhand-right Removed
default Removed
engineering Removed
pilot Removed
qm Removed
repairman Removed
security Removed
servise Removed

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_pda.rsi

State Old New Status
equipped-BELT Removed
equipped-IDCARD Removed
id_overlay Removed
inhand-left Removed
inhand-right Removed
insert_overlay Removed
light_overlay Removed
pda Removed

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_stamp.rsi

State Old New Status
stamp Removed

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_uniform_cargotech.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_uniform_ce.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_uniform_engineering.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_uniform_pilot.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_uniform_qm.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_uniform_repairman.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_uniform_security.rsi

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

Resources/Textures/Corvax/Lore/KMLG/Equipment/kmlg_uniform_servise.rsi

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

Resources/Textures/Corvax/Lore/KMLG/kmlg_airlock.rsi

State Old New Status
assembly Removed
bolted_open_unlit Removed
bolted_unlit Removed
closed Removed
closed_unlit Removed
closing Removed
closing_unlit Removed
deny_unlit Removed
emergency_open_unlit Removed
emergency_unlit Removed
open Removed
open_unlit Removed
opening Removed
opening_unlit Removed
panel_closed Removed
panel_closing Removed
panel_open Removed
panel_opening Removed
sparks Removed
sparks_broken Removed
sparks_damaged Removed
sparks_open Removed
welded Removed

Resources/Textures/Corvax/Lore/KMLG/kmlg_airlock_glass.rsi

State Old New Status
assembly Removed
bolted_open_unlit Removed
bolted_unlit Removed
closed Removed
closed_unlit Removed
closing Removed
closing_unlit Removed
deny_unlit Removed
emergency_open_unlit Removed
emergency_unlit Removed
open Removed
open_unlit Removed
opening Removed
opening_unlit Removed
panel_closed Removed
panel_closing Removed
panel_open Removed
panel_opening Removed
sparks Removed
sparks_broken Removed
sparks_damaged Removed
sparks_open Removed
welded Removed

Resources/Textures/Corvax/Lore/Mirt/Armor/mirt_armor_gr.rsi

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

Resources/Textures/Corvax/Lore/Mirt/Armor/mirt_armor_std.rsi

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

Resources/Textures/Corvax/Lore/Mirt/Armor/mirt_armor_vest.rsi

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

Resources/Textures/Corvax/Lore/Mirt/Armor/mirt_cloak_r.rsi

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

Resources/Textures/Corvax/Lore/Mirt/Armor/mirt_cloak_r_hood.rsi

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

Resources/Textures/Corvax/Lore/Mirt/Armor/mirt_hardsuits_hig.rsi

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

Resources/Textures/Corvax/Lore/Mirt/Armor/mirt_hardsuits_hig_helmet.rsi

State Old New Status
equipped-HELMET Removed

@FireNameFN FireNameFN marked this pull request as ready for review November 11, 2024 14:46
@FireNameFN FireNameFN requested a review from Morb0 as a code owner November 11, 2024 14:46
Tornado-Technology
Tornado-Technology approved these changes Nov 11, 2024
View reviewed changes
Copy link
Collaborator

@Tornado-Technology Tornado-Technology left a comment

Choose a reason for hiding this comment

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

No way

@Tornado-Technology Tornado-Technology merged commit b883f4f into master Nov 11, 2024
27 of 28 checks passed
@lzk228
Copy link
Collaborator

lzk228 commented Nov 11, 2024

лмаооо

@NotSoDana
Copy link

Вот бы вообще этого не было нахуй

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Tornado-Technology Tornado-Technology Tornado-Technology approved these changes

@Morb0 Morb0 Awaiting requested review from Morb0

Assignees
No one assigned
Labels
Changes: Localization Изменяет локализацию Changes: Map Изменяет карты Changes: Sprites No C#
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@FireNameFN @lzk228 @NotSoDana @Tornado-Technology