Make jugs label deletable (#19082)
* Fix bug with undeletable label on jugs * Fix label text for jugs * Documented LabelComponent * Revert "Fix label text for jugs" This reverts commit 38b7cc75ca51770b3693d0cef4f0364424619b73. * make jugs labels names lowercase * Fix documentation of LabelComponent
This commit is contained in:
@@ -1,12 +1,19 @@
|
|||||||
namespace Content.Server.Labels.Components
|
namespace Content.Server.Labels.Components
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Makes entities have a label in their name. Labels are normally given by <see cref="HandLabelerComponent"/>
|
||||||
|
/// </summary>
|
||||||
[RegisterComponent]
|
[RegisterComponent]
|
||||||
public sealed class LabelComponent : Component
|
public sealed class LabelComponent : Component
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// The actual text in the label
|
||||||
|
/// </summary>
|
||||||
[ViewVariables(VVAccess.ReadWrite)]
|
[ViewVariables(VVAccess.ReadWrite)]
|
||||||
[DataField("currentLabel")]
|
[DataField("currentLabel")]
|
||||||
public string? CurrentLabel { get; set; }
|
public string? CurrentLabel { get; set; }
|
||||||
|
|
||||||
|
[DataField("originalName")]
|
||||||
public string? OriginalName { get; set; }
|
public string? OriginalName { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,6 +46,8 @@
|
|||||||
fillBaseName: jug
|
fillBaseName: jug
|
||||||
- type: StaticPrice
|
- type: StaticPrice
|
||||||
price: 80
|
price: 80
|
||||||
|
- type: Label
|
||||||
|
originalName: jug
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: Jug
|
parent: Jug
|
||||||
@@ -54,7 +56,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Carbon
|
currentLabel: carbon
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -69,7 +71,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Iodine
|
currentLabel: iodine
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -84,7 +86,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Fluorine
|
currentLabel: fluorine
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -99,7 +101,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Chlorine
|
currentLabel: chlorine
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -114,7 +116,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Aluminium
|
currentLabel: aluminium
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -129,7 +131,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Phosphorus
|
currentLabel: phosphorus
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -144,7 +146,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Sulfur
|
currentLabel: sulfur
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -159,7 +161,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Silicon
|
currentLabel: silicon
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -174,7 +176,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Hydrogen
|
currentLabel: hydrogen
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -189,7 +191,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Lithium
|
currentLabel: lithium
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -204,7 +206,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Sodium
|
currentLabel: sodium
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -219,7 +221,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Potassium
|
currentLabel: potassium
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -234,7 +236,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Radium
|
currentLabel: radium
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -249,7 +251,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Iron
|
currentLabel: iron
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -264,7 +266,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Copper
|
currentLabel: copper
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -279,7 +281,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Gold
|
currentLabel: gold
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -294,7 +296,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Mercury
|
currentLabel: mercury
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -309,7 +311,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Silver
|
currentLabel: silver
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -324,7 +326,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Ethanol
|
currentLabel: ethanol
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -339,7 +341,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Sugar
|
currentLabel: sugar
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -354,7 +356,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Nitrogen
|
currentLabel: nitrogen
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
@@ -369,7 +371,7 @@
|
|||||||
noSpawn: true
|
noSpawn: true
|
||||||
components:
|
components:
|
||||||
- type: Label
|
- type: Label
|
||||||
currentLabel: Oxygen
|
currentLabel: oxygen
|
||||||
- type: SolutionContainerManager
|
- type: SolutionContainerManager
|
||||||
solutions:
|
solutions:
|
||||||
beaker:
|
beaker:
|
||||||
|
|||||||
Reference in New Issue
Block a user