diff --git a/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs b/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs index 5a9b0453bf..6f36b6857c 100644 --- a/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs +++ b/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs @@ -57,8 +57,8 @@ namespace Content.Server.Light.EntitySystems case ExpendableLightState.Fading: component.CurrentState = ExpendableLightState.Dead; var meta = MetaData(component.Owner); - meta.EntityName = component.SpentName; - meta.EntityDescription = component.SpentDesc; + meta.EntityName = Loc.GetString(component.SpentName); + meta.EntityDescription = Loc.GetString(component.SpentDesc); UpdateSpriteAndSounds(component); UpdateVisualizer(component); diff --git a/Resources/Locale/en-US/light/components/expendable-light-component.ftl b/Resources/Locale/en-US/light/components/expendable-light-component.ftl index 8a242d5525..7b68f5dc90 100644 --- a/Resources/Locale/en-US/light/components/expendable-light-component.ftl +++ b/Resources/Locale/en-US/light/components/expendable-light-component.ftl @@ -1 +1,14 @@ -expendable-light-start-verb = Start Light \ No newline at end of file +expendable-light-start-verb = Start Light + +expendable-light-spent-flare-name = spent flare +expendable-light-spent-flare-desc = It looks like this flare has burnt out. What a bummer. + +expendable-light-burnt-torch-name = burnt torch +expendable-light-burnt-torch-desc = It looks like this torch has burnt out. What a bummer. + +expendable-light-spent-green-glowstick-name = spent green glowstick +expendable-light-spent-red-glowstick-name = spent red glowstick +expendable-light-spent-purple-glowstick-name = spent purple glowstick +expendable-light-spent-yellow-glowstick-name = spent purple glowstick +expendable-light-spent-blue-glowstick-name = spent blue glowstick +expendable-light-spent-glowstick-desc = It looks like this glowstick has stopped glowing. How tragic. diff --git a/Resources/Prototypes/Entities/Objects/Misc/torch.yml b/Resources/Prototypes/Entities/Objects/Misc/torch.yml index ca3871d3bb..89e253f543 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/torch.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/torch.yml @@ -5,8 +5,8 @@ description: A torch fashioned from some wood. components: - type: ExpendableLight - spentName: burnt torch - spentDesc: It looks like this torch has burnt out. What a bummer. + spentName: expendable-light-burnt-torch-name + spentDesc: expendable-light-burnt-torch-desc glowDuration: 100 fadeOutDuration: 4 iconStateSpent: torch_spent diff --git a/Resources/Prototypes/Entities/Objects/Tools/flare.yml b/Resources/Prototypes/Entities/Objects/Tools/flare.yml index e8cb610aa5..aabf0f406c 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/flare.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/flare.yml @@ -11,8 +11,8 @@ - type: Recyclable - type: SpaceGarbage - type: ExpendableLight - spentName: spent flare - spentDesc: It looks like this flare has burnt out. What a bummer. + spentName: expendable-light-spent-flare-name + spentDesc: expendable-light-spent-flare-desc glowDuration: 225 fadeOutDuration: 15 iconStateOn: flare_unlit diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml index 3492180162..73772727a0 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml @@ -10,8 +10,8 @@ - type: Recyclable - type: SpaceGarbage - type: ExpendableLight - spentName: spent green glowstick - spentDesc: It looks like this glowstick has stopped glowing. How tragic. + spentName: expendable-light-spent-green-glowstick-name + spentDesc: expendable-light-spent-glowstick-desc glowDuration: 900 # time in seconds fadeOutDuration: 300 iconStateOn: glowstick_lit @@ -72,8 +72,8 @@ id: GlowstickRed components: - type: ExpendableLight - spentName: spent red glowstick - spentDesc: It looks like this glowstick has stopped glowing. How tragic. + spentName: expendable-light-spent-red-glowstick-name + spentDesc: expendable-light-spent-glowstick-desc glowDuration: 900 fadeOutDuration: 300 iconStateOn: glowstick_lit @@ -107,8 +107,8 @@ id: GlowstickPurple components: - type: ExpendableLight - spentName: spent purple glowstick - spentDesc: It looks like this glowstick has stopped glowing. How tragic. + spentName: expendable-light-spent-purple-glowstick-name + spentDesc: expendable-light-spent-glowstick-desc glowDuration: 900 fadeOutDuration: 300 iconStateOn: glowstick_lit @@ -142,8 +142,8 @@ id: GlowstickYellow components: - type: ExpendableLight - spentName: spent yellow glowstick - spentDesc: It looks like this glowstick has stopped glowing. How tragic. + spentName: expendable-light-spent-yellow-glowstick-name + spentDesc: expendable-light-spent-glowstick-desc glowDuration: 900 fadeOutDuration: 300 iconStateOn: glowstick_lit @@ -177,8 +177,8 @@ id: GlowstickBlue components: - type: ExpendableLight - spentName: spent blue glowstick - spentDesc: It looks like this glowstick has stopped glowing. How tragic. + spentName: expendable-light-spent-blue-glowstick-name + spentDesc: expendable-light-spent-glowstick-desc glowDuration: 900 fadeOutDuration: 300 iconStateOn: glowstick_lit