diff --git a/Resources/Locale/en-US/tips.ftl b/Resources/Locale/en-US/tips.ftl index 154ac8e18b..dcadd15b1b 100644 --- a/Resources/Locale/en-US/tips.ftl +++ b/Resources/Locale/en-US/tips.ftl @@ -133,3 +133,5 @@ tips-dataset-132 = By right clicking on a player, and then clicking the heart ic tips-dataset-133 = Monkeys and kobolds have a rare chance to be sentient. Ook! tips-dataset-134 = You can tell if an area with firelocks up is spaced by looking to see if the firelocks have lights beside them. tips-dataset-135 = Instead of picking it up, you can alt-click food to eat it. This also works for mice and other creatures without hands. +tips-dataset-136 = If you're trapped behind an electrified door, disable the APC or throw your ID at the door to avoid getting shocked! +tips-dataset-137 = If the AI electrifies a door and you have insulated gloves, snip and mend the power wire to reset their electrification! diff --git a/Resources/Prototypes/Datasets/tips.yml b/Resources/Prototypes/Datasets/tips.yml index b710d69fab..b57f2052d9 100644 --- a/Resources/Prototypes/Datasets/tips.yml +++ b/Resources/Prototypes/Datasets/tips.yml @@ -2,4 +2,4 @@ id: Tips values: prefix: tips-dataset- - count: 135 + count: 137 diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml index 90224d3136..f8099f28d7 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml @@ -31,11 +31,16 @@ shader: unshaded - state: panel_open map: ["enum.WiresVisualLayers.MaintenancePanel"] - - state: electrified + - state: electrified_ai sprite: Interface/Misc/ai_hud.rsi shader: unshaded visible: false map: ["enum.ElectrifiedLayers.HUD"] + - state: electrified + sprite: Effects/electricity.rsi + shader: unshaded + visible: false + map: ["enum.ElectrifiedLayers.Sparks"] - type: AnimationPlayer - type: Physics - type: Fixtures @@ -77,6 +82,12 @@ - type: NavMapDoor - type: DoorBolt - type: Appearance + - type: GenericVisualizer + visuals: + enum.ElectrifiedVisuals.ShowSparks: + enum.ElectrifiedLayers.Sparks: + True: { visible: True } + False: { visible: False } - type: WiresVisuals - type: ElectrocutionHUDVisuals - type: ApcPowerReceiver diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml index ea8b866e77..6f7340c80f 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml @@ -27,11 +27,16 @@ shader: unshaded - state: panel_open map: ["enum.WiresVisualLayers.MaintenancePanel"] - - state: electrified + - state: electrified_ai sprite: Interface/Misc/ai_hud.rsi shader: unshaded visible: false map: ["enum.ElectrifiedLayers.HUD"] + - state: electrified + sprite: Effects/electricity.rsi + shader: unshaded + visible: false + map: ["enum.ElectrifiedLayers.Sparks"] - type: AnimationPlayer - type: Physics - type: Fixtures @@ -70,6 +75,12 @@ - type: AccessReader containerAccessProvider: board - type: Appearance + - type: GenericVisualizer + visuals: + enum.ElectrifiedVisuals.ShowSparks: + enum.ElectrifiedLayers.Sparks: + True: { visible: True } + False: { visible: False } - type: WiresVisuals - type: ElectrocutionHUDVisuals - type: ApcPowerReceiver diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml index 81ef89997d..10062d7803 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml @@ -43,11 +43,16 @@ map: ["enum.DoorVisualLayers.BaseEmergencyAccess"] - state: panel_open map: ["enum.WiresVisualLayers.MaintenancePanel"] - - state: electrified + - state: electrified_ai sprite: Interface/Misc/ai_hud.rsi shader: unshaded visible: false map: ["enum.ElectrifiedLayers.HUD"] + - state: electrified + sprite: Effects/electricity.rsi + shader: unshaded + visible: false + map: ["enum.ElectrifiedLayers.Sparks"] - type: AnimationPlayer - type: ApcPowerReceiver - type: ExtensionCableReceiver @@ -142,6 +147,12 @@ enum.WiresUiKey.Key: type: WiresBoundUserInterface - type: Appearance + - type: GenericVisualizer + visuals: + enum.ElectrifiedVisuals.ShowSparks: + enum.ElectrifiedLayers.Sparks: + True: { visible: True } + False: { visible: False } - type: WiresVisuals - type: ElectrocutionHUDVisuals - type: Airtight @@ -183,11 +194,16 @@ - state: panel_open map: [ "enum.WiresVisualLayers.MaintenancePanel" ] visible: false - - state: electrified + - state: electrified_ai sprite: Interface/Misc/ai_hud.rsi shader: unshaded visible: false map: [ "enum.ElectrifiedLayers.HUD" ] + - state: electrified + sprite: Effects/electricity.rsi + shader: unshaded + visible: false + map: [ "enum.ElectrifiedLayers.Sparks" ] - type: Damageable damageModifierSet: RGlass - type: Destructible @@ -249,11 +265,16 @@ - state: panel_open map: [ "enum.WiresVisualLayers.MaintenancePanel" ] visible: false - - state: electrified + - state: electrified_ai sprite: Interface/Misc/ai_hud.rsi shader: unshaded visible: false map: [ "enum.ElectrifiedLayers.HUD" ] + - state: electrified + sprite: Effects/electricity.rsi + shader: unshaded + visible: false + map: [ "enum.ElectrifiedLayers.Sparks" ] - type: Destructible thresholds: - trigger: @@ -310,11 +331,16 @@ - state: panel_open map: [ "enum.WiresVisualLayers.MaintenancePanel" ] visible: false - - state: electrified + - state: electrified_ai sprite: Interface/Misc/ai_hud.rsi shader: unshaded visible: false - map: ["enum.ElectrifiedLayers.HUD"] + map: [ "enum.ElectrifiedLayers.HUD" ] + - state: electrified + sprite: Effects/electricity.rsi + shader: unshaded + visible: false + map: [ "enum.ElectrifiedLayers.Sparks" ] - type: Destructible thresholds: - trigger: @@ -376,11 +402,16 @@ - state: panel_open map: [ "enum.WiresVisualLayers.MaintenancePanel" ] visible: false - - state: electrified + - state: electrified_ai sprite: Interface/Misc/ai_hud.rsi shader: unshaded visible: false map: [ "enum.ElectrifiedLayers.HUD" ] + - state: electrified + sprite: Effects/electricity.rsi + shader: unshaded + visible: false + map: [ "enum.ElectrifiedLayers.Sparks" ] - type: Destructible thresholds: - trigger: @@ -437,11 +468,16 @@ - state: panel_open map: [ "enum.WiresVisualLayers.MaintenancePanel" ] visible: false - - state: electrified + - state: electrified_ai sprite: Interface/Misc/ai_hud.rsi shader: unshaded visible: false map: [ "enum.ElectrifiedLayers.HUD" ] + - state: electrified + sprite: Effects/electricity.rsi + shader: unshaded + visible: false + map: [ "enum.ElectrifiedLayers.Sparks" ] - type: Destructible thresholds: - trigger: diff --git a/Resources/Textures/Interface/Misc/ai_hud.rsi/electrified.png b/Resources/Textures/Interface/Misc/ai_hud.rsi/electrified_ai.png similarity index 100% rename from Resources/Textures/Interface/Misc/ai_hud.rsi/electrified.png rename to Resources/Textures/Interface/Misc/ai_hud.rsi/electrified_ai.png diff --git a/Resources/Textures/Interface/Misc/ai_hud.rsi/meta.json b/Resources/Textures/Interface/Misc/ai_hud.rsi/meta.json index 7f1e67ac4d..3df9d296a0 100644 --- a/Resources/Textures/Interface/Misc/ai_hud.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/ai_hud.rsi/meta.json @@ -8,7 +8,7 @@ }, "states": [ { - "name": "electrified", + "name": "electrified_ai", "delays": [ [ 0.2, @@ -34,4 +34,4 @@ ] } ] -} \ No newline at end of file +}