]> git.smokeofanarchy.ru Git - space-station-14.git/commit
UseDelay + ItemCooldown merge (#22502)
authorAJCM-git <60196617+AJCM-git@users.noreply.github.com>
Thu, 4 Jan 2024 01:33:09 +0000 (21:33 -0400)
committerGitHub <noreply@github.com>
Thu, 4 Jan 2024 01:33:09 +0000 (21:33 -0400)
commit9c522c8b19f7a6f6b396c66342413572a22d7845
tree053389904b50e9559da8543249d4663fe01b5fdc
parent42ec9b29677f06b4205678ec38104991f65d8c61
UseDelay + ItemCooldown merge (#22502)
80 files changed:
Content.Client/Inventory/ClientInventorySystem.cs
Content.Client/UserInterface/Systems/Hands/HandsUIController.cs
Content.Server/Atmos/EntitySystems/FlammableSystem.cs
Content.Server/Bible/BibleSystem.cs
Content.Server/Cargo/Systems/PriceGunSystem.cs
Content.Server/Chemistry/EntitySystems/ChemistrySystemHypospray.cs
Content.Server/Cooldown/ItemCooldownSystem.cs [deleted file]
Content.Server/DeviceLinking/Systems/LogicGateSystem.cs
Content.Server/DeviceLinking/Systems/PowerSensorSystem.cs
Content.Server/DeviceLinking/Systems/SignallerSystem.cs
Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
Content.Server/Fluids/EntitySystems/SpraySystem.cs
Content.Server/IgnitionSource/IgniteOnTriggerSystem.cs
Content.Server/Inventory/ServerInventorySystem.cs
Content.Server/Medical/DefibrillatorSystem.cs
Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs
Content.Server/Ninja/Systems/NinjaSuitSystem.cs
Content.Server/Power/Generator/PowerSwitchableSystem.cs
Content.Server/Singularity/Components/RadiationCollectorComponent.cs
Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs
Content.Server/Storage/EntitySystems/StorageSystem.cs
Content.Server/Xenoarchaeology/Equipment/Systems/NodeScannerSystem.cs
Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
Content.Shared/Cooldown/Cooldowns.cs [deleted file]
Content.Shared/Cooldown/ItemCooldownComponent.cs [deleted file]
Content.Shared/Interaction/Events/UseInHandEvent.cs
Content.Shared/Interaction/SharedInteractionSystem.cs
Content.Shared/Inventory/InventorySystem.Equip.cs
Content.Shared/Mech/Equipment/Systems/MechSoundboardSystem.cs
Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs
Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs
Content.Shared/Timing/UseDelayComponent.cs
Content.Shared/Timing/UseDelaySystem.cs
Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs
Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs
Content.Shared/Wieldable/WieldableSystem.cs
Resources/Maps/aspid.yml
Resources/Maps/cluster.yml
Resources/Maps/europa.yml
Resources/Maps/gemini.yml
Resources/Maps/marathon.yml
Resources/Maps/meta.yml
Resources/Maps/origin.yml
Resources/Maps/saltern.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
Resources/Prototypes/Entities/Objects/Fun/darts.yml
Resources/Prototypes/Entities/Objects/Fun/dice.yml
Resources/Prototypes/Entities/Objects/Fun/skub.yml
Resources/Prototypes/Entities/Objects/Fun/toys.yml
Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
Resources/Prototypes/Entities/Objects/Materials/shards.yml
Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
Resources/Prototypes/Entities/Objects/Misc/desk_bell.yml
Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
Resources/Prototypes/Entities/Objects/Misc/paper.yml
Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
Resources/Prototypes/Entities/Objects/Tools/lighters.yml
Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
Resources/Prototypes/Entities/Objects/Tools/tools.yml
Resources/Prototypes/Entities/Objects/Tools/welders.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml
Resources/Prototypes/Entities/Objects/Weapons/security.yml
Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml
Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
Resources/Prototypes/XenoArch/Effects/utility_effects.yml