]> git.smokeofanarchy.ru Git - space-station-14.git/commit
You can now see paper on crates (with color!) (#26834)
authorVerm <32827189+Vermidia@users.noreply.github.com>
Sun, 14 Apr 2024 03:39:02 +0000 (22:39 -0500)
committerGitHub <noreply@github.com>
Sun, 14 Apr 2024 03:39:02 +0000 (13:39 +1000)
commit96ad9002f1d6390bf666c74ddfd871a45a8fe1df
treedcbb674be17c765a609ba36f10a285f5163866ed
parentcb4561fe96adacac3283e9af138fff6eb349eb9f
You can now see paper on crates (with color!) (#26834)

* Implement changes on not-cooked branch

* Made it work

* Fix update appearance calls

* Fix extra indents, clean-up code, fix tests hopefully

* Fix hammy cagecrate

* Fix messing up the yml, add artifact crate specific labels back in

* Visual Studio hates yml, sad

* Seperate the colors for cargonia

* sorry json

* make label move with artifact door

* Apply suggestion changes

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Fix remaining crate offsets, add a few for livestock and graves (why are you labeling graves) and coffin label sprites (why are you labeling coffins??)

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
33 files changed:
Content.Server/Labels/Label/LabelSystem.cs
Content.Shared/Labels/Components/PaperLabelTypeComponent.cs [new file with mode: 0644]
Content.Shared/Labels/LabelEvents.cs
Resources/Prototypes/Entities/Objects/Misc/paper.yml
Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/bounty.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/captains_paper.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/invoice.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json
Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/paper.png [moved from Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/label_overlay.png with 100% similarity]
Resources/Textures/Structures/Storage/Crates/artifact.rsi/bounty.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/artifact.rsi/captains_paper.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/artifact.rsi/invoice.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/artifact.rsi/meta.json
Resources/Textures/Structures/Storage/Crates/artifact.rsi/paper.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/coffin.rsi/bounty.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/coffin.rsi/captains_paper.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/coffin.rsi/invoice.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/coffin.rsi/meta.json
Resources/Textures/Structures/Storage/Crates/coffin.rsi/paper.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/toybox.rsi/bounty.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/toybox.rsi/captains_paper.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/toybox.rsi/invoice.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/Crates/toybox.rsi/meta.json
Resources/Textures/Structures/Storage/Crates/toybox.rsi/paper.png [new file with mode: 0644]