]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Catchable items, playable basketball (#37702)
authorslarticodefast <161409025+slarticodefast@users.noreply.github.com>
Sun, 6 Jul 2025 16:54:20 +0000 (18:54 +0200)
committerGitHub <noreply@github.com>
Sun, 6 Jul 2025 16:54:20 +0000 (09:54 -0700)
commit22e3d533d3c38597423588b9f21446d434cc3221
tree09d839d69abbd8dfd0725bcfe418205235e2c5fb
parentcb21b726004b422e105f7b7bf89cef6b5f75543e
Catchable items, playable basketball (#37702)

* catching

* fix

* improve

* fix linter

* cleanup

* fix prediction

* do the same here

* fix comment
16 files changed:
Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
Content.Shared/Clumsy/ClumsyComponent.cs
Content.Shared/Clumsy/ClumsySystem.cs
Content.Shared/Random/Helpers/SharedRandomExtensions.cs
Content.Shared/Throwing/CatchAttemptEvent.cs [new file with mode: 0644]
Content.Shared/Throwing/CatchableComponent.cs [new file with mode: 0644]
Content.Shared/Throwing/CatchableSystem.cs [new file with mode: 0644]
Resources/Locale/en-US/bonk/components/bonkable-component.ftl [deleted file]
Resources/Locale/en-US/chemistry/components/hypospray-component.ftl
Resources/Locale/en-US/clown/components/clumsy-component.ftl [new file with mode: 0644]
Resources/Locale/en-US/throwing/catchable.ftl [new file with mode: 0644]
Resources/Locale/en-US/weapons/ranged/gun.ftl
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Resources/Prototypes/Entities/Mobs/Player/guardian.yml
Resources/Prototypes/Entities/Objects/Fun/toys.yml
Resources/Prototypes/Roles/Jobs/Civilian/clown.yml