Organise and Add Assets

[astriloqua]

Description

Organises previously added RMC14 assets such as there is no duplication between decals and entities. Cacti and some grasses have been decalised while rest were removed as they were duplicates.

Adds N14 bookshelves, shelves, cash register, and all of decals (including road markings that also have creative alt. usage). Adds magazine rack that you can put all magazines excluding ammo boxes.

---

TODO

• [x] Figure out what the fuck "weapons rack" is? cause ODJ wants it
• [x] Port some N14 assets
• [x] Organise RMC14 assets

---

Media

---

Changelog

:cl: non-user facing ^{no mappers aren't users}

[coderabbitai[bot]]

Walkthrough

Adds a generic Magazine tag to many magazine prototypes, introduces numerous decal assets (drought, flora, graffiti, road markings, full/half tiles), adds and updates Nuclear14/Nyanotrasen/RMC14 structure and furniture entities (barrels, shelves, tires, magazine rack, cash registers), and deletes several legacy RMC14 flora entity files.

Changes

Cohort / File(s)	Change Summary
Magazine Tag Standardization Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml, .../Magazines/caseless_rifle.yml, .../Magazines/grenade.yml, .../Magazines/heavy_rifle.yml, .../Magazines/light_rifle.yml, .../Magazines/magnum.yml, .../Magazines/pistol.yml, .../Magazines/rifle.yml, .../Magazines/shotgun.yml, .../_Goobstation/.../high_caliber_magazine.yml, .../_Goobstation/.../light_rifles.yml, .../_Goobstation/.../magnum_caliber_magazine.yml, .../_NF/.../novalitec1clip.yml, Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/magnum.yml, Resources/Prototypes/tags.yml	Appended the generic tag "Magazine" to Tag components of many magazine entity prototypes and added the Magazine tag to tags.yml.
New Decals — Drought & Flora Resources/Prototypes/_Nuclear14/Decals/droughtdecals.yml, .../floradecals.yml, Resources/Prototypes/_RMC14/Decals/Flora/cacti.yml, .../grass.yml	Added abstract decal parents and many concrete flora/drought decal entries with sprite references and snapCardinals flags.
New Decals — Fullwhite & Graffiti Resources/Prototypes/_Nuclear14/Decals/fullwhite.yml, .../graffiti_markings.yml	Added N14FullTile/N14HalfTile decals and a large set of graffiti decals under new Scribbling abstract decal.
New Decals — Road & Curb Markings Resources/Prototypes/_Nuclear14/Decals/roadmarkings.yml	Added Road and Curb abstract decals and many concrete road/curb marking decal entries with sprite states.
Barrels & Junk Tires Resources/Prototypes/_Nuclear14/Entities/Structures/Decoration/barrels.yml, Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/junk.yml	Added extensive Nuclear14 barrel entities and five new junk tire entities with sprites, names, and descriptions.
Shelves, Registers, Magazine Rack, Barrel Fixture Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/shelf.yml, .../Storage/register.yml, .../Misc/magazinerack.yml, .../Storage/barrels.yml	Added many shelf/bookshelf entities (with sprites, fixtures, storage, destructible behavior), two cash register variants, new N14MagazineRack with storage and UI bindings, and adjusted a barrel fixture bound (0.45 → 0.35).
RMC14 Flora Deletions & Updates Resources/Prototypes/_RMC14/Entities/Objects/Misc/bushes.yml (deleted), .../Structures/Flora/Grass/desert_grass.yml (deleted), .../Structures/Flora/cactus.yml (deleted), Resources/Prototypes/_RMC14/Entities/flora.yml	Removed large legacy bush/grass/cactus files, removed several bush entities, updated bonsai names/descriptions and palm descriptions.
Tree Stump Spawn & New Alien Stump Resources/Prototypes/_RMC14/Entities/Structures/Flora/Trees/trees.yml	Redirected three SpawnEntitiesBehavior targets to new public stump IDs and added FloraAlienStump entity (sprite, name, description).

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~40 minutes

Suggested labels

Status: Needs Review

Suggested reviewers

• Remuchi
• OldDanceJacket
• DEATHB4DEFEAT
• VMSolidus

Pre-merge checks (3 passed)

✅ Passed checks (3 passed)

Check name	Status	Explanation
Title Check	✅ Passed	The title "Organise and Add Assets" concisely reflects the main work in the changeset—reorganising RMC14 assets and adding numerous N14 assets (decals, shelves, magazine rack, etc.)—and is relevant for a quick scan of PR history. It is short, clear, and avoids noise, so a reviewer can understand the primary intent without wading through file lists.
Description Check	✅ Passed	The PR description describes the reorganisation (decalising and removing duplicate RMC14 assets), the added N14 assets (bookshelves, shelves, cash register, decals, road markings) and the new magazine rack, and includes TODOs and media; this content matches the changes in the diff and is therefore on-topic. Given the lenient criteria, the description passes as it meaningfully relates to the changeset.
Docstring Coverage	✅ Passed	No functions found in the changes. Docstring coverage check skipped.

Poem

In the barracks of code the magazines align,
Decals march in drought, graffiti, and line.
Barrels and tires take their queued-up place,
Shelves stand rigid, neat geometry and grace.
New stumps and racks posted — Sol’s sloppiness corrected, by our ace.

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)

Check name	Status	Explanation
Docstring Coverage	✅ Passed	No functions found in the changes. Docstring coverage check skipped.
Title Check	✅ Passed	The title “Organise and Add Assets” accurately reflects the core work of the changeset, which is to reorganize existing RMC14 assets to eliminate duplication and to introduce new assets such as N14 bookshelves, decals, and a magazine rack, all in a concise, single sentence that a reviewer can immediately understand.
Description Check	✅ Passed	The pull request description clearly outlines the organization of duplicated RMC14 assets and the addition of new N14 assets such as shelves, bookshelves, a cash register, decals (including road markings), and a magazine rack, which directly corresponds to the changes in the YAML files; despite its informal tone and inclusion of media references and TODO markers, it remains on-topic and describes the actual scope of the changes.

✨ Finishing touches

• [ ] 📝 Generate docstrings

🧪 Generate unit tests (beta)

• [ ] Create PR with unit tests
• [ ] Post copyable unit tests in a comment

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[github-actions[bot]]

This pull request has conflicts, please resolve those before we can evaluate the pull request.

[astriloqua]

Failing test is TryStopNukeOpsFromConstantlyFailing, seems highly irrelevant.