forked from Vault-Overseers/nuclear-14
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #113 from Corvax-Frontier/miniupmap
Обновление карты
- Loading branch information
Showing
34 changed files
with
424,570 additions
and
285,565 deletions.
There are no files selected for viewing
Oops, something went wrong.
277,266 changes: 169,160 additions & 108,106 deletions
277,266
Resources/Maps/Corvax/CorvaxSunnyvaleSurface.yml
Oops, something went wrong.
304,903 changes: 184,281 additions & 120,622 deletions
304,903
Resources/Maps/N14/SunnyvaleSurface.yml
Oops, something went wrong.
127,614 changes: 70,917 additions & 56,697 deletions
127,614
Resources/Maps/N14/SunnyvaleUnderground.yml
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
216 changes: 108 additions & 108 deletions
216
Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml
Oops, something went wrong.
Oops, something went wrong.
38 changes: 34 additions & 4 deletions
38
Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/junk.yml
Oops, something went wrong.
6 changes: 4 additions & 2 deletions
6
Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml
Oops, something went wrong.
4 changes: 3 additions & 1 deletion
4
Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/floradesert.yml
Oops, something went wrong.
12 changes: 10 additions & 2 deletions
12
Resources/Prototypes/_Nuclear14/Recipes/Lathes/cooking.yml
Oops, something went wrong.
Oops, something went wrong.
4 changes: 1 addition & 3 deletions
4
Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/knight.yml
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml
Oops, something went wrong.
3 changes: 3 additions & 0 deletions
3
Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/squire.yml
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
Resources/Prototypes/_Nuclear14/Roles/Jobs/NCR/republic_ranger.yml
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml
Oops, something went wrong.
Oops, something went wrong.
Binary file removed
BIN
-627 Bytes
Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/groundtires.png
Binary file not shown.
Binary file added
BIN
+895 Bytes
Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/junktire1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+972 Bytes
Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/junktire2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+834 Bytes
Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/junktire3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+653 Bytes
Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/junktire4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.09 KB
Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/junktire5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 16 additions & 2 deletions
18
Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/meta.json
Oops, something went wrong.
Binary file removed
BIN
-496 Bytes
Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/stackedtires.png
Binary file not shown.