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

Decals (and posters) #93

Merged
merged 29 commits into from
Aug 25, 2023
Merged

Decals (and posters) #93

merged 29 commits into from
Aug 25, 2023

Conversation

DEATHB4DEFEAT
Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT commented Apr 18, 2023

Description

Much decals

TODO

  • Sprites
  • Remember where the hell I got the sprites
  • Sprite copyright information
  • Decals
  • Posters
  • Signs
  • UI

Media


sand
ast_warn
dirt
neon
siding
fulltile
trimline

salvage
directional
dorm rooms
gas indicators
numbers

informative poster

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Sprite Changes any png or json in an rsi Changes: UI Changes any XAML files labels Apr 18, 2023
@github-actions
Copy link

github-actions bot commented Apr 18, 2023

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

Resources/Textures/SimpleStation14/Decals/Flooring/ast.rsi

State Old New Status
ast_warn_box Added
ast_warn_corner_ne Added
ast_warn_corner_nw Added
ast_warn_corner_se Added
ast_warn_corner_sw Added
ast_warn_end_e Added
ast_warn_end_n Added
ast_warn_end_s Added
ast_warn_end_w Added
ast_warn_full Added
ast_warn_side_e Added
ast_warn_side_n Added
ast_warn_side_ne Added
ast_warn_side_nw Added
ast_warn_side_s Added
ast_warn_side_se Added
ast_warn_side_sw Added
ast_warn_side_w Added

Resources/Textures/SimpleStation14/Decals/Flooring/box.rsi

State Old New Status
box_corners_white_ne Added
box_corners_white_nw Added
box_corners_white_se Added
box_corners_white_sw Added
box_corners_yellow_ne Added
box_corners_yellow_nw Added
box_corners_yellow_se Added
box_corners_yellow_sw Added

Resources/Textures/SimpleStation14/Decals/Flooring/dirt.rsi

State Old New Status
dirt_side_e Added
dirt_side_n Added
dirt_side_ne Added
dirt_side_nw Added
dirt_side_s Added
dirt_side_se Added
dirt_side_sw Added
dirt_side_w Added

Resources/Textures/SimpleStation14/Decals/Flooring/neon.rsi

State Old New Status
neon_full Added
neon_long_edge_e Added
neon_long_edge_n Added
neon_long_edge_s Added
neon_long_edge_w Added
neon_long_side_e Added
neon_long_side_n Added
neon_long_side_s Added
neon_long_side_w Added
neon_short_ccw_ne Added
neon_short_ccw_nw Added
neon_short_ccw_se Added
neon_short_ccw_sw Added
neon_short_cw_ne Added
neon_short_cw_nw Added
neon_short_cw_se Added
neon_short_cw_sw Added

Resources/Textures/SimpleStation14/Decals/Flooring/siding.rsi

State Old New Status
siding_corner_ne Added
siding_corner_nw Added
siding_corner_se Added
siding_corner_sw Added
siding_end_e Added
siding_end_n Added
siding_end_s Added
siding_end_w Added
siding_line_e Added
siding_line_n Added
siding_line_ne Added
siding_line_nw Added
siding_line_s Added
siding_line_se Added
siding_line_sw Added
siding_line_w Added
siding_thinplating_corner_ne Added
siding_thinplating_corner_nw Added
siding_thinplating_corner_se Added
siding_thinplating_corner_sw Added
siding_thinplating_end_e Added
siding_thinplating_end_n Added
siding_thinplating_end_s Added
siding_thinplating_end_w Added
siding_thinplating_line_e Added
siding_thinplating_line_n Added
siding_thinplating_line_ne Added
siding_thinplating_line_nw Added
siding_thinplating_line_s Added
siding_thinplating_line_se Added
siding_thinplating_line_sw Added
siding_thinplating_line_w Added
siding_thinplating_new_corner_ne Added
siding_thinplating_new_corner_nw Added
siding_thinplating_new_corner_se Added
siding_thinplating_new_corner_sw Added
siding_thinplating_new_end_e Added
siding_thinplating_new_end_n Added
siding_thinplating_new_end_s Added
siding_thinplating_new_end_w Added
siding_thinplating_new_line_e Added
siding_thinplating_new_line_n Added
siding_thinplating_new_line_ne Added
siding_thinplating_new_line_nw Added
siding_thinplating_new_line_s Added
siding_thinplating_new_line_se Added
siding_thinplating_new_line_sw Added
siding_thinplating_new_line_w Added
siding_wideplating_corner_ne Added
siding_wideplating_corner_nw Added
siding_wideplating_corner_se Added
siding_wideplating_corner_sw Added
siding_wideplating_end_e Added
siding_wideplating_end_n Added
siding_wideplating_end_s Added
siding_wideplating_end_w Added
siding_wideplating_line_e Added
siding_wideplating_line_n Added
siding_wideplating_line_ne Added
siding_wideplating_line_nw Added
siding_wideplating_line_s Added
siding_wideplating_line_se Added
siding_wideplating_line_sw Added
siding_wideplating_line_w Added
siding_wideplating_new_corner_ne Added
siding_wideplating_new_corner_nw Added
siding_wideplating_new_corner_se Added
siding_wideplating_new_corner_sw Added
siding_wideplating_new_end_e Added
siding_wideplating_new_end_n Added
siding_wideplating_new_end_s Added
siding_wideplating_new_end_w Added
siding_wideplating_new_line_e Added
siding_wideplating_new_line_n Added
siding_wideplating_new_line_ne Added
siding_wideplating_new_line_nw Added
siding_wideplating_new_line_s Added
siding_wideplating_new_line_se Added
siding_wideplating_new_line_sw Added
siding_wideplating_new_line_w Added

Resources/Textures/SimpleStation14/Decals/Flooring/tile.rsi

State Old New Status
tile_anticorner_contrasted_ne Added
tile_anticorner_contrasted_nw Added
tile_anticorner_contrasted_se Added
tile_anticorner_contrasted_sw Added
tile_anticorner_ne Added
tile_anticorner_nw Added
tile_anticorner_se Added
tile_anticorner_sw Added
tile_corner_ne Added
tile_corner_nw Added
tile_corner_se Added
tile_corner_sw Added
tile_full Added
tile_half_e Added
tile_half_n Added
tile_half_s Added
tile_half_w Added

Resources/Textures/SimpleStation14/Decals/Flooring/trimline.rsi

State Old New Status
trimline_arrow_ccw_e Added
trimline_arrow_ccw_fill_e Added
trimline_arrow_ccw_fill_n Added
trimline_arrow_ccw_fill_ne Added
trimline_arrow_ccw_fill_nw Added
trimline_arrow_ccw_fill_s Added
trimline_arrow_ccw_fill_se Added
trimline_arrow_ccw_fill_sw Added
trimline_arrow_ccw_fill_w Added
trimline_arrow_ccw_n Added
trimline_arrow_ccw_ne Added
trimline_arrow_ccw_nw Added
trimline_arrow_ccw_s Added
trimline_arrow_ccw_se Added
trimline_arrow_ccw_sw Added
trimline_arrow_ccw_w Added
trimline_arrow_cw_e Added
trimline_arrow_cw_fill_e Added
trimline_arrow_cw_fill_n Added
trimline_arrow_cw_fill_ne Added
trimline_arrow_cw_fill_nw Added
trimline_arrow_cw_fill_s Added
trimline_arrow_cw_fill_se Added
trimline_arrow_cw_fill_sw Added
trimline_arrow_cw_fill_w Added
trimline_arrow_cw_n Added
trimline_arrow_cw_ne Added
trimline_arrow_cw_nw Added
trimline_arrow_cw_s Added
trimline_arrow_cw_se Added
trimline_arrow_cw_sw Added
trimline_arrow_cw_w Added
trimline_box Added
trimline_box_fill Added
trimline_corner_fill_ne Added
trimline_corner_fill_nw Added
trimline_corner_fill_se Added
trimline_corner_fill_sw Added
trimline_corner_ne Added
trimline_corner_nw Added
trimline_corner_se Added
trimline_corner_sw Added
trimline_e Added
trimline_end_e Added
trimline_end_fill_e Added
trimline_end_fill_n Added
trimline_end_fill_s Added
trimline_end_fill_w Added
trimline_end_n Added
trimline_end_s Added
trimline_end_w Added
trimline_fill_e Added
trimline_fill_n Added
trimline_fill_ne Added
trimline_fill_nw Added
trimline_fill_s Added
trimline_fill_se Added
trimline_fill_sw Added
trimline_fill_w Added
trimline_mid_e Added
trimline_mid_fill_e Added
trimline_mid_fill_n Added
trimline_mid_fill_s Added
trimline_mid_fill_w Added
trimline_mid_n Added
trimline_mid_s Added
trimline_mid_w Added
trimline_n Added
trimline_ne Added
trimline_nw Added
trimline_s Added
trimline_se Added
trimline_shrink_ccw_e Added
trimline_shrink_ccw_n Added
trimline_shrink_ccw_s Added
trimline_shrink_ccw_w Added
trimline_shrink_cw_e Added
trimline_shrink_cw_n Added
trimline_shrink_cw_s Added
trimline_shrink_cw_w Added
trimline_sw Added
trimline_tram_e Added
trimline_tram_n Added
trimline_tram_s Added
trimline_tram_w Added
trimline_w Added
trimline_warn_e Added
trimline_warn_fill_e Added
trimline_warn_fill_n Added
trimline_warn_fill_ne Added
trimline_warn_fill_nw Added
trimline_warn_fill_s Added
trimline_warn_fill_se Added
trimline_warn_fill_sw Added
trimline_warn_fill_w Added
trimline_warn_n Added
trimline_warn_ne Added
trimline_warn_nw Added
trimline_warn_s Added
trimline_warn_se Added
trimline_warn_sw Added
trimline_warn_w Added

Resources/Textures/SimpleStation14/Decals/misc.rsi

State Old New Status
sandy_floor Added
sandy_plating Added

Resources/Textures/SimpleStation14/Structures/Wallmounts/Directional/minsky.rsi

State Old New Status
bridge Added
eng Added
evac Added
med Added
sci Added
sec Added
supply Added

Resources/Textures/SimpleStation14/Structures/Wallmounts/Directional/rooms.rsi

State Old New Status
room_1 Added
room_2 Added
room_3 Added
room_4 Added
room_5 Added
room_6 Added
room_7 Added
room_8 Added

Resources/Textures/SimpleStation14/Structures/Wallmounts/deptsign.rsi

State Old New Status
mining_nanotrasen Added
mining_salvage Added

Resources/Textures/SimpleStation14/Structures/Wallmounts/deptsigns.rsi

State Old New Status
atmo Added
bridge Added
cargo Added
charge Added
chem Added
chemb Added
clone Added
cloneb Added

Edit: diff updated after 53bc8e8

@DEATHB4DEFEAT DEATHB4DEFEAT changed the title Decals Decals (and posters) Apr 18, 2023
@github-actions github-actions bot added the Changes: YML Changes any yml files label Apr 18, 2023
@DEATHB4DEFEAT DEATHB4DEFEAT marked this pull request as ready for review April 18, 2023 03:22
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Apr 18, 2023
Comment on lines -3 to +5
MinSize="250 500"
SetSize="250 500">
MinSize="338 600">
<BoxContainer Orientation="Vertical">
<LineEdit Name="Search" />
<LineEdit Name="Search" HorizontalExpand="True" />
Copy link
Member

Choose a reason for hiding this comment

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

Hah, Nice.

@DEATHB4DEFEAT DEATHB4DEFEAT merged commit 1ab6db8 into master Aug 25, 2023
4 of 13 checks passed
@DEATHB4DEFEAT DEATHB4DEFEAT deleted the decals branch August 25, 2023 01:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Sprite Changes any png or json in an rsi Changes: UI Changes any XAML files Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants