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

Port N14 Decor #2760

Merged
merged 19 commits into from
Jan 27, 2025
Merged

Port N14 Decor #2760

merged 19 commits into from
Jan 27, 2025

Conversation

rosieposieeee
Copy link
Contributor

@rosieposieeee rosieposieeee commented Jan 17, 2025

About the PR

added one or two items

port of a port Goob-Station/Suspicion-on-Space-Station#47

Content Client_HTY2n2Q2Bw
Content Client_tcznBrIvK3
Content Client_va7qrl3HhR
(note: fixed subfloor wires showing after taking this image)
Content Client_Q4iv71aKvI

Why / Balance

mappers rejoice

inb4 'whgy did you spam lights everywhere instead of fullbright' so you can see what they actually look like ingame :)

NOTE: I hereby release all changes made in this PR under MIT license inasmuch as that matters for a port of AGPL content. Like if you ever get the original makers to okay it as MIT, and you want to port this specific port-of-a-port for some reason, this is your go-ahead from me too.

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Changelog
🆑

  • add: Ported a metric fuckton of props from N14.

Aidenkrz and others added 2 commits January 16, 2025 18:19
* Nuclear Station 14 Ports (DeltaV-Station#3)

* Nuclear Station 14 Ports

Combines all PR's from old Repo into one.

* lightbulb

* yeah

* fix 1

* rsi fixes

* fix 5 trillion

* It's a fine day

* People open windows

* They leave their houses

* Just for a short while

* They walk by the grass

* And they look at the grass

* They look at the sky

---------

Co-authored-by: Icepick <[email protected]>
@rosieposieeee rosieposieeee requested review from a team as code owners January 17, 2025 03:14
@github-actions github-actions bot added S: Needs Review size/XS Under 16 lines Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an rsi Changes: Audio Changes any audio files labels Jan 17, 2025
Copy link
Contributor

github-actions bot commented Jan 17, 2025

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

Resources/Textures/_Nuclear14/Structures/Decoration/barriers.rsi

State Old New Status
concrete_barrier Added
concrete_barrier_1 Added
concrete_barrier_2 Added
concrete_barrier_3 Added
concrete_barrier_4 Added
concrete_barrier_5 Added
concrete_barrier_alt Added
concrete_barrier_alt_1 Added
road_barrier Added

Resources/Textures/_Nuclear14/Structures/Decoration/cave_decor.rsi

State Old New Status
minecart_fallen Added

Resources/Textures/_Nuclear14/Structures/Decoration/flora.rsi

State Old New Status
agave-dead Added
branch Added
branch_broken Added
broc-dead Added
brushwood Added
brushwood_alt Added
ferocactus-dead Added
mutfruit-dead Added
tall_grass_1 Added
tall_grass_2 Added
tall_grass_3 Added
tall_grass_4 Added
tall_grass_5 Added
tall_grass_6 Added
tall_grass_7 Added
tall_grass_8 Added
timber Added
tree_log Added
tree_stump Added
tree_timber Added
xander-dead Added

Resources/Textures/_Nuclear14/Structures/Decoration/rails64.rsi

State Old New Status
junction-left-bottom Added
junction-left-top Added
junction-right-bottom Added
junction-right-top Added
rails Added
turn-NE Added
turn-NW Added
turn-SE Added
turn-WS Added

Resources/Textures/_Nuclear14/Structures/Decoration/signs_64x64.rsi

State Old New Status
bazaar Added
we_open Added

Resources/Textures/_Nuclear14/Structures/Decoration/world.rsi

State Old New Status
bookpile_1 Added
bookpile_2 Added
bookpile_3 Added
bookpile_4 Added
bookpile_5 Added
bookpile_6 Added
bookstack_1 Added
bookstack_2 Added
bookstack_3 Added
brickpile Added
brickrubble Added
cardboard Added
concrete_barrier Added
concrete_barrier_1 Added
concrete_barrier_2 Added
concrete_barrier_3 Added
concrete_barrier_4 Added
concrete_barrier_5 Added
concrete_barrier_alt Added
concrete_barrier_alt_2 Added
foodstuff_1 Added
foodstuff_2 Added
foodstuff_3 Added
foodstuff_4 Added
foodstuff_5 Added
foodstuff_6 Added
glass_1 Added
glass_2 Added
glass_3 Added
glass_4 Added
glass_5 Added
glass_6 Added
mine_sign Added
pallet Added
pallet_stack Added
papers_1 Added
papers_2 Added
papers_3 Added
scattered_papers Added
skeleton Added
trashbags_1 Added
trashbags_2 Added
trashbags_3 Added
trashbags_4 Added
trashbags_5 Added
trashbags_6 Added
woodscrap Added

Resources/Textures/_Nuclear14/Structures/Doors/RollerDoors/framedshutter.rsi

State Old New Status
closed Added
closing Added
open Added
opening Added
welded Added

Resources/Textures/_Nuclear14/Structures/Doors/RollerDoors/garageshutter.rsi

State Old New Status
closed Added
closing Added
open Added
opening Added
welded Added

Resources/Textures/_Nuclear14/Structures/Doors/SlantedDoors/cell.rsi

State Old New Status
closed Added
closing Added
open Added
opening Added

Resources/Textures/_Nuclear14/Structures/Doors/SlantedDoors/cellrust.rsi

State Old New Status
closed Added
closing Added
open Added
opening Added

Resources/Textures/_Nuclear14/Structures/Doors/SlantedDoors/fence.rsi

State Old New Status
closed Added
open Added

Resources/Textures/_Nuclear14/Structures/Doors/SlantedDoors/fence_barbed.rsi

State Old New Status
closed Added
open Added

Resources/Textures/_Nuclear14/Structures/Doors/SlantedDoors/metal_bar.rsi

State Old New Status
closed Added
open Added

Resources/Textures/_Nuclear14/Structures/Doors/SlantedDoors/metal_grate.rsi

State Old New Status
closed Added
open Added

Resources/Textures/_Nuclear14/Structures/Furniture/64x64_furniture.rsi

State Old New Status
bigshelf1_openL Added
bigshelf1_openR Added
bigshelf2_open Added
desk_metal Added
desk_metal_small Added
desk_wood Added
desk_wood_small Added
showcase Added
table_cards Added
table_cards1 Added
table_cards2 Added
table_metal_wide Added
table_pool Added
table_wood_wide_oval Added
table_wood_wide_square Added

Resources/Textures/_Nuclear14/Structures/Furniture/64x96_furniture.rsi

State Old New Status
clothing_rack Added
medshelves Added
metal_shelf Added
shelf_shop Added
stand_wood Added
stand_wood_small Added
wood_shelf-alt Added
wood_shelf Added
wood_shelf_big Added

Resources/Textures/_Nuclear14/Structures/Furniture/Store_Furniture/delistand.rsi

State Old New Status
deli_stand Added
food-0 Added
food-1 Added
food-2 Added
food-3 Added
food-4 Added
food-5 Added

Resources/Textures/_Nuclear14/Structures/Furniture/Store_Furniture/fruitstand.rsi

State Old New Status
fruitstand-1 Added
fruitstand-2 Added
fruitstand-3 Added
fruitstand_empty Added

Resources/Textures/_Nuclear14/Structures/Furniture/Tables/counters.rsi

State Old New Status
craft_counter Added
craft_counter_bend Added
craft_counter_cross Added
craft_counter_intersect Added
metal_counter Added
metal_counter_bend Added
metal_counter_cross Added
metal_counter_intersect Added
wood_counter Added
wood_counter_bend Added
wood_counter_cross Added
wood_counter_intersect Added

Resources/Textures/_Nuclear14/Structures/Furniture/Tables/desks.rsi

State Old New Status
desk_metal Added
desk_wood Added

Resources/Textures/_Nuclear14/Structures/Furniture/Tables/metalgrate.rsi

State Old New Status
full Added
state_0 Added
state_1 Added
state_2 Added
state_3 Added
state_4 Added
state_5 Added
state_6 Added
state_7 Added

Resources/Textures/_Nuclear14/Structures/Furniture/Tables/tables.rsi

State Old New Status
table_metal_round-1 Added
table_metal_round-2 Added
table_metal_round Added
table_rolling Added
table_wood_low Added
table_wood_round Added
table_wood_square Added
table_wood_stand Added
tableframe_wood Added
trableframe_metal Added

Resources/Textures/_Nuclear14/Structures/Furniture/chairs.rsi

State Old New Status
armchair Added
captain_chair Added
diner_chair Added
ergo_chair Added
retro_chair Added

Resources/Textures/_Nuclear14/Structures/Furniture/np13_misc.rsi

State Old New Status
book-0 Added
book-1 Added
book-2 Added
book-3 Added
book-4 Added
book-5 Added
bookempty Added
dresser Added
fitnesslifter Added
fitnesslifter2 Added
fitnessweight-c Added
fitnessweight-w Added

Edit: diff updated after eae86f7

@ThataKat
Copy link
Contributor

Direction approved, may be subject to review by the Art Director later.

@rosieposieeee
Copy link
Contributor Author

rosieposieeee commented Jan 26, 2025

note: i have reduced the number of items significantly, mainly to cut out all the stuff that was dubiously in our art style or not. the main pr's images have been updated accordingly.

@rosieposieeee
Copy link
Contributor Author

wao... no notes... ready to merge then :)

@deltanedas
Copy link
Member

may be subject to review by the Art Director later.

revert after 5 minutes incoming when its all wrong :trollface:

@deltanedas deltanedas merged commit 3088c7d into DeltaV-Station:master Jan 27, 2025
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes any audio files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review size/XS Under 16 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants