Commit Graph

278 Commits

Author SHA1 Message Date
Spatison
698c6a1079 Merge pull request #1076 from Spatison/battle-ship
Battle ship
2026-03-06 12:13:42 +02:00
metalgearsloth
8d309e8699 Fix water postshader (#28130)
(cherry picked from commit 93f289c7dc94e0aa280b1b8544f8b9ba575d5294)
2026-02-10 15:45:23 +03:00
vanx
c108c7c617 [Add] Pull Attempt Cooldown (#975)
* no locking

* review

* Update Resources/Locale/en-US/_white/grab/grab.ftl

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: vanx <vanxxxx@discord>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
2025-12-31 15:42:56 +03:00
vanx
9b31a2fee5 [Fix] Shove Breaking Grab (#978)
no escape

Co-authored-by: vanx <vanxxxx@discord>
2025-12-31 14:32:53 +03:00
vanx
e9740407bb Revert "[Add] Inertia 1.0 (#979)" (#988)
This reverts commit 8ccefa558d.

Co-authored-by: vanx <vanxxxx@discord>
2025-12-30 17:00:31 +03:00
vanx
8ccefa558d [Add] Inertia 1.0 (#979)
inertia 1.0

Co-authored-by: vanx <vanxxxx@discord>
2025-12-29 17:27:54 +03:00
mubururu_
9d64ebdbae silent footsteps for ninja (#33280)
* waow

* nice suggestion

* nullable sound

* fix stuff

---------

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

(cherry picked from commit 4ddd7d3c5f514e667f5caf4c28b5710542cfe75c)
2025-09-27 12:50:15 +03:00
Golinth
d70bb4ff3a Fully Revert Clown Waddling (#32652)
Fully revert Clown Waddling (revival of #29161)

A sad day, see #29156 for discussion

(cherry picked from commit 46a2eb545e39a63f48b8da3d1fa78da47e0f6db2)
2025-09-20 20:33:05 +03:00
SlamBamActionman
1e4f252bb0 Hristov & .60 changes - Hristov Rework, Part 2 (#31662)
* Initial commit

* Updated values to reflect new resistances

* Review fixes

* Review fixes

* LINQ BEGONETH

(cherry picked from commit e58d0313002350cd7d9ed24ea390e0cb5724a662)
2025-09-20 18:52:19 +03:00
SlamBamActionman
bd28f7f0dd Add conditional camera offset based on cursor - Hristov Rework, Part 1 (#31626)
(cherry picked from commit 5c782d30283d5e3661e1ce6ebc6d972f12671c41)
2025-09-20 18:51:05 +03:00
Leon Friedrich
06c2a16480 Allow zoom command to modify an eye's PVS range (#29245)
Allow zoom command to modify an eye's PVS range

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

(cherry picked from commit 1faa1b5df6e74b9cb1309d0400b12ee0b96039e4)
2025-09-20 12:54:38 +03:00
DrSmugleaf
3019299bdb Fix camera recoil system overriding all other eye offsets (#29146)
(cherry picked from commit c6d718d126f0772854bd821b8f91d8d912e1db5d)
2025-09-20 12:54:37 +03:00
Spatison
462ecb429e [Tweak] Hud UI (#834)
* combat mode ui

* movement ui

* some fix

* fix

* more fix

* fix
2025-09-13 17:38:24 +03:00
Spatison
0ef438d5c6 [Fix] Grab (#746)
* fix grab

* -_-
2025-08-04 20:26:41 +03:00
Spatison
62d4ba308f [Feature] Xenomorphs Part 1 (#716)
* init commit

* xenomorph: part 1

* weed heal

* fix Rsi

* fix Yaml linter

* fix
2025-07-27 18:11:03 +03:00
ElectroJr
ad6b81233d Refactor map loading & saving (#34020) 2025-07-20 20:34:12 +10:00
metalgearsloth
c66688f8c5 Add delay to AutoOrient (#33479)
It functions identically to how V1 of orientation worked and it's incredibly annoying.

(cherry picked from commit 11dbf50ed62040c832941f3c46fc159497eca525)
Signed-off-by: Spatison <137375981+Spatison@users.noreply.github.com>
2025-07-20 15:10:18 +10:00
Errant
d33556daf1 movercontroller namespace (#31749)
(cherry picked from commit 1c6b9aaae7b2dd64ca7e53aeeeb8ebb1438adb4a)
2025-07-20 14:14:34 +10:00
Nemanja
d98012880a offgrid mob friction (#29383)
* offgrid mob friction

* save the world...

(cherry picked from commit 2528231ad194cbb973942a8e6ad5cae70e1c1ab4)
2025-07-20 14:14:34 +10:00
DrSmugleaf
24a921929a Use EntityQuery for footstep modifier and map grid in SharedMoverController (#30575) 2025-07-20 14:14:34 +10:00
Tirochora
1156acd2f4 No More Instant Grab Combos (#2199)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

So, as it stands before this PR, somebody could do a combo like, say,
the judo throw, by ctrl-clicking and then instantly rightclicking,
throwing somebody else to the ground within the blink of an eye. With
this PR, that shouldn't happen - grabbing follows the same rules as
attacking (either punching or shoving), and uses the same cooldown.

---

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] Grabbing people puts your unarmed attacks on cooldown
- [x] Unarmed attacking someone puts your grab on cooldown

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

https://github.com/user-attachments/assets/22d4eadb-2ec1-4e6c-9ad3-dbdd36c6f3cd

</p>
</details>

---

<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

🆑
- tweak: grabbing somebody mid-combo now obeys the same laws as every
other attack, so no more instant judo throws

---------

Co-authored-by: VMSolidus <evilexecutive@gmail.com>
2025-07-20 13:18:01 +10:00
SlamBamActionman
a48507664d Add Galoshes slowdown over slippery surfaces (#30967)
* first draft

* Fixed it all, just need to rename stuff

* Rename and add comments

* Clean-up

* Access added
2025-07-19 17:37:55 +10:00
Nemanja
1408d6c712 Replace IClickAlert with events (#30728)
* Replace IAlertClick with events

* whoop

* eek!
2025-07-19 11:12:44 +10:00
Spatison
a81887ce45 return _popup into PullingSystem 2025-07-14 14:14:01 +10:00
Cojoke
8c6a64e5ac Remove all Assigned Values that are Never Used (#30110)
Remove all Assigned Values that are never used

(cherry picked from commit b57174007c8d455d10cfa6a2e8563993e935838e)
2025-07-14 14:13:59 +10:00
Plykiya
91415877c4 Fixes objects changing physics behavior after being pulled (#29694)
* Fixes pull rotation logic

* cleaner condition

* even less code

* I CHANGED MY MIND

* first one

* second one

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
(cherry picked from commit 48ae8ce0a88d0ecfcb48d22cfa103405ddbd7d63)
2025-07-14 14:13:58 +10:00
Leon Friedrich
ad8285fdcb Fix RotateWhilePulling not working (#29032) 2025-07-14 14:13:58 +10:00
Nemanja
5868fdef1a make pulled uncuffing slower & reduce uncuff spam cooldown (#29008)
* prevent people being pulled from uncuffing themselves

* block -> modify duration

(cherry picked from commit d907e4ef577e6df595a77c7c87e5f864ee38ad0c)
2025-07-14 14:13:57 +10:00
metalgearsloth
489344aa01 Selectively revert PullController (#28126) 2025-07-14 14:11:34 +10:00
Tirochora
7e306e040e Clean Up Tableslam + Strangling Bugfix (#2247)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Previously, the "TryStopPull" function didn't make you drop a
virtualitem if you were strangling somebody, meaning that you could lose
use of a hand until disarmed because it would still consider you to be
holding the person. I fixed that, as well as additionally cleaned up the
table slam system, which should make it run a bit smoother and be
functionally about the same. The "tableable" and "posttabled" components
were removed, because they shouldn't have existed in the first place.
The only notable non-bugfix change that's player facing is that shoving
people who are knocked down on any climbable entity stuns them (as
opposed to just tables), but it's a rather minor change and I intend on
reworking it pretty heavily once my [other
PR](https://github.com/Simple-Station/Einstein-Engines/pull/2199) is
reviewed. On the backend, I added an optional variable to "TryClimb"
that gives you an option to skip the do-after. If it's possible to
change these actions to be predicted, I'd be interested in learning how.

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [ ] Task
- [x] Completed Task

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

Note that glass tables do much more damage when slammed into, and even
more if they would shatter when attempting to climb it.


https://github.com/user-attachments/assets/bc0a12e3-0b67-4d61-aa4e-785e3210c3bb

</p>
</details>

---

# Changelog

<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

🆑
- tweak: Table slamming should be more consistent.
- fix: You should properly be able to use both hands after letting
somebody go from a stranglehold.
2025-07-12 01:48:19 +10:00
Leon Friedrich
7c9cb44466 Use non-generic TryComp() for metadata & transform (#28133) 2025-07-12 01:13:23 +10:00
RedFoxIV
0536fc8645 Fuselage rust stage 2 (#629)
* the definition of insanity

* the definition of insanity

* the definition of insanity

* we have hullrot at home

* maybe the real hullrot was the friends we made along the way

* john hullrot

* i am going to hullroooooot

* it's hullrotver

* we're so hullback

* we're rotting the hull with this one

* hullmerge

* the hullrot is leaking

* never gonna rot you up

* hullfresh

* john starsector

* god i wish we had grid collision damage

* you can tell I am very tired because I stopped forcing a hullrot joke into every commit message

* hr

* this is a surprise sprite that will help us later

* motherfucker

* i have nothing good to say

* still nothing

* brb

* random letter random letter random letter dash random number random number random number

* ass

* blast

* ffs

* fcuk

* RE: ffs

* RE: RE: ffs

* гнида жестяная

* continue

* i hate tests

* i love tests

* slide to the right

* i hate tests again

* what the fuck

* ты шиз?

* ??

* bbgun
2025-06-28 11:31:07 +03:00
vanx
1d6d86244f [Fix] CQC Combos (#595)
* karpik :D

* much smart

* cqc-restrain-disarm

* beno grab

* grab locale

* instagrab trollface

* break grab more intuitive

* Revert "instagrab trollface"

This reverts commit 5509cb71b1.

* kravmaga and stuff

---------

Co-authored-by: vanx <discord@vanxxxx>
2025-06-19 20:04:01 +03:00
RedFoxIV
7f33f5f733 Stab++ (#556)
* эмалированная репа

* локалка, ветка и коммит

* Компилить тяжело и неуютно

* Зато уютно набегать

* и тихо капает ОЗУ

* и гит растрёпанный, как блядь
2025-06-11 11:05:17 +03:00
VMSolidus
151e1b60a3 TCJ Makes A Rage Performance PR (#2298)
# Description

I got baited by Ectoplasm, so I then spent 3 hours shaving off a
sizeable chunk of this game's performance cost, including by taking 3 of
the "Top 10 frametime consumers", and reducing their performance costs
by 99% each. Along with various examples of slimming down some of the
worst EQE's.

Oh, and I fixed EmitSoundOnMove being desynced with actual movement. As
part of making EmitSoundOnMove use 99% less CPU time, it was also
synchronized with the MoverController.

# Changelog

🆑
- fix: Fixed items such as tactical webbing, bell collars, and hardsuits
being desynced with character movement.
- tweak: Made various large performance improvements.

(cherry picked from commit 684e8175443167beb0e20e3323a05b5f493b3374)
2025-04-26 11:45:35 +03:00
DEATHB4DEFEAT
7809e1a0e8 Fix Friction without Input (#2289)
Problem I had on Parkstation, ported the fix here.

Co-authored-by: VMSolidus <evilexecutive@gmail.com>
(cherry picked from commit 6061334d37f3bf89522da9703b607d86d7e67a5b)
2025-04-26 11:40:43 +03:00
Spatison
2a10c02eb5 No spead merge (#475)
* Revert "[GoobPort] WIZ REAL (#465)"

This reverts commit 091a8ff433.

* fix local
2025-04-26 10:50:32 +03:00
Kai5
091a8ff433 [GoobPort] WIZ REAL (#465)
* Уэээээээ

* Почти настрадались

* Скоро конец....

* СКОРО

* Мышки плакали, кололись, но продолжали упорно жрать кактус

* Все ближе!

* Это такой конец?

* Книжка говна

* фиксики

* ОНО ЖИВОЕ

* Телепорт

* разное

* Added byond

* ивенты теперь работают

* Разфикс телепорта

* Свет мой зеркальце скажи, да всю правду доложи - Я ль робастней всех на свете?

* Разное

* Еще многа всего

* Многа разнава

* Скоро конец....

* ЭТО КОНЕЦ

* Фикс линтера (ну, или я на это надеюсь)

* Еще один фикс линтера

* Победа!

* фиксики

* пу пу пу

* Фикс подмастерья

* Мисклик

* Высокочастотный меч

* Неймспейсы

* Пул способностей мага
2025-04-26 10:18:58 +03:00
Remuchi
1e363c7346 Revert "Merge pull request #462 from WWhiteDreamProject/revert-460-upstream"
This reverts commit 092dba42e5, reversing
changes made to e6315c2320.
2025-04-20 11:15:45 +07:00
DVONIKS
6c19771020 Revert "Upstream 04.04-18.04" 2025-04-20 06:34:09 +03:00
DVONIKS
2276380a11 Merge branch 'master' into upstream 2025-04-20 06:24:21 +03:00
Spatison
ec38403b0a [Fix] Grab (#443)
aaa?
2025-04-20 06:18:24 +03:00
dootythefrooty
717f8404f0 Abductor Port (#2234)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Ports the lone abductor and possibly(?) the duo abductors.

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [X] Figure out why abductors aren't spawning as the abductor race.
- [X] Make sure it's not a buggy mess.

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

![image](https://github.com/user-attachments/assets/81292bde-ad96-4d08-a30e-87c9bc2df8aa)
</p>
</details>

---
# Credits
Thank to [Starlight ](https://discord.com/invite/wAyQKB78fH)for the
original version!
Darkrell, Rinary, and Landosaur made the funny little guys.

![image](https://github.com/user-attachments/assets/1c62afe9-7fb9-458e-bc61-5745ba3a2a6b)

# Changelog

<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

🆑 Darkrell, Rinary, Landosaur
- add: The Abductors are here to replace your organs. Gleep Glorp!

---------

Co-authored-by: gluesniffler <159397573+gluesniffler@users.noreply.github.com>
Co-authored-by: Solstice <solsticeofthewinter@gmail.com>
Co-authored-by: SX_7 <sn1.test.preria.2002@gmail.com>
Co-authored-by: Theodore Lukin <66275205+pheenty@users.noreply.github.com>
Co-authored-by: Piras314 <p1r4s@proton.me>
Co-authored-by: Ilya246 <57039557+ilya246@users.noreply.github.com>

(cherry picked from commit ea9f1526868289d20832989cb02f79c76c240918)
2025-04-19 01:45:58 +03:00
Spatison
c6a49526bb [Fix] Grab (#420)
* fix

* fix
2025-04-12 08:51:50 +03:00
BramvanZijp
724e055054 Port LRP Martial Arts Grabbing changes
(cherry picked from commit 513b165f070bf482784467be54ccf5272aa1669f)
2025-03-29 16:16:59 +03:00
BramvanZijp
ce17dda96d Update PullingSystem.cs
Signed-off-by: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com>
(cherry picked from commit 2fb9e1d69ed18210dcfabbdcd674ab3e20490ae4)
2025-03-21 18:19:46 +03:00
BramvanZijp
80ae93bfc0 Update PullerComponent.cs
Signed-off-by: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com>
(cherry picked from commit f5ede948dc5a31002cd0c31be304b074c07257f6)
2025-03-21 18:19:41 +03:00
BramvanZijp
872bccc602 Reduce stamina damage dealt when throwing, add a cooldown after grabbing before you can throw.
(cherry picked from commit 41b34411b38f3df7e1ef8cd92d460704e9a9bb2a)
2025-03-21 18:19:37 +03:00
vanx
5f9992d534 did i ever tell just how much i love //WWDP 2025-03-11 17:28:56 +03:00
vanx
4fc5b0fe70 input lol somethign something 2025-03-11 15:52:09 +03:00