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	metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
	Sun, 25 Feb 2024 11:36:17 +0000 (22:36 +1100)
committer	GitHub <noreply@github.com>
	Sun, 25 Feb 2024 11:36:17 +0000 (22:36 +1100)
commit	bb0776c496643d88e7ad4635fac13b8d28ff7050
tree	d712f4ba5c01fa0b6fe47775f0d7909d61f95133	tree \| snapshot
parent	bcbe2ec1af39ad1fea286fd27a40bc3794a2ce34	commit \| diff

Revert "Cleanup ExecutionSystem (#24382)" (#25555)

* Revert "Cleanup ExecutionSystem (#24382)"

This reverts commit bcbe2ec1af39ad1fea286fd27a40bc3794a2ce34.

* Revert "Executions (#24150)"

This reverts commit 2e83f5a0ecc5fea0177acd94e22133de0d614588.

# Conflicts:
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs

27 files changed:

Content.Server/Projectiles/ProjectileSystem.cs		diff \| blob \| history
Content.Server/Weapons/Ranged/Systems/GunSystem.cs		diff \| blob \| history
Content.Shared/Execution/DoafterEvent.cs	[deleted file]	blob \| history
Content.Shared/Execution/ExecutionComponent.cs	[deleted file]	blob \| history
Content.Shared/Execution/ExecutionSystem.cs	[deleted file]	blob \| history
Content.Shared/Projectiles/SharedProjectileSystem.cs		diff \| blob \| history
Content.Shared/Weapons/Ranged/Events/ShotAttemptedEvent.cs		diff \| blob \| history
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs		diff \| blob \| history
Resources/Locale/en-US/execution/execution.ftl	[deleted file]	blob \| history
Resources/Locale/en-US/kitchen/components/butcherable-component.ftl		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Materials/shards.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml		diff \| blob \| history

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

RSS Atom