Wall, Airlocks and Tile resprites #1470

noctyrnal · 2024-07-07T23:19:26Z

About the PR

Resprites the basic walls, most airlocks and tiles and most deals, along with adding two new sets of decals. I intent on doing more PRs in the future to resprite more content.

Why / Balance

Provides Delta-V with a unique visual identity originating from SS13 forks with content either being fully ported, edited and ported, or wholly created by myself to match the style created with this PR.

Technical details

Media

[ X ] I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑

tweak: Walls, Airlocks and Tiles have received new sprites as per a visual resprite project.

"Detla" V :blunt:

github-actions · 2024-07-07T23:20:02Z

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

Resources/Textures/DeltaV/Decals/bricktile.rsi

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

Resources/Textures/DeltaV/Decals/trimline.rsi

State	Old	New	Status
thick_box			Added
thick_corner_e			Added
thick_corner_n			Added
thick_corner_ne			Added
thick_corner_nw			Added
thick_corner_s			Added
thick_corner_se			Added
thick_corner_sw			Added
thick_corner_w			Added
thick_e			Added
thick_inner_ne			Added
thick_inner_nw			Added
thick_inner_se			Added
thick_inner_sw			Added
thick_n			Added
thick_s			Added
thick_shrink_e_1			Added
thick_shrink_e_2			Added
thick_shrink_n_1			Added
thick_shrink_n_2			Added
thick_shrink_s_1			Added
thick_shrink_s_2			Added
thick_shrink_w_1			Added
thick_shrink_w_2			Added
thick_w			Added
thin_corner_e			Added
thin_corner_n			Added
thin_corner_ne			Added
thin_corner_nw			Added
thin_corner_s			Added
thin_corner_se			Added
thin_corner_sw			Added
thin_corner_w			Added
thin_e			Added
thin_inner_ne			Added
thin_inner_nw			Added
thin_inner_se			Added
thin_inner_sw			Added
thin_n			Added
thin_s			Added
thin_w			Added

Resources/Textures/DeltaV/Decals/wood_trim.rsi

State	Old	New	Status
thin_box			Added
thin_corner_ne			Added
thin_corner_nw			Added
thin_corner_se			Added
thin_corner_sw			Added
thin_end_e			Added
thin_end_n			Added
thin_end_s			Added
thin_end_w			Added
thin_inner_ne			Added
thin_inner_nw			Added
thin_inner_se			Added
thin_inner_sw			Added
thin_line_e			Added
thin_line_n			Added
thin_line_s			Added
thin_line_w			Added

Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/atmospherics.rsi

State	Old	New	Status
assembly			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_unlit			Added
open			Added
opening			Added
opening_unlit			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/basic.rsi

State	Old	New	Status
assembly			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_unlit			Added
open			Added
opening			Added
opening_unlit			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/cargo.rsi

State	Old	New	Status
assembly			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_unlit			Added
open			Added
opening			Added
opening_unlit			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/centcomm.rsi

State	Old	New	Status
assembly			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_unlit			Added
open			Added
opening			Added
opening_unlit			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/command.rsi

State	Old	New	Status
assembly			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_unlit			Added
open			Added
opening			Added
opening_unlit			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/engineering.rsi

State	Old	New	Status
assembly			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_unlit			Added
open			Added
opening			Added
opening_unlit			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/external.rsi

State	Old	New	Status
assembly			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_unlit			Added
open			Added
opening			Added
opening_unlit			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/glass.rsi

State	Old	New	Status
assembly			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_unlit			Added
open			Added
opening			Added
opening_unlit			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/maint.rsi

State	Old	New	Status
assembly			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added

Edit: diff updated after edede2d

noctyrnal · 2024-07-07T23:22:28Z

So many files changed holy shit let me go kill this PR and cut it into pices

ghost · 2024-07-07T23:23:37Z

Noctyrn my brother in contribution, I'm reopening this

noctyrnal · 2024-07-07T23:24:11Z

Noctyrn my brother in contribution, I'm reopening this

I was going to do at a later date, need to make this less of a nightmare for maintainers to handle

noctyrnal · 2024-07-07T23:33:21Z

Marked as draft until we have more people to maintain a project of this size o7

WarMechanic

I hate to be the 'more work' guy but I'm going to suggest earlier rather than later:

RCD prototypes have a sprite specifier that determines their ui icon. Currently these point to a unique icon sprite - in the case of the airlock structure its the same sprite but nearest-neighbour squashed to add 5 pixel padding on the edges. You could either emulate this, or have the icons point to the new DeltaV sprites directly.

NullWanderer

Besides these 2, everything looks fine! I trust the automated tests for the rest.

Adei told me I wouldn't do it so I reviewed this. I looked at like 3 or 4 of the meta.json's, and they all seem fine.

Resources/Prototypes/DeltaV/Entities/Structures/Windows/tinted_windows.yml

NullWanderer · 2024-07-14T10:01:37Z

If it turns out to be too much to maintain, we can always revert

NullWanderer

Reapproving :Godo:

You can run tests local

NullWanderer · 2024-07-14T10:10:07Z

@noctyrnal before I merge this, was the only reason for the draft maintaining concerns?

noctyrnal · 2024-07-14T12:36:56Z

@noctyrnal before I merge this, was the only reason for the draft maintaining concerns?

yeah, since it's an absolutely massive pr and I imagine just lil old me couldnt maintain it solo

NullWanderer · 2024-07-14T15:25:36Z

@noctyrnal before I merge this, was the only reason for the draft maintaining concerns?

yeah, since it's an absolutely massive pr and I imagine just lil old me couldnt maintain it solo

It isn't that massive when you disregard sprites. They don't add new wall textures every day and when they do, they don't tend to suddenly be mapped

noctyrnal · 2024-07-14T15:37:23Z

@noctyrnal before I merge this, was the only reason for the draft maintaining concerns?

yeah, since it's an absolutely massive pr and I imagine just lil old me couldnt maintain it solo

It isn't that massive when you disregard sprites. They don't add new wall textures every day and when they do, they don't tend to suddenly be mapped

I concur, looking forward to continuing my work in the future hopefully in smaller PRs

ghost

Looking this PR from top to bottom, I think it's pretty good and safe to merge, with the changes made that null proposed. Sheer size (900 files) is pretty big, but remember - if we can't maintain it we can always revert.

NullWanderer

"Do it no balls"
~ Adei

noctyrnal · 2024-07-22T19:19:30Z

Thank you Adei and Null, this is truly a high command sweep.

Verbalase · 2024-07-22T20:16:12Z

it's all coming along... slowly every server will get it

overall hooray

NakataRin · 2024-07-23T00:44:45Z

I guess my opinion doesn't matter much, if at all, but I still hope for a miracle
This change makes delta-v look like the majority of russian servers. I fully disapprove this change

# Description Adds a prisoner headset box for warden's locker Reason: There's too much chaos in security and making radio headsets with pure encryption keys takes time and tools. More so cause by the time someone gets a perma punishment, its gonna be most likely late in the round and sec department will be dealing with a lot of things at the same time. --- <details><summary><h1>Media</h1></summary> <p> ![Content Client_LlH3OUGtCU](https://github.com/user-attachments/assets/ea20a648-9606-4104-9787-0766966bd358) ![Example Media Embed](https://example.com/thisimageisntreal.png) </p> </details> --- # Changelog  :cl: - add: Added prisoner headset box to warden's locker.

noctyrnal added 16 commits June 6, 2024 12:08

most basic door sprites, basic wall and window sprites

2d4c805

most tiles, secret door and windoors

5f10b59

rest of door stuff, undoes windoor sprites

d14544f

decals

8aaf2ab

decals

077c378

corners

17c7253

corners

dc0d84b

resprite directions and fix spelling error

ffc00ac

"Detla" V :blunt:

Merge branch 'master' into sprites-but-gaming

e789c5d

Merge branch 'master' into sprites-but-gaming

3c63f4a

adjust glass tile strength

8b46802

tile and sprite adjustments

df17f68

Merge branch 'master' into sprites-but-gaming

c743a0d

new tiles

a2dee94

windows and decals

1f475dd

Merge branch 'master' into sprites-but-gaming

5c554ac

github-actions bot added Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an rsi labels Jul 7, 2024

NullWanderer added S: Do Not Merge Don't merge this yet Priority: 2-High Needs to be resolved as soon as possible size/L 256-1023 lines Holy Shit labels Jul 7, 2024

noctyrnal closed this Jul 7, 2024

ghost reopened this Jul 7, 2024

noctyrnal marked this pull request as draft July 7, 2024 23:30

Fixes glaring test issues

289b1e7

WarMechanic reviewed Jul 8, 2024

View reviewed changes

NullWanderer self-assigned this Jul 9, 2024

NullWanderer previously approved these changes Jul 14, 2024

View reviewed changes

Resources/Prototypes/DeltaV/Entities/Structures/Windows/tinted_windows.yml Show resolved Hide resolved

Resources/Prototypes/DeltaV/Entities/Structures/Windows/tinted_windows.yml Show resolved Hide resolved

NullWanderer marked this pull request as ready for review July 14, 2024 10:01

Merge branch 'master' into sprites-but-gaming

d941580

NullWanderer enabled auto-merge (squash) July 14, 2024 10:01

NullWanderer dismissed their stale review via 80b0b73 July 14, 2024 10:04

Fix test fail

80b0b73

NullWanderer previously approved these changes Jul 14, 2024

View reviewed changes

NullWanderer dismissed their stale review via 7880fbc July 14, 2024 10:07

Noct please 😭

7880fbc

You can run tests local

NullWanderer disabled auto-merge July 14, 2024 10:07

ghost approved these changes Jul 15, 2024

View reviewed changes

Merge branch 'master' into sprites-but-gaming

edede2d

NullWanderer approved these changes Jul 22, 2024

View reviewed changes

NullWanderer merged commit 1523058 into DeltaV-Station:master Jul 22, 2024
13 checks passed

LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 11, 2025

Automatic Changelog Update (DeltaV-Station#1470)

4907639

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Wall, Airlocks and Tile resprites #1470

Wall, Airlocks and Tile resprites #1470

noctyrnal commented Jul 7, 2024

github-actions bot commented Jul 7, 2024 •

edited

Loading

noctyrnal commented Jul 7, 2024

ghost commented Jul 7, 2024

noctyrnal commented Jul 7, 2024

noctyrnal commented Jul 7, 2024

WarMechanic left a comment •

edited

Loading

NullWanderer left a comment

NullWanderer commented Jul 14, 2024

NullWanderer left a comment

NullWanderer commented Jul 14, 2024

noctyrnal commented Jul 14, 2024

NullWanderer commented Jul 14, 2024

noctyrnal commented Jul 14, 2024

ghost left a comment

NullWanderer left a comment

noctyrnal commented Jul 22, 2024

Verbalase commented Jul 22, 2024

NakataRin commented Jul 23, 2024

Wall, Airlocks and Tile resprites #1470

Wall, Airlocks and Tile resprites #1470

Conversation

noctyrnal commented Jul 7, 2024

About the PR

Why / Balance

Technical details

Media

Breaking changes

github-actions bot commented Jul 7, 2024 • edited Loading

noctyrnal commented Jul 7, 2024

ghost commented Jul 7, 2024

noctyrnal commented Jul 7, 2024

noctyrnal commented Jul 7, 2024

WarMechanic left a comment • edited Loading

Choose a reason for hiding this comment

NullWanderer left a comment

Choose a reason for hiding this comment

NullWanderer commented Jul 14, 2024

NullWanderer left a comment

Choose a reason for hiding this comment

NullWanderer commented Jul 14, 2024

noctyrnal commented Jul 14, 2024

NullWanderer commented Jul 14, 2024

noctyrnal commented Jul 14, 2024

ghost left a comment

Choose a reason for hiding this comment

NullWanderer left a comment

Choose a reason for hiding this comment

noctyrnal commented Jul 22, 2024

Verbalase commented Jul 22, 2024

NakataRin commented Jul 23, 2024

github-actions bot commented Jul 7, 2024 •

edited

Loading

WarMechanic left a comment •

edited

Loading