git.smokeofanarchy.ru Git - space-station-14.git/commit

]> git.smokeofanarchy.ru Git - space-station-14.git/commit

projects / space-station-14.git / commit

author	slarticodefast <161409025+slarticodefast@users.noreply.github.com>
	Fri, 19 Dec 2025 18:18:12 +0000 (19:18 +0100)
committer	GitHub <noreply@github.com>
	Fri, 19 Dec 2025 18:18:12 +0000 (18:18 +0000)
commit	3266c94eac0dea5bdfc4b8cd814ed7b0a980b580
tree	d0a23ad107a62c8d9c1db5e27b5fd5254912583a	tree \| snapshot
parent	c97ffb006e57990a520d8ab8b8c3f9eb6b7f4a45	commit \| diff

Unify BatteryComponent and PredictedBatteryComponent (#41867)

* unify

* cleanup and merge conflicts

* floating points

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

74 files changed:

Content.Client/Silicons/Borgs/BorgMenu.xaml.cs		diff \| blob \| history
Content.Client/Silicons/Borgs/BorgSystem.cs		diff \| blob \| history
Content.IntegrationTests/Tests/Power/PowerTest.cs		diff \| blob \| history
Content.IntegrationTests/Tests/Power/StationPowerTests.cs		diff \| blob \| history
Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs		diff \| blob \| history
Content.Server/Construction/Completions/BuildMech.cs		diff \| blob \| history
Content.Server/Light/EntitySystems/EmergencyLightSystem.cs		diff \| blob \| history
Content.Server/Light/EntitySystems/HandheldLightSystem.cs		diff \| blob \| history
Content.Server/Mech/Systems/MechSystem.cs		diff \| blob \| history
Content.Server/Ninja/Systems/BatteryDrainerSystem.cs		diff \| blob \| history
Content.Server/Ninja/Systems/ItemCreatorSystem.cs		diff \| blob \| history
Content.Server/Ninja/Systems/NinjaSuitSystem.cs		diff \| blob \| history
Content.Server/Ninja/Systems/SpaceNinjaSystem.cs		diff \| blob \| history
Content.Server/Ninja/Systems/StunProviderSystem.cs		diff \| blob \| history
Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs		diff \| blob \| history
Content.Server/Power/EntitySystems/BatterySystem.API.cs	[deleted file]	blob \| history
Content.Server/Power/EntitySystems/BatterySystem.cs		diff \| blob \| history
Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs		diff \| blob \| history
Content.Server/Power/EntitySystems/PowerNetSystem.cs		diff \| blob \| history
Content.Server/Power/EntitySystems/RiggableSystem.cs		diff \| blob \| history
Content.Server/Power/SMES/SmesSystem.cs		diff \| blob \| history
Content.Server/Power/SetBatteryPercentCommand.cs		diff \| blob \| history
Content.Server/PowerSink/PowerSinkSystem.cs		diff \| blob \| history
Content.Server/Radio/EntitySystems/JammerSystem.cs		diff \| blob \| history
Content.Server/SensorMonitoring/BatterySensorSystem.cs		diff \| blob \| history
Content.Server/Silicons/Borgs/BorgSystem.cs		diff \| blob \| history
Content.Server/Silicons/StationAi/StationAiSystem.cs		diff \| blob \| history
Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs		diff \| blob \| history
Content.Server/Stunnable/Systems/StunbatonSystem.cs		diff \| blob \| history
Content.Server/Tesla/EntitySystem/TeslaCoilSystem.cs		diff \| blob \| history
Content.Server/Xenoarchaeology/Artifact/XAE/XAEChargeBatterySystem.cs		diff \| blob \| history
Content.Shared/Power/ChargeEvents.cs		diff \| blob \| history
Content.Shared/Power/Components/BatteryComponent.cs		diff \| blob \| history
Content.Shared/Power/Components/BatterySelfRechargerComponent.cs		diff \| blob \| history
Content.Shared/Power/Components/BatteryVisualsComponent.cs	[moved from Content.Shared/Power/Components/PredictedBatteryVisualsComponent.cs with 75% similarity]	diff \| blob \| history
Content.Shared/Power/Components/ExaminableBatteryComponent.cs		diff \| blob \| history
Content.Shared/Power/Components/PredictedBatteryComponent.cs	[deleted file]	blob \| history
Content.Shared/Power/Components/PredictedBatterySelfRechargerComponent.cs	[deleted file]	blob \| history
Content.Shared/Power/EntitySystems/ChargerSystem.cs		diff \| blob \| history
Content.Shared/Power/EntitySystems/PredictedBatterySystem.cs	[deleted file]	blob \| history
Content.Shared/Power/EntitySystems/SharedBatterySystem.API.cs	[moved from Content.Shared/Power/EntitySystems/PredictedBatterySystem.API.cs with 79% similarity]	diff \| blob \| history
Content.Shared/Power/EntitySystems/SharedBatterySystem.cs		diff \| blob \| history
Content.Shared/PowerCell/Components/PowerCellComponent.cs		diff \| blob \| history
Content.Shared/PowerCell/PowerCellSystem.API.cs		diff \| blob \| history
Content.Shared/PowerCell/PowerCellSystem.Relay.cs		diff \| blob \| history
Content.Shared/PowerCell/PowerCellSystem.cs		diff \| blob \| history
Content.Shared/UserInterface/ActivatableUISystem.Power.cs		diff \| blob \| history
Content.Shared/Weapons/Ranged/Components/BatteryAmmoProviderComponent.cs		diff \| blob \| history
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs		diff \| blob \| history
Resources/Prototypes/Catalog/Bounties/bounties.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Hands/gloves.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml		diff \| blob \| history
Resources/Prototypes/Entities/Debugging/debug_sweps.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/Player/silicon.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Power/powercells.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Power/powersink.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_base.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/security.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Power/apc.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Power/debug_power.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Power/smes.yml		diff \| blob \| history
Resources/Prototypes/Entities/Structures/Power/substation.yml		diff \| blob \| history

Форк Space Station 14 с переводами на русский

RSS Atom