Commit Graph

47 Commits

Author SHA1 Message Date
metalgearsloth
5a0fc68be2 Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
deltanedas
91cfabd6f6 light refactoring/rework (#19314)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-03 22:31:10 -07:00
DrSmugleaf
a88e747a0b Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
metalgearsloth
0f917d22d7 Color flash effect fixes (#18952) 2023-08-10 10:44:52 -07:00
Slava0135
375f487d94 Fix stun baton throwing and visual effect (#18777) 2023-08-08 12:19:31 -08:00
Slava0135
53db6bc265 Examine throwable damage (#18580) 2023-08-07 19:09:35 +10:00
Errant
999fa62538 Fix energy swords healing blunt (#18753)
* esword fix

* comment
2023-08-06 02:19:32 -06:00
metalgearsloth
aa8efc9a26 Melee rebalancing (#17520) 2023-08-06 12:55:38 +10:00
Nemanja
6db6b423f4 official security anti-inflatable armament (#18634) 2023-08-03 19:53:06 -06: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
metalgearsloth
68480af109 Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00
FacePluslll
422a84e029 Adds Double bladed Esword (#17227)
* Changed Energy Sword system to allow Wieldable eswords

Needed to add conditions to allow the wielding system to handle the esword if the component existed in the entity. The normal eswords work just fine still.

* Adds sprites for double bladed esword

* added double bladed esword to yml

* Add double bladed esword to uplink catalog

* fixed sprites on right handed wielding

* decresed speed a little and added a wielding time

* Reduced damage

* Damage change

* Balence change

* edited attack speed and heavy windup

* fixed readability issue and removed unwanted brackets

* reflectProp to .75

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* wieldTime to 0

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* litDisarmMalus to .7

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* changed heat and slash damage to 9 and structural damage to 20

* changed uplink desc

---------

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
2023-06-18 15:35:23 -04:00
Nemanja
37d3056809 Events all over melee (#16997) 2023-06-07 13:26:45 -07:00
brainfood1183
c99585c94f Toy Box filled with toys (ready for merge) (#16252) 2023-06-03 13:31:47 +10:00
HerCoyote23
c694ecccac Fix northstar radio exploit (#16967) 2023-05-31 11:11:35 +10:00
Nemanja
dd044f4a91 Make melee damage not go through MeleeHitEvent.cs (#16881)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-05-28 17:03:25 +10:00
HerCoyote23
e45dd96af9 Northstar Gloves (#16021)
* Added Gloves of North Star, no sprite or talking yet...

* Added sprites for the gloves of the north star...

* Replaced more placeholder sprites for northstar gloves...

* Added gloves of the north star to uplink...

* Added speech on hit, not yet configureable

* Not functional yet, but a step in the right direction I hope...

* IT WORKS!!

* Licensing and cleanup

* Reduced attack speed, changed from chat to popup, added some admin logging. It was causing too much adminlog spam otherwise

* Reorganized some files, final build??

* Changed the adminlog type from Verb to new type ItemConfigure

* More cleanup, fix sprite reference maybe

* Keronshb's suggestions, fixed some stuff, made hit sound use the meaty punch sfx

* Adds support for hiding speak/whisper/emote from adminlogs, makes northstar speak again!

* Some file shuffling, some of Keronshb's requests. Might appear a bit funky in github because vscode kept duplicating files for some reason and I had to delete them

* Made it work with the latest changes on Master

* Final? cleanup, upped dmg to 8, made ui not activate on activateinhand, instead you need to right click

* Set value to 0 credits, that's all

* Well that was much easier than I made it out to be. Now you can only activate the gloves with right click, no more mispredicts.

* Update MeleeWeaponSystem.cs

Iunno why this got changed in the first place, but I'm changin it back

* emptycommit

* emptycommit

* The tiny fixening
2023-05-23 14:12:30 -04:00
metalgearsloth
9946cbd7fe Predict wielding (#16275) 2023-05-10 10:01:23 +10:00
metalgearsloth
f917440301 Lag compensation for wide attacks (#15877) 2023-05-01 15:07:17 -04:00
Chief-Engineer
8704707dbd Fix incorrect source weapon in stamina damage logs (#15778)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-04-27 11:56:51 -07:00
metalgearsloth
ae01618874 Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566) 2023-04-20 20:16:01 +10:00
metalgearsloth
acf79a8209 Revert "Replace ResourcePath with ResPath (#15308)" (#15551) 2023-04-20 11:43:54 +10:00
Ygg01
71f358a027 Replace ResourcePath with ResPath (#15308) 2023-04-19 23:39:17 +10:00
deltanedas
27bdc5d4b5 prevent nettles from injecting through hardsuit (#14895)
* prevent nettles from injecting through hardsuit

* pro

* better

* pro

* pro

* noob

* inject popup

* caution

* )

* ;

* 💀

* 💀

* scaf + bomb suit immune to nettle

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-04-10 19:19:43 -07:00
metalgearsloth
317a4013eb Puddles & spreader refactor (#15191) 2023-04-10 15:37:03 +10:00
DrSmugleaf
34bcd042d1 Remove combat mode component reference (#15206) 2023-04-08 13:16:48 -07:00
DrSmugleaf
b947856431 Remove hands component reference (#15197) 2023-04-07 11:21:12 -07:00
Slava0135
6412289334 Make energy sword reflect projectiles and hitscan shots (#14029) 2023-04-02 23:48:32 +10:00
Nemanja
49f7575298 Cuffable/Handcuff ECS (#14382) 2023-03-13 19:34:26 -04:00
metalgearsloth
e93d5113ad Remove .Owner from melee weapons (#14600) 2023-03-12 15:56:05 +11:00
metalgearsloth
44fb8a9e2d Fix rsi sprite access for verbs (#14284) 2023-02-26 18:48:57 +11:00
Vordenburg
4183b5f449 Fire MeleeHitEvent on misses. (#12867)
* Fire MeleeHitEvent when there are no targets.

* Prevent certain weapons from activating if they had no hit entities on hit.

* Prevent miss events from firing when target is yourself or was deleted.

* Use .Value as Target is already known not to be null.

* uid changes

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-02-13 12:55:39 +00:00
dontbetank
299180bf16 Small syndicate gear tweak (#13284) 2023-01-20 08:11:24 -08:00
Leon Friedrich
466384b081 Solution rejig (#12428) 2023-01-12 14:41:40 +11:00
Leon Friedrich
881a2b2ece PopupSystem public methods rejig (#12830) 2022-12-19 08:41:47 +11:00
metalgearsloth
d17cee61e0 Predicted melee sounds and effects (#12569)
I didn't want to do this without lag comp. Need to see how it goes in a live environment with moving targets.
2022-11-13 15:33:54 -06:00
Rane
6c95c8d165 fix shove regression (#12316) 2022-11-08 15:10:59 -06: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
rolfero
e3579c99f5 combined MeleeHitEvent and ItemMeleeDamageEvent (#11628)
Co-authored-by: CommieFlowers <rasmus.cedergren@hotmail.com>
2022-11-03 23:01:08 +11:00
Rane
8f4bd8b83b fix MeleeChemicalInjector exploits (#12305) 2022-10-31 13:04:51 +11:00
Rane
9e917d44fe [3 lines] fix damage origin (#12195) 2022-10-30 18:39:38 +11:00
Leon Friedrich
c0b657ca18 Remove InteractedWithEvent and friends. (#11939) 2022-10-26 12:15:48 +11:00
metalgearsloth
123a9dbf02 Lag compensation for melee (#11885)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-10-17 15:54:31 +11:00
metalgearsloth
a93d6eb5b6 Fix CanDisarm (#11843) 2022-10-14 23:14:07 -05:00
metalgearsloth
c555203401 Use nearest edge for interaction range (#11660)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-10-07 00:37:21 +11:00
metalgearsloth
d5c0093db1 Re-implement itemmeleedamage (#11595) 2022-09-29 17:41:43 +10:00
metalgearsloth
f51248ecaa Melee refactor (#10897)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-09-29 15:51:59 +10:00