]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Proto-kinetic crusher (#16277)
authormetalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Sun, 14 May 2023 03:15:18 +0000 (13:15 +1000)
committerGitHub <noreply@github.com>
Sun, 14 May 2023 03:15:18 +0000 (13:15 +1000)
commit6417bb4fa065519827bf652be2d1b7aa5ae8fd7d
treec0ec70a766921d0cb91371f09775e2bc4d962e64
parent356bf960394e9665bddee4f83b0d284535a71ee8
Proto-kinetic crusher (#16277)

Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
68 files changed:
Content.Client/Markers/MarkerSystem.cs
Content.Client/Projectiles/ProjectileSystem.cs
Content.Client/Toggleable/ToggleableLightVisualsComponent.cs
Content.Client/Weapons/Marker/DamageMarkerSystem.cs [new file with mode: 0644]
Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
Content.Client/Weapons/Ranged/Systems/GunSystem.cs
Content.Server/Anomaly/Effects/ProjectileAnomalySystem.cs
Content.Server/Gatherable/Components/GatheringProjectileComponent.cs
Content.Server/Gatherable/GatherableSystem.Projectile.cs
Content.Server/Light/EntitySystems/HandheldLightSystem.cs
Content.Server/Pinpointer/ProximityBeeperSystem.cs
Content.Server/PowerCell/PowerCellSystem.Draw.cs [new file with mode: 0644]
Content.Server/PowerCell/PowerCellSystem.cs
Content.Server/Projectiles/ProjectileSystem.cs
Content.Server/UserInterface/ActivatableUIRequiresPowerCellComponent.cs
Content.Server/Weapons/DamageMarkerSystem.cs [new file with mode: 0644]
Content.Server/Weapons/Ranged/Systems/GunSystem.cs
Content.Shared/Interaction/Events/MeleeAttackAttemptEvent.cs [deleted file]
Content.Shared/PowerCell/PowerCellDrawComponent.cs [moved from Content.Server/PowerCell/PowerCellDrawComponent.cs with 56% similarity]
Content.Shared/PowerCell/SharedPowerCellSystem.cs
Content.Shared/Projectiles/ProjectileComponent.cs
Content.Shared/Projectiles/SharedProjectileSystem.cs
Content.Shared/Weapons/Marker/DamageMarkerComponent.cs [new file with mode: 0644]
Content.Shared/Weapons/Marker/DamageMarkerOnCollideComponent.cs [new file with mode: 0644]
Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs [new file with mode: 0644]
Content.Shared/Weapons/Melee/Components/MeleeRequiresWieldComponent.cs [new file with mode: 0644]
Content.Shared/Weapons/Melee/Events/AttackEvent.cs
Content.Shared/Weapons/Melee/Events/AttemptMeleeEvent.cs [new file with mode: 0644]
Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
Content.Shared/Weapons/Ranged/Components/GunComponent.cs
Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs [new file with mode: 0644]
Content.Shared/Weapons/Ranged/Components/UseDelayOnShootComponent.cs [new file with mode: 0644]
Content.Shared/Weapons/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs [new file with mode: 0644]
Content.Shared/Wieldable/WieldableSystem.cs
Resources/Audio/Weapons/attributions.yml [new file with mode: 0644]
Resources/Audio/Weapons/plasma_cutter.ogg [new file with mode: 0644]
Resources/Locale/en-US/wieldable/wieldable-component.ftl
Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
Resources/Prototypes/tags.yml
Resources/Textures/Objects/Weapons/Effects/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Effects/shield2.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher.rsi/icon-lit.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher.rsi/icon-uncharged.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/icon-lit.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/icon-lit.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/icon-uncharged.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-right.png [new file with mode: 0644]