juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,784 Commits 57 Branches 0 Tags
655cba76746584537d3937231865c5ebfc849664
Commit Graph

31 Commits

Author SHA1 Message Date
Ed
9d6e023bd0 Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2 
# Conflicts:
#	Content.Client/Administration/AdminNameOverlay.cs
#	Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
#	Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
#	Content.Client/SubFloor/SubFloorHideSystem.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
#	Content.Server/Antag/AntagSelectionSystem.cs
#	Content.Server/Cloning/CloningSystem.cs
#	Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
#	Content.Server/GameTicking/Rules/ParadoxCloneRuleSystem.cs
#	Content.Server/Roles/ParadoxCloneRoleComponent.cs
#	Content.Shared.Database/LogType.cs
#	Content.Shared/CCVar/CCVars.Interface.cs
#	Content.Shared/Cloning/CloningEvents.cs
#	Content.Shared/Cloning/CloningSettingsPrototype.cs
#	Content.Shared/Humanoid/NamingSystem.cs
#	Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
#	Content.Shared/Light/Components/SunShadowCycleComponent.cs
#	Content.Shared/Storage/StorageComponent.cs
#	Resources/Changelog/Admin.yml
#	Resources/Changelog/Changelog.yml
#	Resources/Credits/GitHub.txt
#	Resources/Locale/en-US/paradox-clone/role.ftl
#	Resources/Maps/bagel.yml
#	Resources/Maps/loop.yml
#	Resources/Prototypes/Chemistry/mixing_types.yml
#	Resources/Prototypes/Datasets/Names/last.yml
#	Resources/Prototypes/Entities/Effects/puddle.yml
#	Resources/Prototypes/Entities/Mobs/Player/clone.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
#	Resources/Prototypes/Entities/Objects/Devices/pda.yml
#	Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Objectives/paradoxClone.yml
#	Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
#	Resources/Textures/Clothing/Eyes/Glasses/jensen.rsi/equipped-EYES-arachnid.png
 2025-03-31 12:41:37 +03:00
SlamBamActionman
85a6ac90ba Add stamina and mob damage playtest modifiers (#35599) 
* Add stamina and mob damage playtest modifiers

* Fix typo

* Add FTL

* Review fixes

* Update Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-03-21 00:01:35 +01:00
Ed
9f798b4f6c Sprint loadout action (#698) 
* SpellStorage restruct

* Update CP14SpellStorageSystem.cs

* Sprint
 2025-01-05 17:46:54 +03:00
Ed
36d02fdf6e Magic spells code expansion (#692) 
* split manacost in separate component

* stamina spells

* toggleable actions

* swap activeCasting on ActiveDoAfter

* remove dublication

* Update CP14SharedMagicSystem.ToggleableActions.cs

* EntityWoldTarget

* mana glove done

* fix spell scrolls interrupting

* fix cooldown problem

* clean up, edit stamina system
 2025-01-04 21:35:59 +03:00
Plykiya
961a553fa2 Fix stun batons using excess charges when thrown (#30136) 
Fix stun batons

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-18 10:48:08 +10:00
Nemanja
8a95cb186c Remove AlertType and AlertCategory (#27933) 2024-05-23 22:43:04 -04:00
Tayrtahn
4a83c36585 Code cleanup: Dirty(Comp) (#26238) 
* Replaced uses of Dirty(Component) with Dirty(Uid, Component)
Modified some systems (notably pulling-related) to use uids.

* Missed a few

* Revert changes to pulling

* No
 2024-03-19 23:27:02 -04:00
Pieter-Jan Briers
e00f74505c Use new ComponentPauseGenerator (#25183) 
Also includes some (non critical) changes to the solution file to re-organize the Roslyn components.
 2024-02-26 14:36:19 +11:00
Callmore
5a2c744998 Tiny shove fix. (#25353) 
* Remove second shove check.

* Change when popups and sounds are created.
Reduces phantom shoves that feel bad.

* why didn't i think of this i saw it earlier...

* Replaced Is fields with prefix

* remove some dependencies to fix tests???
 2024-02-21 15:01:45 +11:00
Dakamakat
b80f7eed6e Make throwable star damage stamina (#23527) 
* feat(star.yml): make throwable star damage stamina

* feat(Components): add new StaminaTresholdDamageOnEmbedComponent

* feat(SharedProjectileSystem): update system with new events to change
stamins treshold on embeed projectile remove / add

* feat(StaminaSystem): update system with new subscriptions

* feat(throwing_stars): update yml with new component

* feat(StaminaDamageOnEmbed): add stamina damage on embeed

* cleanup unused / ajust numbers

* fix(StaminaSystem / OnEmbedComponent ) apply requested changes

* Rest of the review

* another warning

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-01-14 20:10:50 +11:00
metalgearsloth
269c93245d Unrevert audio (#21330) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2023-11-27 22:12:34 +11:00
metalgearsloth
5b8f3c48c4 Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed Content audio (#20862) 2023-10-29 14:58:23 +11:00
DrSmugleaf
a44fa86b68 Update trivial components to use auto comp states (#20539) 2023-09-28 16:20:29 -07:00
PixelTK
109222e5d5 unhardcode the stun time (#19396) 2023-08-21 14:18:57 -04:00
Errant
7a702221ef fix attack stamina cost check (#18872) 
Co-authored-by: Errant <35878406+errant@users.noreply.github.com>
 2023-08-14 09:10:15 -07:00
Doru991
c90de7c743 Fix stamina indicator on rejuvenate (#18914) 2023-08-13 01:26:45 -06: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
b49f0df05e fix reflected projectiles dealing stamina damage (#17648) 2023-08-06 23:44:41 +10:00
deltanedas
af8302445d stimulants increase stamina (#18754) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-08-06 21:06:23 +10:00
metalgearsloth
aa8efc9a26 Melee rebalancing (#17520) 2023-08-06 12:55:38 +10:00
metalgearsloth
a5e264a75e Fix stamina popup spam (#16991) 2023-06-01 00:24:06 +10:00
metalgearsloth
d51d74d934 Content fixes for timeoffsets (#15934) 2023-05-01 14:49:25 +10: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
Kara
48cefca4e4 Godmode refactor (#14651) 2023-03-23 14:57:15 -04:00
metalgearsloth
49c7c0f9a7 Remove stamina + damageable .Owner (#14602) 
* Remove stamina + damageable .Owner

* More
 2023-03-12 09:19:05 -04: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
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
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