Commit Graph

59 Commits

Author SHA1 Message Date
Kai5
ae1c1c39dd Port Devil (#2454)
<!--
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]?
-->

This PR ports
https://github.com/Goob-Station/Goob-Station/pull/2409
https://github.com/Goob-Station/Goob-Station/pull/2591
https://github.com/Goob-Station/Goob-Station/pull/2599

This PR was initially intended to be merged into White Dream repo, so my
changes are marked as WD edit.

<!--
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
-->

- [ ] Port pain numbness
- [ ] Port nullrods
- [ ] Port tile movement

---

<!--
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/ee4679d1-fc07-4dc3-8063-e0220bc0d728)

![image](https://github.com/user-attachments/assets/25f590b9-6bf3-43bd-aca3-80452f27b0dd)

![image](https://github.com/user-attachments/assets/1ffb5bb3-e0c7-4827-8193-83bd8480e555)

![image](https://github.com/user-attachments/assets/4ed8c762-1e51-4bd8-9800-6495c12ac68f)

</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
-->

🆑
- add: Ported Devil antag from Goobstation

---------

Signed-off-by: Kai5 <68296202+Kai518@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: Solstice <solsticeofthewinter@gmail.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
2025-07-20 13:37:35 +10:00
Kyoth25f
ed2301f840 Port Blob (#2441)
Ports Blob from https://github.com/Goob-Station/Goob-Station/pull/975
that was ported from https://github.com/Rxup/space-station-14.

Credit to VigersRay for original code, Roudenn and Rxup for maintaining
and jorgun for the Goob port.

---

- [X] Port https://github.com/Goob-Station/Goob-Station/pull/975;
- [X] Port https://github.com/Goob-Station/Goob-Station/pull/1209;
- [X] Port Blob related code from
https://github.com/Goob-Station/Goob-Station/pull/1262;
- [X] Port Blob related code from
https://github.com/Goob-Station/Goob-Station/pull/1340;
- [X] Port https://github.com/Goob-Station/Goob-Station/pull/1408;
- [X] Port https://github.com/Goob-Station/Goob-Station/pull/1419;
- [X] Port https://github.com/Goob-Station/Goob-Station/pull/1440;
- [X] Port https://github.com/Goob-Station/Goob-Station/pull/1817;
- [X] Port https://github.com/Goob-Station/Goob-Station/pull/2077;
- [ ] ~Port https://github.com/Goob-Station/Goob-Station/pull/1916~;
- [ ] ~Port https://github.com/Goob-Station/Goob-Station/pull/1917~;
- [X] Port https://github.com/Goob-Station/Goob-Station/pull/2077;
- [X] Port https://github.com/Goob-Station/Goob-Station/pull/2092;
- [X] Port https://github.com/Goob-Station/Goob-Station/pull/2546;
- [X] Port https://github.com/Rxup/space-station-14/pull/963;
- [X] Port https://github.com/Rxup/space-station-14/pull/998;
- [ ] ~Port https://github.com/Goob-Station/Goob-Station/pull/2563~.

- [X] Enable Blob and Blob gamemode;
- [X] Add `StationGlobConfig` to all stations;
- [X] Use `AnnouncerSystem` in `BlobRuleSystem.cs`;
- [X] Blob language and Hivemind (from
https://github.com/Rxup/space-station-14/pull/176);
- [x] Change CVars location;
- [X] Add media.

---

<details><summary><h1>Media</h1></summary>
<p>
https://youtu.be/-WtMQwRcmrU?si=su3An6RtiCTZg-DV
</p>
</details>

---

🆑 VigersRay, Roudenn, Rxup, vladospupuos, fishbait and Kyoth25f
- add: Added a new antagonist: Blob

---------

Co-authored-by: fishbait <gnesse@gmail.com>
Co-authored-by: Fishbait <Fishbait@git.ml>
Co-authored-by: Aiden <aiden@djkraz.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: lanse12 <cloudability.ez@gmail.com>
Co-authored-by: BombasterDS <deniskaporoshok@gmail.com>
Co-authored-by: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Co-authored-by: Piras314 <p1r4s@proton.me>
Co-authored-by: shibe <95730644+shibechef@users.noreply.github.com>
Co-authored-by: Ilya246 <57039557+Ilya246@users.noreply.github.com>
Co-authored-by: JohnOakman <sremy2012@hotmail.fr>
Co-authored-by: Fat Engineer Gaming <159075414+Fat-Engineer-Gaming@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Rouden <149893554+Roudenn@users.noreply.github.com>
2025-07-12 12:20:25 +10:00
ilmenwe
bfe577b9c7 Unused Varibles and Localization Fixes (#2424)
Removed all unused variables i could find, built and tested on a simple
upstart and clicking trough most systems.
Change Loc references to localization.

<!--
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>

"using Robust.Shared.Prototypes;"
to
""

"[dependency] private readonly ISpriteComponent"
to
""

</p>
</details>

---

No CL this isn't player facing.

---------

Co-authored-by: ilmenwe <no@mail.com>
2025-07-12 02:20:02 +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
Tirochora
99376bd079 Fix Krav Maga Applying Damage to All Melee Weapons (#2430)
<!--
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]?
-->

Minor bugfix to rectify one of the issues I inadvertently created with
my last accepted PR. I had forgotten to ensure that the melee damage
from the krav maga gloves only applies if you are attacking while
unarmed, so I changed that.

---

# 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>

[![Example Media
Embed](https://example.com/thisimageisntreal.png)](https://private-user-images.githubusercontent.com/177236654/435481955-6327338a-9f82-4f69-9c2e-8f752ebdf2e8.mp4?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3NDczMjU1MDUsIm5iZiI6MTc0NzMyNTIwNSwicGF0aCI6Ii8xNzcyMzY2NTQvNDM1NDgxOTU1LTYzMjczMzhhLTlmODItNGY2OS05YzJlLThmNzUyZWJkZjJlOC5tcDQ_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwNTE1JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDUxNVQxNjA2NDVaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT0xOGUzOGMzZDg4ZmI3NDAxYTEwOGVhYTQwMDY4ZTQ4NmZiYWM0ZjI2MDAwZTc4ZGQzZGNlMjg0NzU1NWYwNTEzJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.ukZhp8XbHJ6o5gyutuvA5Yg2AUwFhWC0p6267EcLb-I)

</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
-->

🆑
- fix: Krav Maga no longer  boosts all melee damage.
2025-07-12 01:48:18 +10:00
Will-Oliver-Br
345b8bcaf6 Port Cartridge Autoinjector (#2258)
Port cartridge autoinjector from
[Goob-Station](https://github.com/Goob-Station/Goob-Station).
Prs:
https://github.com/Goob-Station/Goob-Station/pull/953
https://github.com/Goob-Station/Goob-Station/pull/1021
https://github.com/Goob-Station/Goob-Station/pull/1085
https://github.com/Goob-Station/Goob-Station/pull/1798
https://github.com/Goob-Station/Goob-Station/pull/2298

---

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

![Captura de tela 2025-04-16
224533](https://github.com/user-attachments/assets/3fa566a7-75fe-4b6d-abd3-66a43a4a8f4c)

</p>
</details>

---

🆑 Aviu00, a-person5660, SolsticeOfTheWinter, pheenty, Will-Oliver-Br
- add: Added a medical and security cartridge autoinjector.

---------

Co-authored-by: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Co-authored-by: a_person <40855173+a-person5660@users.noreply.github.com>
Co-authored-by: Solstice <solsticeofthewinter@gmail.com>
Co-authored-by: Ted Lukin <66275205+pheenty@users.noreply.github.com>
2025-07-12 01:12:29 +10: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
4de68a4f4a changeling deez nuts (#557)
* no fun allowed

* халявы не будет

* ноу фан эллауд
2025-06-11 11:06:04 +03:00
vanx
963b98de14 [Tweak] Enough Dual Wielding (#562)
* dual bual

* misclick again

* so dumb

* firerape

---------

Co-authored-by: vanx <discord@vanxxxx>
2025-06-09 20:21:10 +03:00
Will-Oliver-Br
322dba921b Port Fishing 2.0 (#2416)
# Description

Continuation of this
[PR](https://github.com/Simple-Station/Einstein-Engines/pull/2398)

Port fishing from
[Goob-Station](https://github.com/Goob-Station/Goob-Station). Some PRs
from [Wizards](https://github.com/space-wizards/space-station-14) and
sprites from [TG](https://github.com/tgstation/tgstation).
Prs:
https://github.com/space-wizards/space-station-14/pull/30921
https://github.com/Goob-Station/Goob-Station/pull/1970
https://github.com/Goob-Station/Goob-Station/pull/2416

---

# TODO

- [x] Port fishing
- [x] Add more fish

---

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

![Captura de tela 2025-05-04
182540](https://github.com/user-attachments/assets/d6e7984a-b1a2-4dfd-92af-12e968e7e291)
![Captura de tela 2025-05-04
182739](https://github.com/user-attachments/assets/781f2c52-f053-4171-9af1-632979f841ac)

</p>
</details>

---

# Changelog

🆑 Rouden, Aidenkrz, Aviu, Will-Oliver-Br
- add: Added fishing.

---------

Co-authored-by: Rouden <149893554+Roudenn@users.noreply.github.com>
Co-authored-by: Aidenkrz <aiden@djkraz.com>
Co-authored-by: GoobBot <uristmchands@proton.me>
Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>
Co-authored-by: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

(cherry picked from commit e61def844e5d116d28c4a5ee4e88b1c5a2186937)
2025-05-10 00:57:56 +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
Tirochora
35bfe16766 Tirochora's Big Fat Combat Fix PR (#2239)
<!--
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]?
-->

Some of the martial arts have jank. A lot of jank, actually. CQC could
disarm people as long as they were in line of sight. Armbar, contrary to
what it said, didn't actually require people to be downed. You could
literally put on and take off a judo belt over and over again to
instagib people (and reduce your grab cooldown infinitely). Well, none
of that should happen anymore, courtesy of me. I've gone through and
compiled a list of bugs, notes, and changes I'd like to see to martial
arts, and this is the first of those. I added a function in
SharedmartialArtsSystem that allows a combo to require a specific grab
stage to activate.

---

# 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>

This is a video showcasing how when the person is not grabbed when I try
to input a judo throw, it doesn't work.

https://github.com/user-attachments/assets/909ba542-e310-42f9-afbd-6cddcf636da7

</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
-->

🆑
- fix: Lots of martial arts bugfixes
- tweak: Martial arts combos that require a grab require the target to
remain grabbed. Have fun landing judo throw.
- tweak: Adjusted the stamina damage of CQC's disarm and the effects of
CQC's kick combo.
- fix: Krav Maga properly gives you more unarmed damage.

(cherry picked from commit f38367cddf9ca2a0d5467af3c2a91b87022e9d26)
2025-04-18 19:44:48 +03:00
Kutosss
76bf1599b1 [PORT] Шприцеметы (#439)
* шприцеметы епта

* Update PacifismAllowedGunComponent.cs

* фикс

* Update tags.yml

* Update lathe.yml
2025-04-12 08:55:59 +03:00
Spatison
7ccd8f13bc Merge branch 'master' into upstream 2025-04-12 00:54:20 +03:00
TotallyNotAHSKveez
12f8fc504c [Tweak] CQC disarm (#441)
uh...
2025-04-12 00:48:32 +03:00
EctoplasmIsGood
344d24b05b Uplink Item Ports (#2128)
<!--
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 over a few items from Goob LRP, those being the dualettas, the
anaconda, and the pocket dimension plant pot

<!--
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/72f66056-7eb1-4c93-92f5-d35ad4fcaf01

</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
-->

🆑
- add: Added the dualettas, two stylish pistols that can be dual wielded
- add: Added the anaconda, a robust syndicate handcannon that
automatically generates ammo
- add: Added the Pocket Dimension Plant, a normal looking potted plant
that actually has a pocket dimension linked to it

---------

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Co-authored-by: Your Name <EctoplasmIsGood@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Co-authored-by: Piras314 <p1r4s@proton.me>

(cherry picked from commit 0c4803719b27dab144373600b62bb1048affe53e)
2025-04-04 14:31:20 +03:00
Kai5
e87c5efeae [Fix] Biomass (#409)
* No biomass drain

* Фиксы

* марка

* Тырим у губа

* Фикс линтера
2025-04-04 12:18:39 +03:00
Kai5
cb58d96a6f [REMOVE] Отключена биомасса (#397)
No biomass drain
2025-04-03 02:14:03 +03:00
Will Oliver
d025c26b5b fix
(cherry picked from commit 2ca9217ab57afaee9aae45170c631824125a421a)
2025-03-29 18:18:22 +03:00
Doctor-Cpu
8fd8c175ec tweak: improved vehicle code quality
(cherry picked from commit 340d6ea4d0ff2c001f1ecf19e055e81c06dcc1f6)
2025-03-29 18:17:56 +03:00
Aviu00
a89ead4270 Evasion and wheelchair bound fix (#1239)
(cherry picked from commit 16807c60176a7c8cef73bfcb039c37e32b92470f)
2025-03-29 18:16:52 +03:00
Will Oliver
1697d49f3c fix
(cherry picked from commit d743c3bd0e82acfaad0aed2faa992772ea5fdc17)
2025-03-29 18:15:06 +03:00
Piras314
0e1570edd6 Port Vehicles from Mira Sector (#964)
* sound swapping

* initial vehicle support

* horn and siren

* add text and tags

* add spawners

* add atv to cargo catalog

* revert sound swap

* I forgor to add JanicartKeys to tags

* fill ATV Crate

* change acceleration and friction values

* remove the hack

* Add Wheelchairs

* Add Wheelchair Bound Trait

* fixes

* surgery integration

* cleanup

* move to goob

* fix

* final _goobstation / # goobstation fixes

* fix laying down bug

* Mapping

* Final fixes

* Add wheelchairs to medivend and medlathe

* fix

* Fix infinite money glitch

---------

Co-authored-by: Scruq445 <storchdamien@gmail.com>

(cherry picked from commit 561d04cb0362ab86b048609698cf716fee67d3bf)
2025-03-29 18:14:52 +03:00
Your Name
5d74dede0b ?
(cherry picked from commit f8202b76fb14458d23b255a208ccaf5906f7adef)
2025-03-29 18:06:17 +03:00
EctoplasmIsGood
c91a4dc436 Update Content.Shared/_Goobstation/Bingle/BinglePitComponent.cs
Co-authored-by: Timfa <timfalken@hotmail.com>
Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
(cherry picked from commit 9f8f8a65e5ca3140e4f88a60ab398fd8de1710ef)
2025-03-29 18:06:08 +03:00
Your Name
1b49e58a5d f
(cherry picked from commit 6a2bea62ccfbfe4225f02ef8b76d882026e4b24e)
2025-03-29 18:05:55 +03:00
Your Name
1adb041748 f
(cherry picked from commit f8095590ef94116a52b0f113d659017a73769761)
2025-03-29 18:04:42 +03:00
Your Name
4a9343cb8f g
(cherry picked from commit a8227223d1f3cb6e2068f228150b2927fe1b7dfb)
2025-03-29 18:04:35 +03:00
Your Name
e92034ec82 Revert "f"
This reverts commit 63e3bef6f661c10d23b7795210af7a790f89a5f2.

(cherry picked from commit e420173f3d81642fdca6f151212f714ac348b35d)
2025-03-29 18:04:23 +03:00
Your Name
0cf5f78b7e f
(cherry picked from commit 63e3bef6f661c10d23b7795210af7a790f89a5f2)
2025-03-29 18:04:12 +03:00
Your Name
612f4dec5d f
(cherry picked from commit 7af282ff78377fee51dcd094f676ebf5a0993067)
2025-03-29 18:03:36 +03:00
Your Name
ef170aab6d f
(cherry picked from commit 4ede5489cf713139553fea9f5cf005f51ade0373)
2025-03-29 18:03:21 +03:00
Your Name
58497a479d bingle upgrade (#1830)
* bingle

* text change

* flash stuff

* make self heal noticable

* remove catwalk blacklist

* added ion damage

* bingle floor

* added tile spawn, but its not working correctly

* bingle pit gets more healt. for got i set it low for testing. chenges to take structual damge. added passinv healing

* bingles have less hp

* bingles have 5% less damage resistance

* added updater to sprite

* the bingle pit will now embrace its dead bingles for new life and you now need to keep humans alive for more points

* change to bingle point. bunus point if alive or crit

* sprite fix combat mode

* fix ghostrole not stacking

* for players aswell

* changed the whole upbrade to a polymorf action

* sprite for amrored dead

* bingle plushie

* bingle tile spread

* cleanup

* normal bingle no2 have 10% armor ,upgraded 20%

* more cleanup

* coderabbit recomendations

* yml linter error

* added antirotting to pit

* stuff

* removed unused code

---------

Co-authored-by: Fishbait <Fishbait@git.ml>
Co-authored-by: Aidenkrz <aiden@djkraz.com>
(cherry picked from commit 2c28b55a90f735955210b24ae4b3cdf295f0b5e4)
2025-03-29 18:02:56 +03:00
Your Name
c2383f779e Revert "bingle upgrade (#1830)"
This reverts commit aa50652bcc43da05670fa7ae809ef27dd00941bd.

(cherry picked from commit 7a7723c17cc62d826943e703ffbc65a16d4d485f)
2025-03-29 18:02:38 +03:00
Your Name
0a275fcbd6 bingle upgrade (#1830)
* bingle

* text change

* flash stuff

* make self heal noticable

* remove catwalk blacklist

* added ion damage

* bingle floor

* added tile spawn, but its not working correctly

* bingle pit gets more healt. for got i set it low for testing. chenges to take structual damge. added passinv healing

* bingles have less hp

* bingles have 5% less damage resistance

* added updater to sprite

* the bingle pit will now embrace its dead bingles for new life and you now need to keep humans alive for more points

* change to bingle point. bunus point if alive or crit

* sprite fix combat mode

* fix ghostrole not stacking

* for players aswell

* changed the whole upbrade to a polymorf action

* sprite for amrored dead

* bingle plushie

* bingle tile spread

* cleanup

* normal bingle no2 have 10% armor ,upgraded 20%

* more cleanup

* coderabbit recomendations

* yml linter error

* added antirotting to pit

* stuff

* removed unused code

---------

Co-authored-by: Fishbait <Fishbait@git.ml>
Co-authored-by: Aidenkrz <aiden@djkraz.com>
(cherry picked from commit aa50652bcc43da05670fa7ae809ef27dd00941bd)
2025-03-29 18:02:29 +03:00
Your Name
1572afe161 Revert "bingle upgrade (#1830)"
This reverts commit 0fd6f52c5a579a598b7f62b5bae53d4f0243c420.

(cherry picked from commit 629d1125721459988d2e50247cdcfc9b17202a08)
2025-03-29 18:02:20 +03:00
fishbait
70671cbbfa bingle upgrade (#1830)
* bingle

* text change

* flash stuff

* make self heal noticable

* remove catwalk blacklist

* added ion damage

* bingle floor

* added tile spawn, but its not working correctly

* bingle pit gets more healt. for got i set it low for testing. chenges to take structual damge. added passinv healing

* bingles have less hp

* bingles have 5% less damage resistance

* added updater to sprite

* the bingle pit will now embrace its dead bingles for new life and you now need to keep humans alive for more points

* change to bingle point. bunus point if alive or crit

* sprite fix combat mode

* fix ghostrole not stacking

* for players aswell

* changed the whole upbrade to a polymorf action

* sprite for amrored dead

* bingle plushie

* bingle tile spread

* cleanup

* normal bingle no2 have 10% armor ,upgraded 20%

* more cleanup

* coderabbit recomendations

* yml linter error

* added antirotting to pit

* stuff

* removed unused code

---------

Co-authored-by: Fishbait <Fishbait@git.ml>
Co-authored-by: Aidenkrz <aiden@djkraz.com>
(cherry picked from commit 0fd6f52c5a579a598b7f62b5bae53d4f0243c420)
2025-03-29 18:02:13 +03:00
Your Name
65e0eba1f3 Revert "bingle upgrade (#1830)"
This reverts commit bc3f9319c11bcbe7fd266fee87044ad96f74d640.

(cherry picked from commit eef4f858bb9a909905184380635f82d05c3f5a14)
2025-03-29 18:02:06 +03:00
fishbait
e2b421206f bingle upgrade (#1830)
* bingle

* text change

* flash stuff

* make self heal noticable

* remove catwalk blacklist

* added ion damage

* bingle floor

* added tile spawn, but its not working correctly

* bingle pit gets more healt. for got i set it low for testing. chenges to take structual damge. added passinv healing

* bingles have less hp

* bingles have 5% less damage resistance

* added updater to sprite

* the bingle pit will now embrace its dead bingles for new life and you now need to keep humans alive for more points

* change to bingle point. bunus point if alive or crit

* sprite fix combat mode

* fix ghostrole not stacking

* for players aswell

* changed the whole upbrade to a polymorf action

* sprite for amrored dead

* bingle plushie

* bingle tile spread

* cleanup

* normal bingle no2 have 10% armor ,upgraded 20%

* more cleanup

* coderabbit recomendations

* yml linter error

* added antirotting to pit

* stuff

* removed unused code

---------

Co-authored-by: Fishbait <Fishbait@git.ml>
Co-authored-by: Aidenkrz <aiden@djkraz.com>
(cherry picked from commit bc3f9319c11bcbe7fd266fee87044ad96f74d640)
2025-03-29 18:01:53 +03:00
fishbait
9a3bbdbe89 Bingle (#1519)
* init

* yupp

* stuff for tonigth

* death sprite

* cleanup

* added speech and passive regen

* more cleanup

* that if for today

* stuff

* fixed falling animation

* yml split, and localisation

* moved scale to serverside, linked bingle to pit for upgrade

* Apply suggestions from durk

Co-authored-by: Aiden <aiden@djkraz.com>

* fixes

* added upgrade sprite, added combat indicator

* pit animation

* added check for spawning in nullspace

* trying to fix check error

* test

* Revert "test"

* test 2

---------

Co-authored-by: unknown <Administrator@DESKTOP-PMRIVVA.kommune.indresogn.no>
Co-authored-by: Fishbait <Fishbait@git.ml>
Co-authored-by: Aiden <aiden@djkraz.com>
(cherry picked from commit 6608e6eb74a870a882288ecd2af1cea6dcfc7a1a)
2025-03-29 17:58:55 +03:00
BramvanZijp
1ce432924d Apply suggestions from code review
Co-authored-by: Timfa <timfalken@hotmail.com>
Signed-off-by: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com>
(cherry picked from commit e8a502085a54ccb694f1edbf3c10b25ba444b85f)
2025-03-29 16:17:12 +03:00
BramvanZijp
724e055054 Port LRP Martial Arts Grabbing changes
(cherry picked from commit 513b165f070bf482784467be54ccf5272aa1669f)
2025-03-29 16:16:59 +03:00
Eagle-0
e4c3993afd Security Buffs But Real (#2022)
# Description
Ports Security buffs from
[/Goob-Station#953](https://github.com/Goob-Station/Goob-Station/pull/953)

## Once Again, I am John Combat
I don't have the energy today for the witty PR jokes. Apologies, people.

# TODO
* [x] Oil floats on water
* [x] Cover yourself in oil
* [x] Wait for it to rain
* [x] :trollface:

# Media

# Changelog
🆑 Eagle

* add: Flashbangs now stun and knockdown people. Wear over-ear headset
or combat hardsuit helmet to reduce flashbang effective range.
 * add: All sec and command members received over-ear headsets.
* add: Wearing security, ert, syndie or deathsquad gas mask blocks smoke
inhalation even if internals are off.
 * tweak: Epinephrine now speeds up by 10%.
* add: Jackboots, combat and mercenary boots now reduce all stun and
knockdown times by 20%.
 * add: Combat hardsuit helmets now protect from flashes.
 * tweak: Tear gas is now stronger.
 * tweak: Stamcrit stun time is once again 6 seconds.
 * tweak: Security hardsuits now have heat resistance.

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>

(cherry picked from commit 9bae47bc6d3e44fba8b86e18c78e6b0f3fe00ed6)
2025-03-21 18:53:10 +03:00
BloodfiendishOperator
6f2e41881b Dreadnought "Power Armor" / Hardsuit for the Boring People. (#1950)
This simply ports over the Dreadnought suit from Goob LRP with a change
or two to it, I recommend looking at the Goob LRP PR for more
information.

https://github.com/Goob-Station/Goob-Station/pull/1973

<!--
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]?
-->

The funny dreadnought suit that fucking kills you slowly.

---

# 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] 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>

![Example Media Embed](https://i.imgur.com/FyQXheo.png)

</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
-->

🆑
- add: Cybersun has gotten desperate after hearing several of their
juggernaut suit users got robusted, so they made whatever the fuck this
is, the fucking hardsuit that kills you slowly.
- add: Funny code that allows for damage over time to happen, isn't that
so cool.

---------

Signed-off-by: BloodfiendishOperator <141253729+Diggy0@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
(cherry picked from commit c8256ab6a61208325fa502b427e3a0bda340cca6)
2025-03-21 18:19:54 +03:00
Eris
986f1f9777 You asked for this
(cherry picked from commit 9d1d987ee2e8f08f39f5c0e230e2a645e8b197ee)
2025-03-21 18:19:24 +03:00
VMSolidus
ff06abd64c aaaaaa
(cherry picked from commit e27e0cc4cc1a0f18506d115f286c6be31744c896)
2025-03-21 17:38:18 +03:00
Aviu00
1a6270309a Yuh
(cherry picked from commit dc051987ca50fc97848285b66eca9694e31f7941)
2025-03-21 17:37:58 +03:00