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

текстуры, которые я добавила отдельными коммитами #33

Merged
merged 11 commits into from
Jun 30, 2024
Merged

текстуры, которые я добавила отдельными коммитами #33

merged 11 commits into from
Jun 30, 2024

Conversation

Ratyyy
Copy link
Collaborator

@Ratyyy Ratyyy commented Jun 30, 2024 •
edited by Schrodinger71
Loading

Описание PR

Медиа

Проверки

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

Изменения

no cl

Ratyyy added 3 commits June 30, 2024 13:48
@Ratyyy
qol
a83a117 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Resources/Changelog/ChangelogADT.yml
#	Resources/Maps/ADTMaps/adt_kilostation.yml
#	Resources/Maps/CorvaxMaps/corvax_astra.yml
#	Resources/Maps/Dungeon/bunker.yml
#	Resources/Maps/corvax_astra.yml
#	Resources/Maps/corvax_gelta.yml
#	Resources/Maps/corvax_outpost.yml
#	Resources/Maps/corvax_silly.yml
#	Resources/Prototypes/Corvax/Maps/astra.yml
#	Resources/Prototypes/Corvax/Maps/gelta.yml
#	Resources/Prototypes/Corvax/Maps/silly.yml
#	Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml
#	Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/kilo.yml
#	Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png
#	Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png
#	Resources/Textures/Decals/bricktile.rsi/dark_box.png
#	Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png
#	Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png
#	Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png
#	Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png
#	Resources/Textures/Decals/bricktile.rsi/dark_end_e.png
#	Resources/Textures/Decals/bricktile.rsi/dark_end_n.png
#	Resources/Textures/Decals/bricktile.rsi/dark_end_s.png
#	Resources/Textures/Decals/bricktile.rsi/dark_end_w.png
#	Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png
#	Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png
#	Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png
#	Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png
#	Resources/Textures/Decals/bricktile.rsi/dark_line_e.png
#	Resources/Textures/Decals/bricktile.rsi/dark_line_n.png
#	Resources/Textures/Decals/bricktile.rsi/dark_line_s.png
#	Resources/Textures/Decals/bricktile.rsi/dark_line_w.png
#	Resources/Textures/Decals/bricktile.rsi/steel_box.png
#	Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png
#	Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png
#	Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png
#	Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png
#	Resources/Textures/Decals/bricktile.rsi/steel_end_e.png
#	Resources/Textures/Decals/bricktile.rsi/steel_end_n.png
#	Resources/Textures/Decals/bricktile.rsi/steel_end_s.png
#	Resources/Textures/Decals/bricktile.rsi/steel_end_w.png
#	Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png
#	Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png
#	Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png
#	Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png
#	Resources/Textures/Decals/bricktile.rsi/steel_line_e.png
#	Resources/Textures/Decals/bricktile.rsi/steel_line_n.png
#	Resources/Textures/Decals/bricktile.rsi/steel_line_s.png
#	Resources/Textures/Decals/bricktile.rsi/steel_line_w.png
#	Resources/Textures/Decals/bricktile.rsi/white_box.png
#	Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png
#	Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png
#	Resources/Textures/Decals/bricktile.rsi/white_corner_se.png
#	Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png
#	Resources/Textures/Decals/bricktile.rsi/white_end_e.png
#	Resources/Textures/Decals/bricktile.rsi/white_end_n.png
#	Resources/Textures/Decals/bricktile.rsi/white_end_s.png
#	Resources/Textures/Decals/bricktile.rsi/white_end_w.png
#	Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png
#	Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png
#	Resources/Textures/Decals/bricktile.rsi/white_inner_se.png
#	Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png
#	Resources/Textures/Decals/bricktile.rsi/white_line_e.png
#	Resources/Textures/Decals/bricktile.rsi/white_line_n.png
#	Resources/Textures/Decals/bricktile.rsi/white_line_s.png
#	Resources/Textures/Decals/bricktile.rsi/white_line_w.png
#	Resources/Textures/Structures/Storage/suit_storage.rsi/unlocked.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
#	Resources/Textures/Tiles/dark_diagonal.png
#	Resources/Textures/Tiles/dark_diagonal_mini.png
#	Resources/Textures/Tiles/dark_herringbone.png
#	Resources/Textures/Tiles/dark_mini.png
#	Resources/Textures/Tiles/dark_mono.png
#	Resources/Textures/Tiles/dark_offset.png
#	Resources/Textures/Tiles/dark_pavement.png
#	Resources/Textures/Tiles/dark_pavement_vertical.png
#	Resources/Textures/Tiles/dark_plastic.png
#	Resources/Textures/Tiles/kitchen.png
#	Resources/Textures/Tiles/plastic.png
#	Resources/Textures/Tiles/shuttleblue.png
#	Resources/Textures/Tiles/shuttleorange.png
#	Resources/Textures/Tiles/shuttlepurple.png
#	Resources/Textures/Tiles/shuttlered.png
#	Resources/Textures/Tiles/shuttlewhite.png
#	Resources/Textures/Tiles/steel.png
#	Resources/Textures/Tiles/steel_diagonal.png
#	Resources/Textures/Tiles/steel_diagonal_mini.png
#	Resources/Textures/Tiles/steel_herringbone.png
#	Resources/Textures/Tiles/steel_mini.png
#	Resources/Textures/Tiles/steel_mono.png
#	Resources/Textures/Tiles/steel_offset.png
#	Resources/Textures/Tiles/steel_pavement.png
#	Resources/Textures/Tiles/steel_pavement_vertical.png
#	Resources/Textures/Tiles/white_diagonal.png
#	Resources/Textures/Tiles/white_diagonal_mini.png
#	Resources/Textures/Tiles/white_herringbone.png
#	Resources/Textures/Tiles/white_mini.png
#	Resources/Textures/Tiles/white_mono.png
#	Resources/Textures/Tiles/white_offset.png
#	Resources/Textures/Tiles/white_pavement.png
#	Resources/Textures/Tiles/white_pavement_vertical.png
#	Resources/Textures/Tiles/wood.png
#	Resources/Textures/Tiles/wood_broken.png
#	Resources/Textures/Tiles/wood_tile.png

# Conflicts:
#	Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png
@Ratyyy
winterboots
2f7b350 
# Conflicts:
#	Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/equipped-FEET.png
#	Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/icon.png
#	Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-left.png
#	Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-right.png
#	Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/icon.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-left.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/equipped-FEET.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/icon.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-left.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-right.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/equipped-FEET.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/icon.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-left.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-right.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/equipped-FEET.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/icon.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-left.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-right.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png
#	Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json
@Ratyyy
stupidfrige
ac3803f
@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# labels Jun 30, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 30, 2024 •
edited
Loading

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

Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi

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

Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi

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

Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi

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

Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi

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

Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi

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

Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi

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

Resources/Textures/Decals/Overlays/greyscale.rsi

State Old New Status
checkerNESW Modified
mono Modified

Resources/Textures/Decals/bricktile.rsi

State Old New Status
dark_box Modified
dark_corner_ne Modified
dark_corner_nw Modified
dark_corner_se Modified
dark_corner_sw Modified
dark_end_e Modified
dark_end_n Modified
dark_end_s Modified
dark_end_w Modified
dark_inner_ne Modified
dark_inner_nw Modified
dark_inner_se Modified
dark_inner_sw Modified
dark_line_e Modified
dark_line_n Modified
dark_line_s Modified
dark_line_w Modified
steel_box Modified
steel_corner_ne Modified
steel_corner_nw Modified
steel_corner_se Modified
steel_corner_sw Modified
steel_end_e Modified
steel_end_n Modified
steel_end_s Modified
steel_end_w Modified
steel_inner_ne Modified
steel_inner_nw Modified
steel_inner_se Modified
steel_inner_sw Modified
steel_line_e Modified
steel_line_n Modified
steel_line_s Modified
steel_line_w Modified
white_box Modified
white_corner_ne Modified
white_corner_nw Modified
white_corner_se Modified
white_corner_sw Modified
white_end_e Modified
white_end_n Modified
white_end_s Modified
white_end_w Modified
white_inner_ne Modified
white_inner_nw Modified
white_inner_se Modified
white_inner_sw Modified
white_line_e Modified
white_line_n Modified
white_line_s Modified
white_line_w Modified

Resources/Textures/Decals/minitile.rsi

State Old New Status
dark_box Modified
dark_corner_ne Modified
dark_corner_nw Modified
dark_corner_se Modified
dark_corner_sw Modified
dark_end_e Modified
dark_end_n Modified
dark_end_s Modified
dark_end_w Modified
dark_inner_ne Modified
dark_inner_nw Modified
dark_inner_se Modified
dark_inner_sw Modified
dark_line_e Modified
dark_line_n Modified
dark_line_s Modified
dark_line_w Modified
steel_box Modified
steel_corner_ne Modified
steel_corner_nw Modified
steel_corner_se Modified
steel_corner_sw Modified
steel_end_e Modified
steel_end_n Modified
steel_end_s Modified
steel_end_w Modified
steel_inner_ne Modified
steel_inner_nw Modified
steel_inner_se Modified
steel_inner_sw Modified
steel_line_e Modified
steel_line_n Modified
steel_line_s Modified
steel_line_w Modified
white_box Modified
white_corner_ne Modified
white_corner_nw Modified
white_corner_se Modified
white_corner_sw Modified
white_end_e Modified
white_end_n Modified
white_end_s Modified
white_end_w Modified
white_inner_ne Modified
white_inner_nw Modified
white_inner_se Modified
white_inner_sw Modified
white_line_e Modified
white_line_n Modified
white_line_s Modified
white_line_w Modified

Resources/Textures/Structures/Machines/fax_machine.rsi

State Old New Status
icon Modified
idle Modified
inserting Modified
printing Modified

Resources/Textures/Structures/Machines/smartfridge.rsi

State Old New Status
off Modified
smartfridge Modified
smartfridge_door Modified
smartfridge_open Modified

Resources/Textures/Structures/Storage/suit_storage.rsi

State Old New Status
unlocked Modified

Resources/Textures/Structures/Wallmounts/air_monitors.rsi

State Old New Status
alarm0 Modified
alarm1 Modified
alarm2 Modified
alarm_b1 Modified
alarm_b2 Modified
alarm_bitem Modified
alarmp Modified
alarmx Modified
fire0 Modified
fire_0 Modified
fire_1 Modified
fire_2 Modified
fire_3 Modified
fire_b0 Modified
fire_b1 Modified
fire_b2 Modified
fire_bitem Modified
fire_emagged Modified
fire_off Modified
fire_on Modified
firex Modified

Edit: diff updated after dac31eb

@Schrodinger71
Copy link
Collaborator

Это наш контент?

@Schrodinger71
Copy link
Collaborator

А

@Schrodinger71
Copy link
Collaborator

Респрайты

@Ratyyy Ratyyy added this pull request to the merge queue Jun 30, 2024
Merged via the queue into master with commit ea86b19 Jun 30, 2024
12 of 13 checks passed
@Ratyyy Ratyyy deleted the RAT-textures branch June 30, 2024 15:39
@Ratyyy Ratyyy mentioned this pull request Jun 30, 2024
Closed
55 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Ratyyy Ratyyy

Labels
Changes: Sprites Изменение спрайтов No C#
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Ratyyy @Schrodinger71