diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs index 487c556873..1caffd1fd5 100644 --- a/Content.Server/Electrocution/ElectrocutionSystem.cs +++ b/Content.Server/Electrocution/ElectrocutionSystem.cs @@ -323,6 +323,10 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem var electrocutionNode = Comp(electrocutionEntity).GetNode("electrocution"); var electrocutionComponent = Comp(electrocutionEntity); + // This shows up in the power monitor. + // Yes. Yes exactly. + MetaData(electrocutionEntity).EntityName = MetaData(uid).EntityName; + electrocutionNode.CableEntity = sourceUid; electrocutionNode.NodeName = node.Name; diff --git a/Resources/Prototypes/Entities/Virtual/electrocution.yml b/Resources/Prototypes/Entities/Virtual/electrocution.yml index c04c4943ca..497071ee93 100644 --- a/Resources/Prototypes/Entities/Virtual/electrocution.yml +++ b/Resources/Prototypes/Entities/Virtual/electrocution.yml @@ -1,7 +1,17 @@ # Special entity used to attach to power networks as load when somebody gets electrocuted. +- type: entity + id: VirtualElectrocutionLoadBase + noSpawn: true + components: + - type: Electrocution + - type: Icon + # Shows up inside the power monitoring console. + sprite: "Structures/Wallmounts/signs.rsi" + state: "shock" + - type: entity id: VirtualElectrocutionLoadHVPower - name: ELECTROCUTION ENTITY YOU SHOULD NOT SEE THIS + parent: VirtualElectrocutionLoadBase noSpawn: true components: - type: NodeContainer @@ -12,11 +22,10 @@ - type: PowerConsumer voltage: High drawRate: 50000 - - type: Electrocution - type: entity id: VirtualElectrocutionLoadMVPower - name: ELECTROCUTION ENTITY YOU SHOULD NOT SEE THIS + parent: VirtualElectrocutionLoadBase noSpawn: true components: - type: NodeContainer @@ -27,11 +36,10 @@ - type: PowerConsumer voltage: Medium drawRate: 50000 - - type: Electrocution - type: entity id: VirtualElectrocutionLoadApc - name: ELECTROCUTION ENTITY YOU SHOULD NOT SEE THIS + parent: VirtualElectrocutionLoadBase noSpawn: true components: - type: NodeContainer @@ -42,4 +50,3 @@ - type: PowerConsumer voltage: Apc drawRate: 50000 - - type: Electrocution