Commit Graph

50 Commits

Author SHA1 Message Date
Bixkitts ae8a68b7cd
MeleeHitSoundSystem (#25005)
* Began work to unscrew melee noises

* finished

* cleanup

* cleanup

* Update Content.Server/Weapons/Melee/MeleeWeaponSystem.cs

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* _Style

* Fix merge

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-03-31 16:21:01 +11:00
Jake Huxell 59e46aab93
Reduced Warning Count By 130 For Full Rebuilds (#26518)
* remove deprecated entity coordinate extension functions. Reduces warning count by approximately 50

* final toCoords Removed

* Remove all unused variables and dead code paths

* remove always true variable, should be a cvar or something instead

* remove superfluous variables from tests
2024-03-29 16:28:16 +11:00
metalgearsloth bb0776c496
Revert "Cleanup ExecutionSystem (#24382)" (#25555)
* Revert "Cleanup ExecutionSystem (#24382)"

This reverts commit bcbe2ec1af.

* Revert "Executions (#24150)"

This reverts commit 2e83f5a0ec.

# Conflicts:
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
2024-02-25 22:36:17 +11:00
nikthechampiongr bcbe2ec1af
Cleanup ExecutionSystem (#24382)
* Creat Execution Component and add to sharp items

* Kill Server ExecutionSystem. Create ExecutionSystem in shared. Create ActiveExecution Component.
Transferred the Execution system into shared. Heavily re-wrote the system in order to reduce duplication,
and remove gun code from the system.
The melee weapon modifier which was dependant on swing rate was removed.

The ActiveExecutionComponent was created in order to apply the damage modifier to the shot from a gun execution.
It is added just before the gun fires and removed after an attempt is made.

* Fix bugs

The execution completed text will now only show up if the gun fires.

The client also no longer crashes because I forgot to network the component.

* Remove clumsy text

* Make BaseSword abstract

* Add ExecutionComponent to every weapon

* Fix bug

* Remove execution comp from battery weapons

Currently the gun system does not have a way to alter hitscan damage like it does with projectiles.

* Cleanup

* Revert "Remove clumsy text"

This reverts commit a46da6448d5d179a4e936f9213d5622bedb58a16.

* Actually fix the ExecutionSystem

Everything about the shot goes through the gun system now.
The Damage multiplier is only applied when a projectile impacts the target so people that get in the way don't get hit
with 9 times damage for no reason.

In order to make suicides work I needed to create fake EntityCoordinates because the gun system and the projectile
system do not play well with a projectile that has the same start and end position.

* Make launchers able to execute

* Fix prediction bug

The OnAmmoShotEvent is only raised on the server.

* Readd ability for clowns to accidentally shoot themselves while executing

* Cleanup

* Reset melee cooldown to initial value

* Address reviews fix bug

Addressed reviews on overriding messages.
Now I actually mark doafters as handled.
Return normal cooldown to some meleeweapons I forgot on the previous commit.

* Address Reviews

Remove duplication

* Exorcise codebase

Remove evil null coercion that I was sure I removed a while ago

* Address reviews again

* Remove melee weapon attack logic and rely on the system. Remove gun and
melee checks.

* Make system functional again and cleanup

* Remove code I forgot to remove

* Cleanup

* stalled

* Selectively revert gun penetration

The collision layer check doesn't work and I don't have time to fix it.

* Fixes

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-02-25 22:07:10 +11:00
Jessica M d0c24f9aff
Makes clumsy not delete guns (#25243)
clumsy no longer deletes guns

Co-authored-by: Jessica M <jessica@maybe.sh>
2024-02-14 16:04:06 -07:00
metalgearsloth e1901aa6b6
Revert "Make flare gun explode, damage and stun the player when used … (#24679)
* Revert "Make flare gun explode, damage and stun the player when used with the wrong ammo (#22349)"

This reverts commit e301378114.

# Conflicts:
#	Content.Shared/Weapons/Ranged/Components/GunComponent.cs
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml

* Fix revert conflicts

* Update Content.Shared/Weapons/Ranged/Components/GunComponent.cs
2024-01-29 11:20:34 +11:00
DrSmugleaf 4e8b1fb0d3
Add events for GunComponent values, muzzle flashes and cartridge spread (#24077)
* Add a modifier event for GunComponent values

* Add docs

* Add VV readwrite to modified values

* Add more docs

* More docs

* Add Gun parameter to GunRefreshModifiersEvent

* Add another event for handling cartridge spread

* Fix pneumatic speed
2024-01-29 10:32:42 +11:00
LordCarve c77eb8691d
DamageSpecifier Total => GetTotal (#24160)
* DamageSpecifier [Obsolete] Total => GetTotal()

* Remove obsolete Total member from DamageSpecifier.
2024-01-21 18:59:14 -07:00
Ed a2d5d74b46
Star Wars 14: Shuttle weapon update (#23644)
* setup codebase

* make auto-fire, but its broken

* collider problem

* fix rate, add toggle port

* add laser

* power cages

* ginormous cells

* fix inhand

* add pirate cannon

* salvage gun

* functional Nuke cannon

* rewrite to standart grenade

* fix naming, add emp sprite

* grenade cartridge

* thruster fix

* nuke cannon

* audio + visual polish

* balance tweak

* tweaks

* laser balance tweak: new Electronic damage modifier set, reduce structural cannon damage

* resprite energy cages, start implementing in game

* fix cage recharger craft

* add small laser gun

* fix colliders

* add  lasers and ptk to research and crafting

* finish implementing weapon to rnd and sec

* some fixes

* splitted grenades and cannon balls

* integrate new cannon balls

* tweaks stick

* move circuits to sectechfab, fix

* fix?

* add ability to E shoot, without signals

* fix!

* fix?!?! and naming tweak

* go!

* Lank fix

* oh

* mornings don't start with coffee.

* the morning starts with bug fixes.

* fucking bugs!

* finally

* it is now possible to craft projectiles separately from cartridges

* +2 fix

* refactor

* piu

* More weight

* add AutoShootGunComponent

* move autoshoot to partial

* SetEnabled()

* some fixes

* remove CanShootWithoutUser field

* remove null-checks ToCoordinates from AttemptShoot()

* war without reason

* return to home

* ?

* forgot remove it

* review

* Fix formatting and update path

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-01-21 19:58:40 +11:00
keronshb 2375a6cd1d
Moves ShootProjectile to shared (#24007) 2024-01-13 15:52:02 +11:00
MendaxxDev e301378114
Make flare gun explode, damage and stun the player when used with the wrong ammo (#22349)
* Flare gun can now only be loaded with actual flares

* Make flare gun loadable with other shells, but destroy it and damage and stun the user when used

* tweak

* Logic fix + QOL add-ons

* damageOnWrongAmmo in gun component

* cleanup
2023-12-15 02:57:59 -07:00
DrSmugleaf c72b95db6b
Fix debug assert when shooting guns (#21070) 2023-10-18 15:45:35 +11:00
Leon Friedrich 364c9b7f0a
DamageableSystem cleanup & performance improvements (#20820) 2023-10-09 03:27:41 +11:00
DrSmugleaf a44fa86b68
Update trivial components to use auto comp states (#20539) 2023-09-28 16:20:29 -07:00
metalgearsloth 5a0fc68be2
Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
metalgearsloth 3ab346f471
Remove Ammo component references (#19537) 2023-08-31 14:33:28 -07:00
TaralGit 8acac895fc
(Re)Adds open bolt animations for gun sprites (#17219)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-08-13 15:58:07 +10:00
metalgearsloth 0f917d22d7
Color flash effect fixes (#18952) 2023-08-10 10:44:52 -07:00
Slava0135 53db6bc265
Examine throwable damage (#18580) 2023-08-07 19:09:35 +10:00
metalgearsloth a5ed3af5b1
Gun cleanup (#18682) 2023-08-05 12:49:27 +10:00
Slava0135 d4c8065e8a
Move and rename damage effect to color flash effect (#18263)
* move damage effect to different package

* rename to ColorFlashEffect

* renaming some other things
2023-08-01 19:02:54 +03:00
Arendian 2c5f202dca
Eject casings some distance from the gun (#18081)
Makes bullet casings launch a bit away from you when shooting a gun. Cycling still drops it at your feet.

---------

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-07-29 14:07:31 -07:00
Arendian 580d481710
Make clumsy entities able to shoot funny weapons (#18156)
* Make clumsy entities able to shoot funny weapons

* remove unneeded line
2023-07-19 15:22:07 -06:00
metalgearsloth 68480af109
Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00
Chief-Engineer 9b1d587235
add reflect logs (#17006) 2023-06-01 15:57:31 +10:00
metalgearsloth cd487b66e4
Content mapmanager query changes (#16894) 2023-05-28 23:22:44 +10:00
Chief-Engineer 0053ddb8f8
fix hitscan log (#16884) 2023-05-28 17:01:08 +10:00
metalgearsloth 552fbb0585
Adds grappling gun (#16662) 2023-05-27 14:15:15 +10:00
metalgearsloth 347dcfbeb5
Add reflection for crystals (#16426) 2023-05-15 15:21:05 +10:00
metalgearsloth 6417bb4fa0
Proto-kinetic crusher (#16277)
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
2023-05-14 13:15:18 +10:00
Kara ab6707aef6
Give monkeys clumsy (#16320) 2023-05-11 10:27:47 +10:00
metalgearsloth 06efff2b2d
Flare gun 1984 (#15807) 2023-05-04 12:46:02 +10:00
metalgearsloth d51d74d934
Content fixes for timeoffsets (#15934) 2023-05-01 14:49:25 +10:00
Leon Friedrich 9513ea66e4
ECS BatteryComponent (#15337) 2023-04-19 20:10:08 +10:00
Slava0135 6412289334
Make energy sword reflect projectiles and hitscan shots (#14029) 2023-04-02 23:48:32 +10:00
deltanedas 27e5fe5767
pneumatic cannon fixes (#14705)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-03-25 16:15:46 -07:00
metalgearsloth 330bb7bb14
Remove gun .Owners (#14585) 2023-03-11 20:08:22 +11:00
metalgearsloth c90f48a220
Nerf bullet impulses (#14145) 2023-02-23 12:37:57 +11:00
Chief-Engineer 546c3fb5dd
add clumsy deletion logs (#14172) 2023-02-18 23:38:38 -06:00
Ilya Chvilyov eae58211e1
Separated Bonk functionality and component from ClimbSystem and ClimbComponent (#13635) 2023-01-31 17:33:00 -04:00
metalgearsloth bf79d76666
Content update for ECS physics (#13291) 2023-01-15 15:38:59 +11:00
Nemanja faca40b8d5
more component ref removal + combining server/client comps (#13178)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2022-12-25 05:28:21 +01:00
Leon Friedrich 881a2b2ece
PopupSystem public methods rejig (#12830) 2022-12-19 08:41:47 +11:00
Chief-Engineer 388d186fc7
Add stamina logs (#12921) 2022-12-12 15:21:15 +11:00
Leon Friedrich bc7754a70d
Fix projectile exception (#12956) 2022-12-11 09:56:09 +11:00
Leon Friedrich 7ee2f15a14
Fix projectiles not inheriting velocities from the shooter/gun. (#12854)
Fixes https://github.com/space-wizards/space-station-14/issues/12852
2022-12-10 14:45:18 +11:00
metalgearsloth fb3f6fa80f
Predicted stamina (#12413)
* Predicted stamina

Needed to do some semblence of predicted melee.

* Okay now done.

* Pause support

* Comment
2022-11-08 14:34:07 -06:00
metalgearsloth 5373fec641
Fix a bunch of warnings (#11965)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-10-16 08:44:23 -07:00
Paul Ritter 79854e59a4
adds a source uid to most damage & mobstate events (#11559)
Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>
2022-10-08 12:15:27 +02:00
metalgearsloth f51248ecaa
Melee refactor (#10897)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-09-29 15:51:59 +10:00