]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Dark/Light Grass & Desert Astrotiles (#37867)
authorSharkSnake98 <peanutbuttersharky@gmail.com>
Mon, 15 Sep 2025 01:30:12 +0000 (21:30 -0400)
committerGitHub <noreply@github.com>
Mon, 15 Sep 2025 01:30:12 +0000 (18:30 -0700)
commitfd20cc2a00a9976203616d37749a620e01ee0bbf
tree2a076323ae1f5f95947fc84b58d1eba3c2591a00
parent31d30f24f99c4a280f5a5d7f335a5504df2b94dc
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>
19 files changed:
Resources/Locale/en-US/stack/stacks.ftl
Resources/Locale/en-US/tiles/tiles.ftl
Resources/Prototypes/Entities/Markers/Spawners/Random/Decals/flora.yml
Resources/Prototypes/Entities/Objects/Misc/tiles.yml
Resources/Prototypes/Recipes/Lathes/Packs/science.yml
Resources/Prototypes/Recipes/Lathes/misc.yml
Resources/Prototypes/Research/civilianservices.yml
Resources/Prototypes/Stacks/floor_tile_stacks.yml
Resources/Prototypes/Tiles/floors.yml
Resources/Textures/Objects/Tiles/tile.rsi/desertsand-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/desertsand-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/desertsand.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/grassdark-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/grassdark-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/grassdark.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/grasslight-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/grasslight-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/grasslight.png [new file with mode: 0644]
Resources/Textures/Objects/Tiles/tile.rsi/meta.json