Merge branch 'master' into Z's-Big-Bag

Vault-Overseers · Jan 4, 2025 · 11c4773 · 11c4773
2 parents a1d4de4 + 465dae7
commit 11c4773
Show file tree

Hide file tree

Showing 33 changed files with 425,050 additions and 669,239 deletions.
diff --git a/Resources/Audio/_Nuclear14/Effects/attributions.yml b/Resources/Audio/_Nuclear14/Effects/attributions.yml
diff --git a/Resources/Audio/_Nuclear14/Effects/open_gift.ogg b/Resources/Audio/_Nuclear14/Effects/open_gift.ogg
diff --git a/Resources/Audio/_Nuclear14/Lobby/Frank-Sinatra-Jingle-Bells.ogg b/Resources/Audio/_Nuclear14/Lobby/Frank-Sinatra-Jingle-Bells.ogg
diff --git a/Resources/Audio/_Nuclear14/Lobby/attributions.yml b/Resources/Audio/_Nuclear14/Lobby/attributions.yml
diff --git a/Resources/Maps/N14/SunnyvaleSurface.yml b/Resources/Maps/N14/SunnyvaleSurface.yml
diff --git a/Resources/Maps/N14/SunnyvaleUnderground.yml b/Resources/Maps/N14/SunnyvaleUnderground.yml
diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/backpack.yml
diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/satchel.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Food/crackers.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Food/crackers.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Food/preserves.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Food/preserves.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/new_years_gift.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/new_years_gift.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/shelter.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/shelter.yml
diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/items.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/items.yml
diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/materials.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/materials.yml
diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/storage.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/storage.yml
diff --git a/Resources/Prototypes/_Nuclear14/SoundCollections/lobby.yml b/Resources/Prototypes/_Nuclear14/SoundCollections/lobby.yml
diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/gift.rsi/blue_gift.png b/Resources/Textures/_Nuclear14/Objects/Misc/gift.rsi/blue_gift.png
diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/gift.rsi/gift.png b/Resources/Textures/_Nuclear14/Objects/Misc/gift.rsi/gift.png
diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/gift.rsi/gift_2.png b/Resources/Textures/_Nuclear14/Objects/Misc/gift.rsi/gift_2.png
diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/gift.rsi/gift_3.png b/Resources/Textures/_Nuclear14/Objects/Misc/gift.rsi/gift_3.png
diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/gift.rsi/gold_gift.png b/Resources/Textures/_Nuclear14/Objects/Misc/gift.rsi/gold_gift.png
diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/gift.rsi/meta.json b/Resources/Textures/_Nuclear14/Objects/Misc/gift.rsi/meta.json
diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/gift.rsi/red_gift.png b/Resources/Textures/_Nuclear14/Objects/Misc/gift.rsi/red_gift.png
diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/gift.rsi/silver_gift.png b/Resources/Textures/_Nuclear14/Objects/Misc/gift.rsi/silver_gift.png
diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/gift.rsi/yellow.png b/Resources/Textures/_Nuclear14/Objects/Misc/gift.rsi/yellow.png
diff --git a/...elternew.rsi/shelternewclosedoccupied.png → ...Structures/Misc/shelternew.rsi/closed.png b/...elternew.rsi/shelternewclosedoccupied.png → ...Structures/Misc/shelternew.rsi/closed.png
diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/shelternew.rsi/meta.json b/Resources/Textures/_Nuclear14/Structures/Misc/shelternew.rsi/meta.json
diff --git a/...es/Misc/shelternew.rsi/shelternewopen.png → ...4/Structures/Misc/shelternew.rsi/open.png b/...es/Misc/shelternew.rsi/shelternewopen.png → ...4/Structures/Misc/shelternew.rsi/open.png
diff --git a/...terworn.rsi/shelterwornclosedoccupied.png → ...tructures/Misc/shelterworn.rsi/closed.png b/...terworn.rsi/shelterwornclosedoccupied.png → ...tructures/Misc/shelterworn.rsi/closed.png
diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/shelterworn.rsi/meta.json b/Resources/Textures/_Nuclear14/Structures/Misc/shelterworn.rsi/meta.json
diff --git a/.../Misc/shelterworn.rsi/shelterwornopen.png → .../Structures/Misc/shelterworn.rsi/open.png b/.../Misc/shelterworn.rsi/shelterwornopen.png → .../Structures/Misc/shelterworn.rsi/open.png