From 96ad9002f1d6390bf666c74ddfd871a45a8fe1df Mon Sep 17 00:00:00 2001 From: Verm <32827189+Vermidia@users.noreply.github.com> Date: Sat, 13 Apr 2024 22:39:02 -0500 Subject: [PATCH] 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> --- Content.Server/Labels/Label/LabelSystem.cs | 17 +++-- .../Components/PaperLabelTypeComponent.cs | 16 ++++ Content.Shared/Labels/LabelEvents.cs | 4 +- .../Entities/Objects/Misc/paper.yml | 36 ++++++++- .../Objects/Specific/Medical/morgue.yml | 12 ++- .../Xenoarchaeology/artifact_equipment.yml | 21 ++++- .../Storage/Crates/base_structurecrates.yml | 18 +++++ .../Structures/Storage/Crates/crates.yml | 52 +++++++++++++ .../Medical/Morgue/bodybags.rsi/bounty.png | Bin 0 -> 591 bytes .../Morgue/bodybags.rsi/captains_paper.png | Bin 0 -> 592 bytes .../Medical/Morgue/bodybags.rsi/invoice.png | Bin 0 -> 588 bytes .../Medical/Morgue/bodybags.rsi/meta.json | 15 +++- .../{label_overlay.png => paper.png} | Bin .../Storage/Crates/artifact.rsi/bounty.png | Bin 0 -> 611 bytes .../Crates/artifact.rsi/captains_paper.png | Bin 0 -> 611 bytes .../Storage/Crates/artifact.rsi/invoice.png | Bin 0 -> 609 bytes .../Storage/Crates/artifact.rsi/meta.json | 72 ++++++++++-------- .../Storage/Crates/artifact.rsi/paper.png | Bin 0 -> 610 bytes .../Storage/Crates/coffin.rsi/bounty.png | Bin 0 -> 628 bytes .../Crates/coffin.rsi/captains_paper.png | Bin 0 -> 628 bytes .../Storage/Crates/coffin.rsi/invoice.png | Bin 0 -> 543 bytes .../Storage/Crates/coffin.rsi/meta.json | 14 +++- .../Storage/Crates/coffin.rsi/paper.png | Bin 0 -> 624 bytes .../Storage/Crates/labels.rsi/bounty.png | Bin 0 -> 593 bytes .../Crates/labels.rsi/captains_paper.png | Bin 0 -> 594 bytes .../Storage/Crates/labels.rsi/invoice.png | Bin 0 -> 592 bytes .../Storage/Crates/labels.rsi/meta.json | 23 ++++++ .../Storage/Crates/labels.rsi/paper.png | Bin 0 -> 592 bytes .../Storage/Crates/toybox.rsi/bounty.png | Bin 0 -> 602 bytes .../Crates/toybox.rsi/captains_paper.png | Bin 0 -> 601 bytes .../Storage/Crates/toybox.rsi/invoice.png | Bin 0 -> 599 bytes .../Storage/Crates/toybox.rsi/meta.json | 38 +++++---- .../Storage/Crates/toybox.rsi/paper.png | Bin 0 -> 599 bytes 33 files changed, 276 insertions(+), 62 deletions(-) create mode 100644 Content.Shared/Labels/Components/PaperLabelTypeComponent.cs create mode 100644 Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/bounty.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/captains_paper.png create mode 100644 Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/invoice.png rename Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/{label_overlay.png => paper.png} (100%) create mode 100644 Resources/Textures/Structures/Storage/Crates/artifact.rsi/bounty.png create mode 100644 Resources/Textures/Structures/Storage/Crates/artifact.rsi/captains_paper.png create mode 100644 Resources/Textures/Structures/Storage/Crates/artifact.rsi/invoice.png create mode 100644 Resources/Textures/Structures/Storage/Crates/artifact.rsi/paper.png create mode 100644 Resources/Textures/Structures/Storage/Crates/coffin.rsi/bounty.png create mode 100644 Resources/Textures/Structures/Storage/Crates/coffin.rsi/captains_paper.png create mode 100644 Resources/Textures/Structures/Storage/Crates/coffin.rsi/invoice.png create mode 100644 Resources/Textures/Structures/Storage/Crates/coffin.rsi/paper.png create mode 100644 Resources/Textures/Structures/Storage/Crates/labels.rsi/bounty.png create mode 100644 Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png create mode 100644 Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png create mode 100644 Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json create mode 100644 Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png create mode 100644 Resources/Textures/Structures/Storage/Crates/toybox.rsi/bounty.png create mode 100644 Resources/Textures/Structures/Storage/Crates/toybox.rsi/captains_paper.png create mode 100644 Resources/Textures/Structures/Storage/Crates/toybox.rsi/invoice.png create mode 100644 Resources/Textures/Structures/Storage/Crates/toybox.rsi/paper.png diff --git a/Content.Server/Labels/Label/LabelSystem.cs b/Content.Server/Labels/Label/LabelSystem.cs index 59a1a3b213..dd4ba1f718 100644 --- a/Content.Server/Labels/Label/LabelSystem.cs +++ b/Content.Server/Labels/Label/LabelSystem.cs @@ -84,10 +84,7 @@ namespace Content.Server.Labels { _itemSlotsSystem.AddItemSlot(uid, ContainerName, component.LabelSlot); - if (!EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance)) - return; - - _appearance.SetData(uid, PaperLabelVisuals.HasLabel, false, appearance); + UpdateAppearance((uid, component)); } private void OnComponentRemove(EntityUid uid, PaperLabelComponent component, ComponentRemove args) @@ -131,10 +128,18 @@ namespace Content.Server.Labels if (args.Container.ID != label.LabelSlot.ID) return; - if (!EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance)) + UpdateAppearance((uid, label)); + } + + private void UpdateAppearance(Entity ent) + { + if (!Resolve(ent, ref ent.Comp2, false)) return; - _appearance.SetData(uid, PaperLabelVisuals.HasLabel, label.LabelSlot.HasItem, appearance); + var slot = ent.Comp1.LabelSlot; + _appearance.SetData(ent, PaperLabelVisuals.HasLabel, slot.HasItem, ent.Comp2); + if (TryComp(slot.Item, out var type)) + _appearance.SetData(ent, PaperLabelVisuals.LabelType, type.PaperType, ent.Comp2); } } } diff --git a/Content.Shared/Labels/Components/PaperLabelTypeComponent.cs b/Content.Shared/Labels/Components/PaperLabelTypeComponent.cs new file mode 100644 index 0000000000..b045a6af3b --- /dev/null +++ b/Content.Shared/Labels/Components/PaperLabelTypeComponent.cs @@ -0,0 +1,16 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Labels.Components; + +/// +/// Specifies the paper type (see textures/storage/crates/labels.rsi to see currently supported paper types) to show on crates this label is attached to. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class PaperLabelTypeComponent : Component +{ + /// + /// The type of label to show. + /// + [DataField] + public string PaperType = "Paper"; +} diff --git a/Content.Shared/Labels/LabelEvents.cs b/Content.Shared/Labels/LabelEvents.cs index 362500b768..9f00354af2 100644 --- a/Content.Shared/Labels/LabelEvents.cs +++ b/Content.Shared/Labels/LabelEvents.cs @@ -13,9 +13,11 @@ namespace Content.Shared.Labels } [Serializable, NetSerializable] - public enum PaperLabelVisuals + public enum PaperLabelVisuals : byte { + Layer, HasLabel, + LabelType } /// diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 58457ebb7f..c6cc598f26 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -15,6 +15,7 @@ map: ["enum.PaperVisualLayers.Stamp"] visible: false - type: Paper + - type: PaperLabelType - type: ActivatableUI key: enum.PaperUiKey.Key closeOnHandDeselect: false @@ -143,6 +144,8 @@ - state: paper_stamp-generic map: ["enum.PaperVisualLayers.Stamp"] visible: false + - type: PaperLabelType + paperType: CaptainsPaper - type: PaperVisuals headerImagePath: "/Textures/Interface/Paper/paper_heading_captains_thoughts.svg.96dpi.png" backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png" @@ -160,19 +163,21 @@ sprite: Objects/Misc/bureaucracy.rsi layers: - state: paper - color: "#f7e574" + color: "#9ef5ff" - state: paper_words map: ["enum.PaperVisualLayers.Writing"] - color: "#f7e574" + color: "#9ef5ff" visible: false - state: paper_stamp-generic map: ["enum.PaperVisualLayers.Stamp"] visible: false + - type: PaperLabelType + paperType: Invoice - type: PaperVisuals backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png" contentImagePath: "/Textures/Interface/Paper/paper_content_lined.svg.96dpi.png" - backgroundModulate: "#f7e574" - contentImageModulate: "#f7e574" + backgroundModulate: "#9ef5ff" + contentImageModulate: "#9ef5ff" backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0 contentMargin: 16.0, 16.0, 16.0, 16.0 headerImagePath: "/Textures/Interface/Paper/paper_heading_cargo_invoice.svg.96dpi.png" @@ -184,6 +189,29 @@ name: bounty manifest description: A paper label designating a crate as containing a bounty. Selling a crate with this label will fulfill the bounty. components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: paper + color: "#f7e574" + - state: paper_words + map: ["enum.PaperVisualLayers.Writing"] + color: "#f7e574" + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: PaperLabelType + paperType: Bounty + - type: PaperVisuals + backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png" + contentImagePath: "/Textures/Interface/Paper/paper_content_lined.svg.96dpi.png" + backgroundModulate: "#f7e574" + contentImageModulate: "#f7e574" + backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0 + contentMargin: 16.0, 16.0, 16.0, 16.0 + headerImagePath: "/Textures/Interface/Paper/paper_heading_cargo_invoice.svg.96dpi.png" + headerMargin: 0.0, 12.0, 0.0, 0.0 - type: CargoBountyLabel - type: StaticPrice price: 0 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml index 2c48ef5da0..0656621465 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml @@ -17,8 +17,8 @@ visible: false - state: open_overlay map: ["enum.StorageVisualLayers.Door"] - - state: label_overlay - map: ["enum.BodyBagVisualLayers.Label"] + - state: paper + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Objects/Specific/Medical/Morgue/bodybags.rsi state: bag @@ -62,9 +62,15 @@ - type: GenericVisualizer visuals: enum.PaperLabelVisuals.HasLabel: - enum.BodyBagVisualLayers.Label: + enum.PaperLabelVisuals.Layer: True: {visible: true} False: {visible: false} + enum.PaperLabelVisuals.LabelType: + enum.PaperLabelVisuals.Layer: + Paper: { state: paper } + Bounty: { state: bounty } + CaptainsPaper: { state: captains_paper } + Invoice: { state: invoice } enum.FoldedVisuals.State: foldedLayer: True: {visible: true} diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml index 4abeea3812..c38868b399 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: CrateArtifactContainer parent: BaseStructureDynamic name: artifact container @@ -24,6 +24,8 @@ - state: locked map: ["enum.LockVisualLayers.Lock"] shader: unshaded + - state: paper + map: ["enum.PaperLabelVisuals.Layer"] - type: InteractionOutline - type: Physics - type: Fixtures @@ -73,6 +75,23 @@ - type: EntityStorageVisuals stateDoorOpen: artifact_container_open stateDoorClosed: artifact_container_door + - type: GenericVisualizer + visuals: + enum.PaperLabelVisuals.HasLabel: + enum.PaperLabelVisuals.Layer: + True: { visible: true } + False: { visible: false } + enum.PaperLabelVisuals.LabelType: + enum.PaperLabelVisuals.Layer: + Paper: { state: paper } + Bounty: { state: bounty } + CaptainsPaper: { state: captains_paper } + Invoice: { state: invoice } + enum.StorageVisuals.Open: + enum.PaperLabelVisuals.Layer: + True: { offset: "0.0,0.3125" } + False: { offset: "0.0,0.0" } + - type: LockVisuals - type: ItemSlots - type: ContainerContainer diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml index 403e20b43c..95580292d9 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml @@ -21,6 +21,9 @@ - state: welded visible: false map: ["enum.WeldableLayers.BaseWelded"] + - state: paper + sprite: Structures/Storage/Crates/labels.rsi + map: ["enum.PaperLabelVisuals.Layer"] - type: InteractionOutline - type: Physics - type: Fixtures @@ -55,6 +58,18 @@ - type: EntityStorageVisuals stateDoorOpen: open stateDoorClosed: closed + - type: GenericVisualizer + visuals: + enum.PaperLabelVisuals.HasLabel: + enum.PaperLabelVisuals.Layer: + True: { visible: true } + False: { visible: false } + enum.PaperLabelVisuals.LabelType: + enum.PaperLabelVisuals.Layer: + Paper: { state: paper } + Bounty: { state: bounty } + CaptainsPaper: { state: captains_paper } + Invoice: { state: invoice } - type: PaperLabel labelSlot: insertVerbText: Attach Label @@ -106,6 +121,9 @@ - state: locked map: ["enum.LockVisualLayers.Lock"] shader: unshaded + - state: paper + sprite: Structures/Storage/Crates/labels.rsi + map: ["enum.PaperLabelVisuals.Layer"] - type: Damageable damageContainer: StructuralInorganic damageModifierSet: StructuralMetallic diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index e55612d2c4..8d8eec9538 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -138,6 +138,9 @@ map: ["enum.StorageVisualLayers.Base"] - state: closed map: ["enum.StorageVisualLayers.Door"] + - state: paper + sprite: Structures/Storage/Crates/labels.rsi + map: ["enum.PaperLabelVisuals.Layer"] - type: Construction graph: WebStructures node: crate @@ -320,6 +323,10 @@ - state: base - state: closed map: ["enum.StorageVisualLayers.Door"] + - state: paper + sprite: Structures/Storage/Crates/labels.rsi + offset: "-0.25,0.625" + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/livestock.rsi state: base @@ -371,6 +378,10 @@ - state: base - state: closed map: ["enum.StorageVisualLayers.Door"] + - state: paper + sprite: Structures/Storage/Crates/labels.rsi + offset: "0.0,0.125" + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/cage.rsi - type: Destructible @@ -424,6 +435,10 @@ - state: welded visible: false map: ["enum.WeldableLayers.BaseWelded"] + - state: paper + sprite: Structures/Storage/Crates/labels.rsi + offset: "0.0,-0.09375" + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/piratechest.rsi state: crate_icon @@ -449,6 +464,8 @@ - state: welded visible: false map: ["enum.WeldableLayers.BaseWelded"] + - state: paper + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/toybox.rsi state: crate_icon @@ -465,6 +482,8 @@ - state: base - state: closed map: ["enum.StorageVisualLayers.Door"] + - state: paper + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/coffin.rsi state: base @@ -503,6 +522,10 @@ - state: base - state: closed map: ["enum.StorageVisualLayers.Door"] + - state: paper + sprite: Structures/Storage/Crates/labels.rsi + offset: "-0.28125,0.625" + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/wooden_grave.rsi state: base @@ -547,6 +570,10 @@ - state: base - state: closed map: ["enum.StorageVisualLayers.Door"] + - state: paper + sprite: Structures/Storage/Crates/labels.rsi + offset: "-0.3125,0.5625" + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/stone_grave.rsi state: base @@ -571,6 +598,17 @@ sprite: Structures/Storage/Crates/trashcart.rsi - type: Sprite sprite: Structures/Storage/Crates/trashcart.rsi + layers: + - state: base + - state: closed + map: ["enum.StorageVisualLayers.Door"] + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] + - state: paper + sprite: Structures/Storage/Crates/labels.rsi + offset: "0.0,0.03125" + map: ["enum.PaperLabelVisuals.Layer"] - type: entity parent: CrateBaseSecure @@ -581,6 +619,20 @@ sprite: Structures/Storage/Crates/trashcart_jani.rsi - type: Sprite sprite: Structures/Storage/Crates/trashcart_jani.rsi + layers: + - state: base + - state: closed + map: ["enum.StorageVisualLayers.Door"] + - state: welded + visible: false + map: ["enum.WeldableLayers.BaseWelded"] + - state: locked + map: ["enum.LockVisualLayers.Lock"] + shader: unshaded + - state: paper + sprite: Structures/Storage/Crates/labels.rsi + offset: "0.0,0.03125" + map: ["enum.PaperLabelVisuals.Layer"] - type: AccessReader access: [["Janitor"]] diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/bounty.png b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/bounty.png new file mode 100644 index 0000000000000000000000000000000000000000..5db87e6182595ee03f45125e6b6521a22cdf0f79 GIT binary patch literal 591 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFy>`CI|pPYCo?c;Oe~#f>wP#t zq)k41=_7X05`n@O3mz>{;CiGXS`yeEb#Rrp(B&|X+Y^>_?BLSlYifS+==uZu3!w#} z0xYfqg(csz1v{V5a_Zh}YGSHB9`D;=^o>;CFpv%-C@H|%nI7bWQeFLy{+-F2yWBG6zN+e`)z$fB zO@EUYBjh8f-sU$kRL6#G=`+>Mul6mpzpumkQR36K$m4?UZEGsnU39&|gR`Pag5|nP zr~dwLbN9=Mf(v_9`FPLo`+tvnV(gEbAOF5jzW?8{@t69JGt>XFp3Hm`{AKQ@YsDNF zeJ%EDW&e_k$#HzXc&+8F`62q&Q~VC!mfW&z!C$di)0)9k@tYwPfOIU<7a$ctjR6FmMZjFyp1Wb$@_@?Vc`i^yOBy4Z*EGRYMG??(zpxJTSY7MS`@AFI9E-UQG z%46tiUh$HHXFluC761D=uDEPWKKko5&+Bb>mUwC;n2J2%ND;qqswk`N$%;s4a~6iD XrHY?2A1~PobP|K7tDnm{r-UW|jT`{3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/captains_paper.png b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/captains_paper.png new file mode 100644 index 0000000000000000000000000000000000000000..87ee739fa2f386afe0199fe005b60265f4765b9b GIT binary patch literal 592 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFy>`CI|pPYCo?c;Oe~#f>wP#t zq)k41=_7X05`n@O3mz>{;CiGXS`yeEb#Rrp(B&|X+Y^>_?BLSlYifS+==uZu3!w#} z0xYfqg(csz1v{V5a_Zh}YGSHB9`D;=^o>;CFpv%-C@H|%nI7bWQeFLy{+-F2yWBG6zN+e`)z$fB zO@EUYBjh8f-sU$kRL6#G=`+>Mul6mpzpumkQR36K$m4?UZEGsnU39&|gR`Pag5|nP zr~dwLbN9=Mf(v_9`FPLo`+tvnV(gEbAOF5jzW?8{@t69JGt>XFp3Hm`{AKQ@YsDNF zeJ%EDW&e_k$#HzXc&+8F`62q&Q~VC!mfW&z!C$di)0)9k@tYwPfOIU<7a$ctjR6FmMZjFyp1Wb$@_@9iA?ZArbD$2@~C&W5vpI#|BX>l6wT>%D$ Y_q@t7;w68Yfo@{(boFyt=akR{07w`9FaQ7m literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/invoice.png b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/invoice.png new file mode 100644 index 0000000000000000000000000000000000000000..508a6b12e6fd32e0787c34c579cbdbfed8e7710a GIT binary patch literal 588 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFy>@BI|pPYCo?c;Oe~$a+xu{U z$g%p`A7L^j0);OEjxJ;k6mVa;z`JyXXpL^}FQHi`Dw;~`n!1}GDD3(n^@qPiG)9!g zQP4$ZZmn+6qn*70g4Ku5{``3Nx2)g32K%@xCDs;vyBzPa5{n~SQ`K#QJudC|c-@iKTN$wSA78{%}b?LV*3&pa()+&_X0mJDUiZ87$*!r%95#nq13yn!S-z3~;`Z#Q9}HIJ z58iBAwzT|Vjc}FRnJH6Oc`@Gn7sD6lzc86`SKflslc!%jpEJ4IW8G=}U2S`7B_{ly zd-}fmr3{((X>W~z!OvOX5n0T@z%2yAjF;}#{Q(NLdAc};M7Sp>NU$zeG>~G#Mkw2| zNF*|DsQdfte^gWy&#PCjdUD0{{<-tb&|)s#VKs|I;zZGmg9@jQhKBq<{>7K^vcjCr zOp5-w>pn{2T+&(zn6arHt4cZJ;zVbg-GP2A5)&r)Py(3+w& V>*v?#e?S*8c)I$ztaD0e0stvb{~!PW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json index b6feb49959..e872787314 100644 --- a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/39659000f380583c35fb814ee2fadab24c2f8076", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/39659000f380583c35fb814ee2fadab24c2f8076, additional label sprites by Vermidia", "size": { "x": 32, "y": 32 @@ -14,10 +14,19 @@ "name": "bag_folded" }, { - "name": "label_overlay" + "name": "paper" }, { "name": "open_overlay" + }, + { + "name": "bounty" + }, + { + "name": "captains_paper" + }, + { + "name": "invoice" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/label_overlay.png b/Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/paper.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/label_overlay.png rename to Resources/Textures/Objects/Specific/Medical/Morgue/bodybags.rsi/paper.png diff --git a/Resources/Textures/Structures/Storage/Crates/artifact.rsi/bounty.png b/Resources/Textures/Structures/Storage/Crates/artifact.rsi/bounty.png new file mode 100644 index 0000000000000000000000000000000000000000..ee32a8211eadb9763915d84d1c0b3ed7650c632e GIT binary patch literal 611 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFy>}DI|pPYCo?c;Oe~#f>wP#t zq-}oK(nVAGtU9bx0ty2JSYK+0zFEY#wJF|PdUlvcmPe3F46As1Q}c^Q*B{tl2rUQ| zU~v^FEcuo#*!kS7wd)11`SXW+zuV5))A*rfWpv(OjR@ECo~pvP-rU(ER=I4RThfu2 zXI`wcwX~i0?Ecq6Z;z|98Lz(nUtPcM+0r?yomT`_xNMj8k64zNbak_6KIitAt!E~E zXe`*T%*++9Wh?z*@}rsq`CW5MvUm=yT0ZUn!JG1H#AUp9`0u!F`OkrA7 zR{I;hm>?C;1rwJZF;bIb4(gtC^ZverUHM(2A76ah7I|3EeO^<=Z&zK<>vKY!zs#{w z%hvjSzjD{H4*?f!XEn6B->-k$c*3k^YVH5e7ryWBTkwwYT({}}t|ub(;(KE*@A|H| zjd8iSsqSv(^w}5c^3&(|xUQNkYsOPy**MKIV{hBCR)y8CERUB@h?^c?!n(Wqg7)|1 z?)&z)Gt^zPq%DEr&spFRS7SR4}TUca+0 txX|p>7{?&T^u_DzmrplV*t)bcFxcHu_|s8w`CI|pPYCo?c;Oe~$a+uNy7 zfXZ1$Y?T=-xYa>1w z%Y~PeYHpHPn*GPdYw3~Z^KY*1U6;(G61|qGoyxjWou}-tFO;K?bUN?f5Le!^c^9jwQU1`*mG zhIWP%PS)1q8}_b`vs*s>FHZscftr6`UMjO?W?KHTZkXOa-O(pzl4E3KZh{lTlc&4O v^BZgVxLB(gD?~16U%h-fdGR*^Stf?(`D*HOXT(|poyp+o>gTe~DWM4fqHGLF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Crates/artifact.rsi/invoice.png b/Resources/Textures/Structures/Storage/Crates/artifact.rsi/invoice.png new file mode 100644 index 0000000000000000000000000000000000000000..ed4951d12a88e44ca8c368c6bf35eba85934abf7 GIT binary patch literal 609 zcmV-n0-pVeP)$TonXC5kwrFeJxVrxs6Z}d&AB7@!k6!PQHLYUet6uI1akuSc$1vXntWa)bv7- z78(f?Nolq@Jv*7C?)tpLr|NA~^{RjG-_@4M+8X$pg-12ha)f0X;;W9ScuTljE2J{Q zhr$s{1{A(hdfMY>#d(k46Cy z_hFM@iWni%lv$yOLsY6Enf>n@s`_RqiAR&S$r_e8@)X1y5w$E`vr==SXXPofrgHzA zr=1%a_PV#npyA1N-}<3x2P)gH`*q~Hm177z!i7=umn5gL57D=4TKE7uH{k5Drloh` zd=q*e%#@X?N&(saTn=7Op<@BMZlHC^%j)NxlY2<6%P+cyy?q#v`<=_*C(>vf?`G{Y z00009a7bBm000XU000XU0RWnu7ytkOn@L1LR9Hu2U>F6XAut*OqaiRF0;3@?8Umvs zFd71*AuzxpzzDM6yQK0zHg|08X$Q;G60pDwcgf5}v1iZp$+WZ=ZZ;FLEl;jpVfg;} z6ByGAz(W9Jp|+DN*xrvXp3}>I2Dk%YK7af85reR-9Q_@@$;-#UFCobwp{hPGApr97 vi`zHBJ_m&Yy#PE4=#}c}<*`wFhzYwC#xznPqA@R!M2G`s*-v!^@L#)&povRYnvO4yUnm6hf^=9f5Ag_Vfp zQ8{Digb5PBO@cC;C;zwT)t2Tt2G*P;&sU;$C^&V#{~?=VCWwD*BiTP-gEv0(QWxfcW`(FlTz>6_ya6BXdX~6 z!@vLl010qNS#tmY3ljhU3ljkVnw%H_005dvL_t(oN9~d^4uBvK1W#j)tv0m0gy(3_ z3+VM}+R)Nqs~^xnBGJUc#8)q2DFS&Vkd8JJAOzXC#!>b+yDRo07*qoM6N<$f=RO&9RL6T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Crates/coffin.rsi/bounty.png b/Resources/Textures/Structures/Storage/Crates/coffin.rsi/bounty.png new file mode 100644 index 0000000000000000000000000000000000000000..54a2f0fbd031b013bf88329a94513fd52bef8db0 GIT binary patch literal 628 zcmV-)0*n2LP)@BO)2SJJKy4b8%%y6qH%Wg4c}3bx`c;VwO= ztq30q4>~fS@Rib26@FHnt?;{IClQ|jpXwRT)^Vzi^_*i04+uw0qo`NsQC|{FTk~^L zdt~?G5@(7SVNw)X#h^e`swJ8I?HellX32|3m$yv`M;uvl;vE#VC|%Q1Goq*EF(|3r zf9L6DMuschgE44&^1Qb`2<*W3wvdEWOiG(N(GRrBX1r?C&ww`*GD074sZc3IO> zyKue<-4C|rXl1EUwl9-`*HdUqLgx*%ELF0qo^x^!iFNr!*RZz_{c=CF`~%a7XZ4!| zJTw3R010qNS#tmY3labT3lag+-G2N40068>L_t(oM`K_Z1*0J_8UmvsFd71*Auzxp zz(|Sxm6erPwYRso6KyOD(JFB$%*)M1k(o4kGD$`(Ms-n@B};nAZ<3?Rpl3Mftk3l}bg+qr-Lep2lpRX-X6qaiRF z0;3_oKv8?3G}rt;wlM6Te3EE$DXt5$lZ;T@Fm>KJlH!$O2aswZy6XT6h$mln8jWKB O0000@BO)2SJJKy4b8%%y6qH%Wg4c}3bx`c;VwO= ztq30q4>~fS@Rib26@FHnt?;{IClQ|jpXwRT)^Vzi^_*i04+uw0qo`NsQC|{FTk~^L zdt~?G5@(7SVNw)X#h^e`swJ8I?HellX32|3m$yv`M;uvl;vE#VC|%Q1Goq*EF(|3r zf9L6DMuschgE44&^1Qb`2<*W3wvdEWOiG(N(GRrBX1r?C&ww`*GD074sZc3IO> zyKue<-4C|rXl1EUwl9-`*HdUqLgx*%ELF0qo^x^!iFNr!*RZz_{c=CF`~%a7XZ4!| zJTw3R010qNS#tmY3labT3lag+-G2N40068>L_t(oM`K_Z1*0J_8UmvsFd71*Auzxp zz(|Sxm6erPwYRso6KyOD(JFB$%*)M1k(o4kGD$`(Ms-n@B};nAZ<3?Rpl3Mftk3l}bg+qr-Lep2lpRX-X6qaiRF z0;3_oKv8=jH@EyhwlJJLxszyfDXt5Wld@3UFn8WGlH!$O2aswZy6XT3I43WP{L)$g O0000`CI|pPYCo?c;Oe~#f>wP#t zq)k41>7uJjRvi{4D;^~{iW~{lda;OaYg6cSlW)!*mnLlSC=`v6VPU^`bp65l1*;#d zQsC%Pc=Y1UbtR$mx!k&o%lyy=d!%3?zx4o|Ns8)&ZzK9>-c!j9$LKXtw>9%)UxYb+aBpY)U#c_ zmP4M4-^ysghpCr>MeD-mto^V%NnLP0!~9p0=dKm5>iaq;nTwyp-DmNN@aKW?LO#)- zi-W3DzCRL5?~+Ii5{W#zz#(Ln>de1yrL}&io$Pj>zTKD8T_&>Vk*vs8jo8aU#*3Ce zHPl#nr~diNG`BYGyUm6fRiE~3x8rzo;QO}cwX&7>z8jj@9cm5z{9JYUM*fT2v!k9c zI7t_jMP3ftU9gYyF8{V?8L2A+x9LxAydIq4?ev^?i%#gKRr89A_&ZB~x?bO~o&Rr< z{gyw>mpjtG&StSO0Y(64fk$L90|U1Z2s2)~TlWVj81Cuf7!u*0oFKuvSkXX=2_JDl z@qkC?-+QW4|8IPG|JG%{Ejx9lSTHQPu4*iPw8QqY`s5UqqkIZiol34VGR#=a@gex4 RG!xJY22WQ%mvv4FO#tn?=&S$$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Crates/coffin.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/coffin.rsi/meta.json index 610ea0183c..7908408cd3 100644 --- a/Resources/Textures/Structures/Storage/Crates/coffin.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/Crates/coffin.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/32c8d0abc573d7370eb145d8ce74176d59b7eea3", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/32c8d0abc573d7370eb145d8ce74176d59b7eea3. Label sprites by Vermidia.", "size": { "x": 32, "y": 32 @@ -15,6 +15,18 @@ }, { "name": "closed" + }, + { + "name": "paper" + }, + { + "name": "bounty" + }, + { + "name": "captains_paper" + }, + { + "name": "invoice" } ] } diff --git a/Resources/Textures/Structures/Storage/Crates/coffin.rsi/paper.png b/Resources/Textures/Structures/Storage/Crates/coffin.rsi/paper.png new file mode 100644 index 0000000000000000000000000000000000000000..630ffe8e10c5660e4cd916d22ec52e2e1396b6ce GIT binary patch literal 624 zcmV-$0+0QPP)@BO)2SJJKy4b8%%y6qH%Wg4c}3bx`c;VwO= ztq30q4>~fS@Rib26@FHnt?;{IClQ|jpXwRT)^Vzi^_*i04+uw0qo`NsQC|{FTk~^L zdt~?G5@(7SVNw)X#h^e`swJ8I?HellX32|3m$yv`M;uvl;vE#VC|%Q1Goq*EF(|3r zf9L6DMuschgE44&^1Qb`2<*W3wvdEWOiG(N(GRrBX1r?C&ww`*GD074sZc3IO> zyKue<-4C|rXl1EUwl9-`*HdUqLgx*%ELF0qo^x^!iFNr!*RZz_{c=CF`~%a7XZ4!| zJTw3R010qNS#tmY3labT3lag+-G2N4005{-L_t(oM`K_Z1*0J_8UmvsFd71*Auzxp zz(|Sxm6erPwYRso6KyOD(JFB$%*)M1k(o4kGD$`(Ms-n@B};nAZ<3?Rpl3Mftk3l}bg+qr-Lep2lpRX-X6qaiRF z0;3_oKxup6KejLgwg-qdm*To0K0Y4B4aju^F%e9$14y+H-BADx?}DI|pPYCo?c;Oe~$a+xu{U z$g%ouT}RpZtU4@G0ty2JSPQ3c?Fwn%*0f%=*H_!bP(?Q=hE=@1srkjD><{)ALJL9# zSX>1POTKOO=zMPG)O|%d?_B@;d+!TAu{v#>lUUh1IpJodxt;J;F|p}eo`p+wUhw2k zy!&C!%_Aj~>aSn7S_Hg$Se4;@NnVhLq@zCd-p7^aNlwI#H-bZ z+z&age1{*LdT&?N#}>`{A+k5*>My>9 z$=v7GuZqgz*W0%6_r;5`dzD&K+kJ%Zom)^VXqCS()$+uv?{hA*d*q$c-_`h+Sz^L( zS#A5v^U}Z0kt|{dhCgS4M`SSr1Gf+eGhVt|_XjB0<>}%W65*blAi=s=(Ljm`lepyE zFj0&#U{>}&`Pn<~PWDf_aomZUz2VFmKO-l@s#kl8Bi1G@n#ycf_wQuE(__+X0=@hf z&M^Mj^M>bK*{6ivA1#~G_!uIqUca+$JMM39+#u7;eL;s;C$d&F@A<*x{tVH}i=Xi| a3otMkhseK|y4D9uJPe+$elF{r5}E*^Ed)RS literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/captains_paper.png new file mode 100644 index 0000000000000000000000000000000000000000..961991bf349e71e7be007ec83fd2f148c114ee44 GIT binary patch literal 594 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFy>`CI|pPYCo?c;Oe~$a+xu{U z$g%ouQ^n*ht~k1=GZOb{>4(2gk0Op7eQf`kV_Cyl z9RpYd-P7Z{r&O#H)e6erVQIgwdjH{*;vam)dlm`LXjt^}*2jpD+5Wm22h*8aIE?-B zZxyVWc_d^~{q^IzzN_x>tc?4AKYK^ibmKloU&V)phd0G0&TM-bdOc{5=AFzZmroyJ zKO`8yX>FLjQ{I=_>SpKnFn7{rv>50idyB1TQjz6TL#Ihs*&MB^8KWX~YHGIQvcIKk} z$uGJ6xia(<^<8BY?BOBeIx*fm;ZK886+f`vVm0@^o(XuIxk0G+^`#asX<^J-94KmH#7j$^nL~WJGdwy{-d#32+#n1Sf a1sE8DJ>+}#MKgm^4}+(xpUXO@geCwUuKQj9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/invoice.png new file mode 100644 index 0000000000000000000000000000000000000000..3e00e7d806875df92f79b001cda052714c5c7e6b GIT binary patch literal 592 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFy>@BI|pPYCo?c;Oe~$a+xu{U z$g%p`A7L^j0);OEjxJ;k6mVa;z`JyXXpL^}FQHi`Dw;~`n!1}GDD3(n^@qPiG)9!g zQP4$ZZmn+6qn*70g4Ku5{``3Nx2)g32K%@xCDs;vyBzPa5{n~SQ`K#QJudC|c-@iKTN$wSA78{%}b?LV*3&pa()+&_X0mJDUiZ87$*!r%95#nq13yn!S-z3~;`Z#Q9}HIJ z58iBAwzT|Vjc}FRnJH6Oc`@Gn7sD6lzc86`SKflslc!%jpEJ4IW8G=}U2S`7B_{ly zd-}fmr3{((X>W~z!OvOX5n0T@z%2yAjF;}#{Q(MgdAc};M7Sp>NU$zeG>~G#BrZ8O zOcY~$5F7MUe)i7j>RX0yk{7lzJEZMOdA3MmZ~Cv4HDQJqPch!NuTQEdddtP!ag06V z8G~P(9b2w?_=dYbWE_pz8+2+5f2$q7eY{`7q3-difnJ%0F3wu43?X^>bP0l+XkKUX}z- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json new file mode 100644 index 0000000000..c180604984 --- /dev/null +++ b/Resources/Textures/Structures/Storage/Crates/labels.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by Vermidia.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "paper" + }, + { + "name": "bounty" + }, + { + "name": "captains_paper" + }, + { + "name": "invoice" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png b/Resources/Textures/Structures/Storage/Crates/labels.rsi/paper.png new file mode 100644 index 0000000000000000000000000000000000000000..8daf7770832d0af33409e26f65458e3e2e460cc3 GIT binary patch literal 592 zcmV-W0bXYSJSo*O#$I?-LxEGnTGhfV=CSj?$LAF zs_>!kuq6WuUnxE1@w4Kr$M1@*WMT?@s%JR+hf{x8&sm1>kZ`||FX_MYs4wYA7v|@r zhGh3)lORTvFeyr`k;h>~YC$rq?;EZ9W+{qCm$yk7OB`8p;vE*XBwf=|Goq*E$x~Lj z|IgFTj77Ze9Z_g`a^1H9Xx)MDitBzIx$gHd_#fe-Q1cfhr-={ID>beE0D_xvc3IO> zyKue*y$_~lX;sND+n33}>nU_DLiY`{Eqhu0o^x^!$qo5M*RZz_gK|H(@&hv6Xdzn4 zS_1$8010qNS#tmY3labT3lag+-G2N4004+dL_t(oN9~fa5r7~N1YgG(tD+ptseoK6 zpc0CZgp>}X0i8E+#u3dv(Yu7~ZfAKS1O{LL24DaNU;qYS00#bUppy__t=(F^&biy( zAOXOglQEa-+56^HF9opHN=r(_?_0zGMx{t=eQdu$hyn0u&Y4On#4t}0yMYkGxfx@W e`f2ojz`zd3&mUFfM5z4$0000`CI|pPYCo?c;Oe~$a+xu{U z$g%ouT}RpZtU9bjY91_5;CiGX`X)#=i#6U`>T;Mzl1J2%9b9^Rtn3$$UVl)(VD*Dl z3LISuk6ygV7VLaJ%c=VXule)iXNZ^ za-Q$^IV)$L6#2idKRPR9uVl#HfBU~b&x$d#kAEy<}o_Bd# zD}M`njAX!%pqDQj=8L2=*9E^>Hc40@$ae8fEx+)M^NMvJ);*Lvt@Gk(<(26slHcC+ zT;aPJTcOe^tn4+5Nqfc<$thXhY4yL`>S`{p>2jaG-B~bPCbH;}tiV= z#%r;6MaD~6i`y;Vs@;pX%4_OaPdRzuG^fdV=hvntI&6_s&s*+mzOw7jBJCS@o9%Yq z-}Hr7>PLoHU4Ek|FakIWJR*x37`TN&n2}-D90{P{Bu^K|kO=qW1PRu~iUv|ln8YRL zhKXW~0kg9I$p;bd?SRlivzxSN^Ii>tJ3p{w9nw~HrEn!FLcUcRm0>)XE k4B?BEB~%u3y^v*M5UP;%KNz!b3ea^7p00i_>zopr0IqQYi~s-t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Crates/toybox.rsi/captains_paper.png b/Resources/Textures/Structures/Storage/Crates/toybox.rsi/captains_paper.png new file mode 100644 index 0000000000000000000000000000000000000000..4fd4bf0503f6036fa0b747890cded0b7dcc894bd GIT binary patch literal 601 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFy>`CI|pPYCo?c;Oe~$a+xu{U z$g%ouQ^n*ht~k1=GZOb{>4(2gk0Op7eQf`kV_Cyl z9RpYd-P7Z{r&O#H)e6erVQIgwdjH{*;vam)dlm`LXjt^}*2jpD+5Wm22h*8aIE?-B zZxyVWc_d^~{q^IzzN_x>tc?4AKYK^ibmKloU&V)phd0G0&TM-bdOc{5=AFzZmroyJ zKO`8yX>FLjQ{I=_>SpKnFn7{rv>50idyB1TQjz6TL#Ihs*&MB^8KWX~YHGIQvcIKk} z$uGJ6xia(<^<8BY?BOBeIx*fm;}a85w5HkpK!#^mK6yiEvL&kYHV`XduOeNnCPn zm?*|LVRrOC`Pn-stCuI;IPS#F-f+gp@062a)w?~J5o?ncO=Wg?R`>7I%!kL$u1=5= zUl7UBpc4`n#{4*3fBxeVhOe-q$InAOUl&#&LSWsA(=ySukb%(JU?`LA(c j>I)9GlPj32+8G!sgyq{qZ>!D+I*!59)z4*}Q$iB}Wmf+c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Crates/toybox.rsi/invoice.png b/Resources/Textures/Structures/Storage/Crates/toybox.rsi/invoice.png new file mode 100644 index 0000000000000000000000000000000000000000..aacd2ca7681dcc93a92f3a4bf48e3f797b814409 GIT binary patch literal 599 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFy>@BI|pPYCo?c;Oe~$a+xu{U z$g%p`A7L^j0);OEjxJ;k6mVa;z`JyXXpL^}FQHi`Dw;~`n!1}GDD3(n^@qPiG)9!g zQP4$ZZmn+6qn*70g4Ku5{``3Nx2)g32K%@xCDs;vyBzPa5{n~SQ`K#QJudC|c-@iKTN$wSA78{%}b?LV*3&pa()+&_X0mJDUiZ87$*!r%95#nq13yn!S-z3~;`Z#Q9}HIJ z58iBAwzT|Vjc}FRnJH6Oc`@Gn7sD6lzc86`SKflslc!%jpEJ4IW8G=}U2S`7B_{ly zd-}fmr3{((X>W~z!OvOX5n0T@z%2~Ij105pNB{*Vdb&7NU$zeG>~G#BrZ8O zOcY~$5F7MUe)i7j>RX0yk{7lzJEZMOdA3MmZ~Cv4HDQJqPcbSK@2~%N|FQcXP5CoONoLJiXsBBCPM>(YLdC^5yLp)r&mv jDq(3(31Qsp%)oH#uKX5((wSC3$1!-i`njxgN@xNA5h({f literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/Crates/toybox.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/toybox.rsi/meta.json index 082564ccfb..9c0d876c50 100644 --- a/Resources/Textures/Structures/Storage/Crates/toybox.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/Crates/toybox.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood118 (github) for ss14", + "copyright": "Made by brainfood118 (github) for ss14. Label Sprites by Vermidia.", "size": { "x": 32, "y": 32 @@ -20,21 +20,33 @@ "name": "crate_icon" }, { - "name": "sparking", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] + "name": "sparking", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 ] + ] }, { "name": "crate_open" + }, + { + "name": "paper" + }, + { + "name": "bounty" + }, + { + "name": "captains_paper" + }, + { + "name": "invoice" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Storage/Crates/toybox.rsi/paper.png b/Resources/Textures/Structures/Storage/Crates/toybox.rsi/paper.png new file mode 100644 index 0000000000000000000000000000000000000000..f0c91659d3e19398d4a45cd9f06ec21555735105 GIT binary patch literal 599 zcmV-d0;v6oP)bXYSJSo*O#$I?-LxEGnTGhfV=CSj?$LAF zs_>!kuq6WuUnxE1@w4Kr$M1@*WMT?@s%JR+hf{x8&sm1>kZ`||FX_MYs4wYA7v|@r zhGh3)lORTvFeyr`k;h>~YC$rq?;EZ9W+{qCm$yk7OB`8p;vE*XBwf=|Goq*E$x~Lj z|IgFTj77Ze9Z_g`a^1H9Xx)MDitBzIx$gHd_#fe-Q1cfhr-={ID>beE0D_xvc3IO> zyKue*y$_~lX;sND+n33}>nU_DLiY`{Eqhu0o^x^!$qo5M*RZz_gK|H(@&hv6Xdzn4 zS_1$8010qNS#tmY3ljhU3ljkVnw%H_0056kL_t(oNA1$F4S*mJ1<=!2>jtz;hdmR} z%Q%c74K0nfx_|~cBgE=x{Fe|K^6z*+gn|GBAOHafKmY;|fWY4cIt~D>^;OC>#=QCs z90R1xS*b_#Vr{Wi&ow~GJ@AF5Q0Jo l6k}}v1hr51NrD5d1#a|