diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml index d836c384e9..75e0e2f8b6 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml @@ -56,6 +56,7 @@ - type: AirlockVisualizer - type: WiresVisualizer - type: ApcPowerReceiver + powerLoad: 20 - type: ExtensionCableReceiver - type: Wires BoardName: "Airlock Control" diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml index 52de78ffbc..7d8903631b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml @@ -6,6 +6,8 @@ parent: ComputerBase components: - type: ApcPowerReceiver + powerLoad: 350 + priority: Low - type: ExtensionCableReceiver - type: PointLight radius: 1.5 diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml index 9b6d930c35..0a7e968183 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml @@ -11,6 +11,7 @@ node: computer - type: Computer - type: ApcPowerReceiver + powerLoad: 200 - type: ExtensionCableReceiver - type: Sprite sprite: Structures/Machines/computers.rsi diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 2513ab3ede..a0ee96f3d3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -18,8 +18,6 @@ abstract: true components: - type: ShuttleConsole - - type: ApcPowerReceiver - powerLoad: 200 - type: ExtensionCableReceiver - type: PointLight radius: 1.5 @@ -141,7 +139,7 @@ - key: enum.ResearchClientUiKey.Key type: ResearchClientBoundUserInterface - type: ApcPowerReceiver - powerLoad: 200 + powerLoad: 1000 priority: Low - type: ExtensionCableReceiver - type: Computer @@ -213,6 +211,8 @@ - type: ComputerVisualizer key: generic_key screen: generic + - type: ApcPowerReceiver + powerLoad: 500 - type: Computer board: BodyScannerComputerCircuitboard - type: PointLight diff --git a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml index 342046556f..798286cad0 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml @@ -40,4 +40,5 @@ id: BaseMachinePowered components: - type: ApcPowerReceiver + powerLoad: 1000 - type: ExtensionCableReceiver diff --git a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml index 55c1f7a03b..a25f7d3d3b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml @@ -49,6 +49,8 @@ interfaces: - key: enum.ChemMasterUiKey.Key type: ChemMasterBoundUserInterface + - type: ApcPowerReceiver + powerLoad: 250 # Machine / Construction stuff - type: Wires BoardName: "chem_master" diff --git a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml index 65ed4d8bed..16b68f0f4b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml @@ -42,6 +42,8 @@ - type: Wires BoardName: "CloningPod" LayoutId: CloningPod + - type: ApcPowerReceiver + powerLoad: 2000 - type: Appearance visuals: - type: GenericEnumVisualizer diff --git a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml index ff215570f9..bbcda67664 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml @@ -51,8 +51,8 @@ - !type:DoActsBehavior acts: ["Breakage"] - type: GravityGenerator - idlePower: 15 - activePower: 500 + idlePower: 50 + activePower: 2500 lightRadiusMin: 0.75 lightRadiusMax: 2.5 - type: UserInterface diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml index 9b1aa8196c..61223d6807 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml @@ -47,3 +47,5 @@ behaviors: - !type:DoActsBehavior acts: ["Breakage"] + - type: ApcPowerReceiver + powerLoad: 400 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml index 3b825719c6..f115bfd0b3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml @@ -30,3 +30,5 @@ sprite: Structures/Machines/juicer.rsi state: juicer0 drawdepth: SmallObjects + - type: ApcPowerReceiver + powerLoad: 300 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Machines/salvage.yml b/Resources/Prototypes/Entities/Structures/Machines/salvage.yml index 5440bb243b..5ff3dbdf67 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/salvage.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/salvage.yml @@ -12,6 +12,8 @@ - type: Rotatable - type: SalvageMagnet offset: 0, -32 + - type: ApcPowerReceiver + powerLoad: 2500 # TODO change this to a HV power draw that really hits the grid hard WHEN active # For Knightship - type: entity @@ -22,4 +24,6 @@ components: - type: SalvageMagnet offset: 0, -12 + - type: ApcPowerReceiver + powerLoad: 1000 diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index d6393fce46..8b54b9d8a6 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -52,6 +52,10 @@ castShadows: false radius: 1.5 - type: LitOnPowered + - type: ApcPowerReceiver + powerLoad: 200 + priority: Low + - type: entity parent: VendingMachine diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml index ec894ed702..541ffb4f8f 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml @@ -62,8 +62,8 @@ input: !type:CableDeviceNode nodeGroupID: HVPower - - type: ApcPowerReceiver - - type: ExtensionCableReceiver +# - type: ApcPowerReceiver +# - type: ExtensionCableReceiver - type: PowerSupplier supplyRate: 0 diff --git a/Resources/Prototypes/Entities/Structures/cargo_telepad.yml b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml index 7004fc8025..d5344aafd1 100644 --- a/Resources/Prototypes/Entities/Structures/cargo_telepad.yml +++ b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml @@ -44,6 +44,7 @@ - !type:DoActsBehavior acts: ["Destruction"] - type: ApcPowerReceiver + powerLoad: 1000 # TODO if we keep this make it spike power draw when teleporting - type: ExtensionCableReceiver - type: CargoTelepad - type: Appearance