Dark/Light Grass & Desert Astrotiles (#37867)
* Added Waterjug, a low-mid pop map with a tropical theme and custom evac shuttle * Fixed postmapinittest issues (Hopefully) * Actually fixed the afformentioned issue. * Added Warden Spawnpoint which I forgot * Named APCs, Substations, & Cameras, added some more decals * Decorated some more, notably the bar. * Minor adjustments, added cans, slightly reworked salv and maints bar * Fixed some small issues, notably weird closed doors, added a few small things (shutters mostly) * Added 2 new astrotiles, dark grass and desert sand. * Removed map. Fixing issue. Please hold. * Forgot to remove a comma, please god forgive me maptainers. I blame Rider IDE for it's autoaddition of all changes made even on seperate branches. * Added localization for stacks. * Actually fixed the loc. issue. Maybe. Please. * Hopefully fixed the last localization issue. * Added Light Astro-tiles, and edited the names of the inhand png's for the dark grass astrotiles to be more internally consistant * Fixed some issues caused by another PR I made, added more maints stuff * Made some small decorative and practical changes * Fixed, changed, and added a ton of stuff. I don't think I can list it all, honestly. * Removed shields to try to fix an issue with the test * Hopefully fixed issues relating to a failed test. * Replaced grass/flora decals with randomized ones, readded shields to armory * Fixed some YML issues, whitelisted files for flora decal spawners * Added a bridge-beach, added some misc. items and objects. * Small changes to buttons, fixed wires and flooring * Fixed AME-Holopad issue. * Added a Custom Waterjug Parallax, made it so the parallaxes actually work, and made some minor adjustments to the map * Fixed an accidental adjustment to CoreStation's parallax prototype YML * Changed some Salvage and Cargo stuff * Fixed some merge issues, updated Adriatic with a locker and added some little details to Waterjug * Fixed some stuff, added docking arm near evac * meta json fix tiles * fixed again * fixed once more * Removed all the waterjug stuff. * fix spacing * fix unnecessary formatting --------- Co-authored-by: SharkSnake98 <sharksnake87@gmail.com> Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
|
After Width: | Height: | Size: 474 B |
|
After Width: | Height: | Size: 474 B |
BIN
Resources/Textures/Objects/Tiles/tile.rsi/desertsand.png
Normal file
|
After Width: | Height: | Size: 648 B |
|
After Width: | Height: | Size: 444 B |
|
After Width: | Height: | Size: 453 B |
BIN
Resources/Textures/Objects/Tiles/tile.rsi/grassdark.png
Normal file
|
After Width: | Height: | Size: 405 B |
|
After Width: | Height: | Size: 450 B |
|
After Width: | Height: | Size: 459 B |
BIN
Resources/Textures/Objects/Tiles/tile.rsi/grasslight.png
Normal file
|
After Width: | Height: | Size: 408 B |
@@ -34,6 +34,9 @@
|
||||
{
|
||||
"name": "dark-offset"
|
||||
},
|
||||
{
|
||||
"name": "desertsand"
|
||||
},
|
||||
{
|
||||
"name": "dirty"
|
||||
},
|
||||
@@ -130,6 +133,12 @@
|
||||
{
|
||||
"name": "grass"
|
||||
},
|
||||
{
|
||||
"name": "grassdark"
|
||||
},
|
||||
{
|
||||
"name": "grasslight"
|
||||
},
|
||||
{
|
||||
"name": "grassjungle"
|
||||
},
|
||||
@@ -438,6 +447,14 @@
|
||||
"name": "grass-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "grasslight-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "grasslight-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "snow-inhand-left",
|
||||
"directions": 4
|
||||
@@ -446,6 +463,22 @@
|
||||
"name": "snow-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "grassdark-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "grassdark-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "desertsand-inhand-left",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "desertsand-inhand-right",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "dirty-inhand-left",
|
||||
"directions": 4
|
||||
|
||||