Merge branch 'master' into add-weapon-recipes

Vault-Overseers · Sep 15, 2024 · efb9f44 · efb9f44
2 parents 5aa3f4b + 9d5c4ba
commit efb9f44
Show file tree

Hide file tree

Showing 33 changed files with 477,199 additions and 234,632 deletions.
diff --git a/Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl b/Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl
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/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/junk.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/junk.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Hydroponics/equipment.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Hydroponics/equipment.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/UndecidedLoadout.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/UndecidedLoadout.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/kits.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/kits.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Tools/tools.yml
diff --git a/...ces/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/12gauge.yml b/...ces/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/12gauge.yml
diff --git a/...rces/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/45-70.yml b/...rces/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/45-70.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/knife.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/spear.yml
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/table.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/table.yml
diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Construction/Graphs/tables.yml b/Resources/Prototypes/_Nuclear14/Recipes/Construction/Graphs/tables.yml
diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Construction/Graphs/weapons.yml b/Resources/Prototypes/_Nuclear14/Recipes/Construction/Graphs/weapons.yml
diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/gun.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/gun.yml
diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/guns.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/guns.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/tags.yml b/Resources/Prototypes/_Nuclear14/tags.yml
diff --git a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Shotguns/sawed_off.rsi/base.png b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Shotguns/sawed_off.rsi/base.png
diff --git a/...s/Textures/_Nuclear14/Objects/Weapons/Guns/Shotguns/sawed_off.rsi/bolt-open.png b/...s/Textures/_Nuclear14/Objects/Weapons/Guns/Shotguns/sawed_off.rsi/bolt-open.png
diff --git a/...xtures/_Nuclear14/Objects/Weapons/Guns/Shotguns/sawed_off.rsi/equipped-BELT.png b/...xtures/_Nuclear14/Objects/Weapons/Guns/Shotguns/sawed_off.rsi/equipped-BELT.png
diff --git a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Shotguns/sawed_off.rsi/icon.png b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Shotguns/sawed_off.rsi/icon.png
diff --git a/...Textures/_Nuclear14/Objects/Weapons/Guns/Shotguns/sawed_off.rsi/inhand-left.png b/...Textures/_Nuclear14/Objects/Weapons/Guns/Shotguns/sawed_off.rsi/inhand-left.png
diff --git a/...extures/_Nuclear14/Objects/Weapons/Guns/Shotguns/sawed_off.rsi/inhand-right.png b/...extures/_Nuclear14/Objects/Weapons/Guns/Shotguns/sawed_off.rsi/inhand-right.png
diff --git a/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Shotguns/sawed_off.rsi/meta.json b/Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Shotguns/sawed_off.rsi/meta.json