{
_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)
if (args.Container.ID != label.LabelSlot.ID)
return;
- if (!EntityManager.TryGetComponent(uid, out AppearanceComponent? appearance))
+ UpdateAppearance((uid, label));
+ }
+
+ private void UpdateAppearance(Entity<PaperLabelComponent, AppearanceComponent?> 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<PaperLabelTypeComponent>(slot.Item, out var type))
+ _appearance.SetData(ent, PaperLabelVisuals.LabelType, type.PaperType, ent.Comp2);
}
}
}
--- /dev/null
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Labels.Components;
+
+/// <summary>
+/// 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.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class PaperLabelTypeComponent : Component
+{
+ /// <summary>
+ /// The type of label to show.
+ /// </summary>
+ [DataField]
+ public string PaperType = "Paper";
+}
}
[Serializable, NetSerializable]
- public enum PaperLabelVisuals
+ public enum PaperLabelVisuals : byte
{
+ Layer,
HasLabel,
+ LabelType
}
/// <summary>
map: ["enum.PaperVisualLayers.Stamp"]
visible: false
- type: Paper
+ - type: PaperLabelType
- type: ActivatableUI
key: enum.PaperUiKey.Key
closeOnHandDeselect: false
- 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"
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"
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
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
- 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}
-- type: entity
+- type: entity
id: CrateArtifactContainer
parent: BaseStructureDynamic
name: artifact container
- state: locked
map: ["enum.LockVisualLayers.Lock"]
shader: unshaded
+ - state: paper
+ map: ["enum.PaperLabelVisuals.Layer"]
- type: InteractionOutline
- type: Physics
- type: Fixtures
- 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
- 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
- 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
- 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
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
- 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
- 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
- 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
- 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
- state: base
- state: closed
map: ["enum.StorageVisualLayers.Door"]
+ - state: paper
+ map: ["enum.PaperLabelVisuals.Layer"]
- type: Icon
sprite: Structures/Storage/Crates/coffin.rsi
state: base
- 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
- 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
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
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"]]
{
"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
"name": "bag_folded"
},
{
- "name": "label_overlay"
+ "name": "paper"
},
{
"name": "open_overlay"
+ },
+ {
+ "name": "bounty"
+ },
+ {
+ "name": "captains_paper"
+ },
+ {
+ "name": "invoice"
}
]
-}
+}
\ No newline at end of file
{
- "version": 1,
- "size": {
- "x": 32,
- "y": 32
- },
- "license": "CC-BY-SA-3.0",
- "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09",
- "states": [
- {
- "name": "artifact_container"
- },
- {
- "name": "artifact_container_door"
- },
- {
- "name": "artifact_container_open"
- },
- {
- "name": "artifact_container_icon"
- },
- {
- "name": "locked"
- },
- {
- "name": "unlocked"
- },
- {
- "name": "welded"
- }
- ]
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09. Label sprites by Vermidia.",
+ "states": [
+ {
+ "name": "artifact_container"
+ },
+ {
+ "name": "artifact_container_door"
+ },
+ {
+ "name": "artifact_container_open"
+ },
+ {
+ "name": "artifact_container_icon"
+ },
+ {
+ "name": "locked"
+ },
+ {
+ "name": "unlocked"
+ },
+ {
+ "name": "welded"
+ },
+ {
+ "name": "paper"
+ },
+ {
+ "name": "bounty"
+ },
+ {
+ "name": "captains_paper"
+ },
+ {
+ "name": "invoice"
+ }
+ ]
}
\ No newline at end of file
{
"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
},
{
"name": "closed"
+ },
+ {
+ "name": "paper"
+ },
+ {
+ "name": "bounty"
+ },
+ {
+ "name": "captains_paper"
+ },
+ {
+ "name": "invoice"
}
]
}
--- /dev/null
+{
+ "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
{
"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
"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
projects / space-station-14.git / commitdiff
