diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 3c438be955..14e8d2c9ba 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -259,7 +259,7 @@ uplink-soap-name = Soap uplink-soap-desc = An untrustworthy bar of soap. Smells of fear. uplink-ultrabright-lantern-name = Extra-Bright Lantern -uplink-ultrabright-lantern-desc = Blinding. +uplink-ultrabright-lantern-desc = It can be used to blind people like a flash. uplink-nocturine-chemistry-bottle-name = Nocturine Bottle uplink-nocturine-chemistry-bottle-desc = A chemical that makes it very hard for your target to stand up. diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 1da5a38912..d519f23818 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -93,7 +93,7 @@ components: - type: StorageFill contents: - - id: lantern + - id: Lantern prob: 0.50 - id: Wirecutter prob: 0.33 @@ -178,7 +178,7 @@ components: - type: StorageFill contents: - - id: lantern + - id: Lantern prob: 0.50 - id: Wirecutter prob: 0.33 diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 7d4c907539..d4d64eeab5 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1105,7 +1105,7 @@ id: UplinkUltrabrightLantern name: uplink-ultrabright-lantern-name description: uplink-ultrabright-lantern-desc - productEntity: lanternextrabright #why is this item id not capitalized??? + productEntity: LanternFlash cost: Telecrystal: 2 categories: diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 63dae3705e..ca9ccf8039 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -77,7 +77,7 @@ state: high - type: RandomSpawner rarePrototypes: - - lanternextrabright + - LanternFlash - PowerCellHigh - NetProbeCartridge rareChance: 0.08 diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml index 883bb3ef40..e7e3a1ad02 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml @@ -1,7 +1,7 @@ - type: entity name: lantern parent: BaseItem - id: lantern + id: Lantern description: The holy light guides the way. components: - type: HandheldLight @@ -60,10 +60,9 @@ cell_slot: !type:ContainerSlot {} - type: entity - name: extra-bright lantern - parent: lantern - id: lanternextrabright - description: Blinding. + parent: Lantern + id: LanternFlash + suffix: Flash components: - type: Sprite sprite: Objects/Tools/lantern.rsi @@ -78,10 +77,8 @@ map: [ "enum.FlashVisuals.LightLayer" ] visible: false - type: PointLight - enabled: false radius: 5 energy: 10 - color: "#FFC458" - type: Flash - type: LimitedCharges maxCharges: 15 diff --git a/Resources/migration.yml b/Resources/migration.yml index bb8b3241f2..40436c9637 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -114,3 +114,7 @@ ForensicGloves: ClothingHandsGlovesForensic # 2023-07-24 ClothingEyesGlassesBeer: ClothingEyesHudBeer + +# 2023-08-01 +lantern: Lantern +lanternextrabright: LanternFlash