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

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Port N14 Decor #2760

wants to merge 12 commits into from

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_B8P9eg2IEr
Content Client_C04aap9V1P
Content Client_LuRmH0ovcG
Content Client_RAnSTOVnHi

Why / Balance

mappers rejoice

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

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 222661b merging into 90629ee
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

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

State Old New Status
Added
double_grey_1 Added
double_grey_2 Added
double_red_1 Added
double_red_2 Added
double_toxic_1 Added
double_waste_1 Added
double_waste_2 Added
double_yellow_1 Added
double_yellow_2 Added
flammable_1 Added
flammable_2 Added
flammable_3 Added
grey_1 Added
grey_2 Added
grey_3 Added
hazard_1 Added
hazard_2 Added
hazard_3 Added
label_1 Added
label_2 Added
label_3 Added
quad_grey_1 Added
quad_red_1 Added
quad_red_2 Added
quad_toxic_1 Added
quad_waste_1 Added
quad_yellow_1 Added
red_1 Added
red_2 Added
red_3 Added
red_alt_1 Added
red_alt_2 Added
red_alt_3 Added
toxic_1 Added
toxic_2 Added
toxic_3 Added
toxic_4 Added
triple_grey_1 Added
triple_grey_2 Added
triple_grey_3 Added
triple_red_1 Added
triple_red_2 Added
triple_toxic_1 Added
triple_toxic_2 Added
triple_waste_1 Added
triple_waste_2 Added
triple_waste_3 Added
triple_yellow_1 Added
triple_yellow_2 Added
triple_yellow_3 Added
warning_1 Added
warning_2 Added
warning_3 Added
waste_1 Added
waste_2 Added
waste_3 Added
yellow_1 Added
yellow_2 Added
yellow_3 Added

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
boards_drought_ns-1 Added
boards_drought_ns-2 Added
boards_drought_ns-3 Added
boards_drought_ns-4 Added
boards_drought_ns-5 Added
boards_drought_ns-6 Added
boards_drought_we-1 Added
boards_drought_we-2 Added
boards_drought_we-3 Added
boards_drought_we-4 Added
boards_drought_we-5 Added
boards_drought_we-6 Added
boards_mammoth_ns-1 Added
boards_mammoth_ns-2 Added
boards_mammoth_ns-3 Added
boards_mammoth_ns-4 Added
boards_mammoth_ns-5 Added
boards_mammoth_ns-6 Added
boards_mammoth_we-1 Added
boards_mammoth_we-2 Added
boards_mammoth_we-3 Added
boards_mammoth_we-4 Added
boards_mammoth_we-5 Added
boards_mammoth_we-6 Added
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/tires.rsi

State Old New Status
junktire1 Added
junktire2 Added
junktire3 Added
junktire4 Added
junktire5 Added

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

State Old New Status
barrels1 Added
barrels2 Added
barrels3 Added
barrels4 Added
barrels5 Added
barrels6 Added
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
mailbox-open Added
mailbox Added
mailbox_old-open Added
mailbox_old Added
mine_sign Added
pallet Added
pallet_stack Added
papers_1 Added
papers_2 Added
papers_3 Added
payphone Added
payphone_alt Added
phone_black Added
phone_red Added
scattered_papers Added
skeleton Added
trashbags_1 Added
trashbags_2 Added
trashbags_3 Added
trashbags_4 Added
trashbags_5 Added
trashbags_6 Added
trashbin-1 Added
trashbin-2 Added
trashbin-3 Added

Edit: diff updated after 222661b

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.

2 participants