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 Mapper Assets #1315

Merged
merged 26 commits into from
Dec 11, 2024

Conversation

VMSolidus
Copy link
Member

Description

By request from Old Dance Jacket, who wanted to be able to use N14 Mapping Assets in SS14. We should probably trim this list down for what assets aren't actually needed (Any asset that is 100% unique to Fallout for instance)

Changelog

🆑

  • add: Added a large number of mapping assets from Nuclear14

Copy link
Contributor

github-actions bot commented Dec 5, 2024

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

Resources/Textures/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/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
sign_left Added
sign_right Added
stalagmite Added
stalagmite1 Added
stalagmite2 Added
stalagmite3 Added
stalagmite4 Added
stalagmite5 Added
support Added
support_beams Added
support_wall Added
support_wall_broken Added

Resources/Textures/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/Structures/Decoration/signs_64x64.rsi

State Old New Status
bazaar Added
we_open Added

Resources/Textures/Structures/Decoration/tires.rsi

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

Resources/Textures/Structures/Decoration/torches.rsi

State Old New Status
torch_lit Added
torch_unlit Added
wall_torch_lit Added
wall_torch_unlit Added

Resources/Textures/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
pot_1 Added
pot_2 Added
pot_3 Added
pot_4 Added
scattered_papers Added
shower Added
sink Added
skeleton Added
toilet 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
trashbin Added
woodscrap Added

Resources/Textures/Structures/Storage/Closets/cabinet.rsi

State Old New Status
closet Added
closet_door Added
closet_open Added

Resources/Textures/Structures/Storage/Closets/closet.rsi

State Old New Status
closet Added
closet_door Added
closet_open Added
welded Added

Resources/Textures/Structures/Storage/Closets/closetgeneric.rsi

State Old New Status
closet Added
closet_door Added
closet_open Added
welded Added

Resources/Textures/Structures/Storage/Closets/closetgrey.rsi

State Old New Status
closet Added
closet_door Added
closet_open Added
welded Added

Resources/Textures/Structures/Storage/Closets/closetgrey2.rsi

State Old New Status
closet Added
closet_door Added
closet_open Added
welded Added

Resources/Textures/Structures/Storage/Closets/closetold.rsi

State Old New Status
closet Added
closet_door Added
closet_open Added
welded Added

Resources/Textures/Structures/Storage/Closets/doublecloset.rsi

State Old New Status
closet Added
closet_door Added
closet_open Added
welded Added

Resources/Textures/Structures/Storage/Closets/fridgedirty.rsi

State Old New Status
closet Added
closet_door Added
closet_open Added
welded Added

Resources/Textures/Structures/Storage/Closets/fridgewidedirty.rsi

State Old New Status
closet Added
closet_door Added
closet_open Added
welded Added

Resources/Textures/Structures/Storage/Closets/guncabinet.rsi

State Old New Status
closet Added
closet_door Added
closet_open Added
shotgun Added
welded Added

Resources/Textures/Structures/Storage/Closets/medicabinet.rsi

State Old New Status
closet Added
closet_door Added
closet_open Added
welded Added

Resources/Textures/Structures/Storage/Crates/aluminiumcrate.rsi

State Old New Status
base Added
closed Added
icon Added
lock Added
open Added
welded Added

Resources/Textures/Structures/Storage/Crates/armycrate.rsi

State Old New Status
base Added
closed Added
icon Added
lock Added
open Added
welded Added

Resources/Textures/Structures/Storage/Crates/cashregister.rsi

State Old New Status
register_clean Added
register_cleanopen Added

Resources/Textures/Structures/Storage/Crates/cashregisterbloody.rsi

State Old New Status
register Added
registeropen Added

Resources/Textures/Structures/Storage/Crates/cratemilitary.rsi

State Old New Status
base Added
closed Added
icon Added
open Added

Resources/Textures/Structures/Storage/Crates/cratewooden.rsi

State Old New Status
base Added
closed Added
icon Added
open Added

Resources/Textures/Structures/Storage/Crates/footlocker.rsi

State Old New Status
base Added
closed Added
icon Added
open Added

Edit: diff updated after bf37866

@github-actions github-actions bot added Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Dec 5, 2024
@VMSolidus VMSolidus merged commit 3e93876 into Simple-Station:master Dec 11, 2024
12 of 13 checks passed
sleepyyapril pushed a commit to angelofallars/Einstein-Engines that referenced this pull request Dec 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants