Commit Graph

28 Commits

Author SHA1 Message Date
Fildrance
d053e27974 Feature/make radial menu great again (#32653)
* it works! kinda

* so it works now

* minor cleanup

* central button now is useful too

* more cleanup

* minor cleanup

* more cleanup

* refactor: migrated code from toolbox (as it was rejected as too specific)

* feat: moved border drawing for radial menu into RadialMenuTextureButton. Radial menu position setting into was moved to OverrideArrange to not being called on every frame

* refactor: major reworks!

* renamed DrawBagleSector to DrawAnnulusSector

* Remove strange indexing

* Regularize math

* refactor: re-orienting segment elements to be Y-mirrored

* refactor: extracted radial menu radius multiplier property, changed color pallet for radial menu button

* refactor: removed icon backgrounds on textures used in current radial menu buttons with sectors, RadialContainer Radius renamed and now actually changed control radius.

* refactor: in RadialMenuTextureButtonWithSector all sector colors are converted to and from sRGB in property getter-setters

* refactor: renamed srgb to include Srgb suffix so devs gonna see that its srgb clearly

* fix: enabled any functional keys pressed when pushing radial menu buttons

* fix: radial menu sector now scales with UIScale

* fix: accept only one event when clicking on radial menu ContextualButton

* fix: now radial menu buttons accepts only click/alt-click, now clicks outside menu closes menu always

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>

(cherry picked from commit 68b0dfbc026a07aad2bf3f07d1052f92f899ea31)
2025-10-04 12:50:48 +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
Kutosss
d01e31eb80 Генокрады снова анонимны + небольшой багфикс эффектов эмоций (#710)
* Update GraphicsTab.xaml.cs

* генокрады

* Update ChangelingHivemindSystem.cs

* Apply suggestions from code review

* Update Content.Shared/Chat/SharedChatEvents.cs

* иконки

* Apply suggestions
2025-07-26 06:01:41 +03:00
Spatison
9854f225cf fix upstream: part 1 2025-07-21 20:45:10 +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
Spatison
54086988e3 Mass clean up (#587)
* mass clean up

(cherry picked from commit 12bb873b02c1ef50e20763542b030452cc0613da)

* Revert "Centrifuge buff (#393)"

This reverts commit 2a59a18230.

(cherry picked from commit 9ee495ab4bb365e1ccd3dc627ecb55114fea6944)

* Shoving merge conflict

* fix rich traitor

* fix test

* yml

* fix test

* fix test

* ohh
2025-06-16 20:35:48 +03:00
RedFoxIV
7f33f5f733 Stab++ (#556)
* эмалированная репа

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

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

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

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

* и гит растрёпанный, как блядь
2025-06-11 11:05:17 +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
Kai5
e87c5efeae [Fix] Biomass (#409)
* No biomass drain

* Фиксы

* марка

* Тырим у губа

* Фикс линтера
2025-04-04 12:18:39 +03:00
Will Oliver
d025c26b5b fix
(cherry picked from commit 2ca9217ab57afaee9aae45170c631824125a421a)
2025-03-29 18:18:22 +03:00
Will Oliver
280d002405 fix
(cherry picked from commit eaaf90c30097457c94b1a5592ef577af735b14aa)
2025-03-29 18:18:13 +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
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
Aviu00
cef5458f20 Hardlight bow rebalance (#1523)
* Hardlight bow rebalance.

* Clumsy proof.

(cherry picked from commit 8dd06fd71bd100777721bd2cee9b7345c127af41)
2025-03-21 17:38:08 +03:00
Aviu00
1a6270309a Yuh
(cherry picked from commit dc051987ca50fc97848285b66eca9694e31f7941)
2025-03-21 17:37:58 +03:00
Eris
19834bbb5e Port Changelings From Goobstation (Funky PR 387 Included) (#1855)
<!--
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]?
-->

Finally gets around to porting over Changelings from Goobstation, as
well as a *certain evil PR* from FunkyStation (with the fixes it comes
with).
---

# 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] Wait for #1856 to be merged
- [x] Wait for #1860 to be merged
- [x] Fix broken code to make it actually compile (right now is just
porting prototypes, code, and locale)
- [X] Port That Funky PR I Mentioned Earlier
- [] Throw bricks at the codebase until it stops failing tests
- [X] Maybe do some local testing

---

<!--
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/04473aef-d076-4dd0-a700-0c656428b88a)

</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: Changelings have been ported!

---------

Signed-off-by: Eris <erisfiregamer1@gmail.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
(cherry picked from commit ee4f7aa7097f260d07af3ab0583a2a5c14a38c74)
2025-03-21 17:06:45 +03:00
Spatison
5d347ebb94 Upstream 08.03-09.03 (#299)
* Grabbing Fixes / Table Slam (#1889)

# Description
Ports several fixes + Tabling from
[/Goob-Station#1922](https://github.com/Goob-Station/Goob-Station/pull/1922)
Tabling is pretty much 1:1 with how it is from SS13

## This shit is so code
Required before I can port [Martial
Arts](https://github.com/Goob-Station/Goob-Station/pull/1868)

# TODO
* [ ] Await merge
* [ ] Gaming

# Media

![CQC](https://github.com/user-attachments/assets/dc202ce1-ec97-4448-b8bc-71b9a44a608f)

# Changelog
🆑 Eagle

* add: Table slamming. Harm a table when you have someone harm choked,
see what happens.
* tweak: Grab throw damage to other entities is now based on the thrown
entities kinetic energy. No more mouse wrecking balls.
* tweak: You can now escape from a soft grab by just walking away.
* tweak: You can no longer grab someone else while your being grabbed.
* tweak: Mass now effects grab release attempts.

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- Introduced a table slam mechanic that brings dynamic combat
interactions. Characters and objects can now be “tabled” with associated
damage, stamina effects, and paralysis chance.
- Added new interactive states for pullable entities, enriching
environmental and combat engagements.

- **Gameplay Improvements**
- Refined pulling and throwing mechanics to enhance collision handling
and damage calculations, resulting in more impactful throw actions and
balanced kinetic responses.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->

(cherry picked from commit 71147f8295c5c817b56d52c5d2a38acced2f14b9)

* Automatic Changelog Update (#1889)

(cherry picked from commit 434ce42a8a0739ff0873c4c02bfe83ed39c857e9)

* Fix UI Crap (#1888)

I have no idea if this fixes the issues, and I have not checked if it
does. But this is the only thing we're missing that wasn't related to
other unrelated stuff.

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

- **Bug Fixes**
- Improved the initialization process for several in-game user
interfaces, ensuring that all essential functionalities load
consistently when accessed.
- **New Features**
- Enhanced the voice mask configuration panel to automatically present
available speech verb options, streamlining the setup process for users.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit e2fbebba312a01d9fb92eaac64190df503607f6b)

* Shuttle Spawner Airlocks (#1890)

# Description

This PR adds a variety of "Shuttle Spawning Airlocks" for certain ships
in this game that mappers might wish to use. The most important of which
are airlocks that cause a Cargo Shuttle and a Pathfinder to spawn
already docked to the station. The fact that nobody did this before was
fucking astounding to me.

# Changelog

🆑
- add: Added a variety of "Shuttle Spawning Airlocks" for mappers to
use, which can make it so that shuttles like the Cargo Shuttle,
Pathfinder, etc. Spawn already docked to the station.

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

- **New Features**
- Introduced a refined docking and spawning system for shuttle
operations, incorporating multiple shuttle types including cargo, dart,
infiltrator, pathfinder, and SANDropship.
- Added dedicated deployment entities to manage shuttle instantiation
effectively.
- Rolled out a new tagging framework to enhance the categorization and
identification of dockable vehicles.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

(cherry picked from commit 2f9239f6b0918fbdca1f0c48a06c3b3b76a11ab8)

* Automatic Changelog Update (#1890)

(cherry picked from commit 39eb098ebe3fcf7f283f46fadfc76545c20e667c)

* Update Credits (#1854)

This is an automated Pull Request. This PR updates the GitHub
contributors in the credits section.

Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
(cherry picked from commit ad2ebc04093388d29db758fd7e632744e4d728d8)

* Remove Outdated Description From Flash, Add One to the New Disabler A… (#1887)

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

Accidentally left an old ExtendDescription on a flash which is no longer
accurate, and added extra descriptions to the rev manifesto and civilian
disabler while I was at it.

---

# 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 extra descriptions to the revolutionary manifesto and the
civilian disabler
- fix: Fixed extenddescription on flash

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

- **New Features**
- Introduced extended, context-sensitive in-game descriptions for the
revolutionary manifesto, offering nuanced details about its use across
various roles.
- Added enhanced descriptive information for the civilian disabler
weapon, clarifying its legal ownership and accessory considerations.

- **Chores**
- Streamlined the flash item display by removing redundant extended
descriptions to improve clarity.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Signed-off-by: Timfa <timfalken@hotmail.com>
(cherry picked from commit 3e3bee060cb7eee98ae3fde7c4f7b819f16bf840)

* Automatic Changelog Update (#1887)

(cherry picked from commit 4af6dc83bd2ebded1421dadea70b6a9586776fda)

* NewMats Lathe Recipe Changes (#1873)

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

Removes wait times from Copper, Lead, and Aluminum and reduces the wait
time for Tungsten to 0.13 (4 seconds over 30 ingots, too rare for it to
have no completiontime but too much completiontime for just one ingot).
It seems pretty ridiculous to make the former 3 recipes have a wait time
of TWO SECONDS PER INDIVIDUAL INGOT (which presents a lot of problems in
practice for salvagers) in comparison to the standard ore recipes which
have 0 wait times at all.

if the wait times are intentional then I would like you to consider
reducing them to something similar to what I did with the Tungsten- with
X seconds over 30 (or any other standard amount) ingots

---

# Changelog

🆑
- tweak: the Ore Processors now process Lead, Copper, and Aluminum
instantly, and is much faster at processing Tungsten

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

- **Chores**
- Adjusted lathe production times for several recipes, resulting in more
accurate processing durations.
- The tungsten-based recipe now completes significantly faster (0.13
seconds versus 4 seconds).
- Three metal-based recipes have been updated to finish in shorter
durations (0.01 to 0.016 seconds).
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

(cherry picked from commit d295e2535f9aa21497460279d0bfe108920c445b)

* Automatic Changelog Update (#1873)

(cherry picked from commit 8deed0c3c9d16ff0cdb956fc0ee457a5bf14f5ed)

* Revert "[Add] High-Risk Loadout Item For Warden: Power Gloves (#252)"

This reverts commit 1f936feaa8.

* Grab Intent Part 2: Martial Arts (#1891)

# Description
Finally, after 9 years in development, CQC is here.
Traitors can buy a CQC manual in the uplink, giving them access to
unarmed combos, and instant hardgrabs.
Traitors can also buy a Sleeping Carp Scroll, giving them 3 different
unarmed combos, and the ability to deflect all incoming projectiles, at
the cost of no longer being able to use ranged weapons.
The Chef can use Close-Quarters-Cooking while in the kitchen. Tiders
beware.
Security officers also have access to a Corporate Judo Belt as an
alternative to the stun baton.
The Warden starts with Krav Maga gloves in his locker, with 3 different
attacks.

## This code is, not shit perhaps?
Ports martial arts from
[/Goob-Station#1868](https://github.com/Goob-Station/Goob-Station/pull/1868)
All seems pretty well written, shouldn't be hard to add new ones in the
future.

There also exists a version of the CQC manual for the BSO. Might add to
the BSO locker if requested.

# TODO
* [x] Await reviews
* [x] Pain

# Media
Judo

https://github.com/user-attachments/assets/b0aa4d24-f5cd-478e-8358-a095d46a4572
CQC
https://youtu.be/c0EJfbwqil8
Sleeping Carp

https://github.com/user-attachments/assets/a16ec334-9f9a-4820-b4f1-32a0cc598c67

https://github.com/user-attachments/assets/3e2bfc95-7c92-46f6-9b7c-b1e6596540c7

# Changelog
🆑 Eagle

* add: Added Corporate Judo, CQC, Sleeping Carp, and Krav Maga martial
arts with unique abilities.
* add: The Chef has been given Close Quarters Cooking in the Kitchen and
Bar. Tiders beware.

---------

Signed-off-by: Eagle-0 <114363363+Eagle-0@users.noreply.github.com>

(cherry picked from commit 68872f85c8b2227e871667caed2289042edd0d7b)

* Automatic Changelog Update (#1891)

(cherry picked from commit 9e3ad56873aedb7a7d0fff6037f9aaf0026897c0)

* Bug Fix: Fix Roboticist Airlock Sprite Error (#1899)

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

Description.

A fix for [this
issue](https://github.com/Simple-Station/Einstein-Engines/issues/1872)

Fixed bug of the painted roboticist airlock displaying the windowed
counterpart instead of the standard one.

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

https://github.com/user-attachments/assets/fbe4c85f-c876-4e29-9c8d-cf95314e737f

</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: Fixed bug of the painted roboticist airlock displaying the
windowed counterpart instead of the standard one.

(cherry picked from commit a3b823b0059a67767f0adf27ec65151d2f73a1fd)

* Automatic Changelog Update (#1899)

(cherry picked from commit ca839d18fbcdb85d4d1e60f2acad68fda02e1634)

* Fixes SM Being Started on Round Start (#1901)

# Description

To stop the SM from getting activated without something being thrown
into the SM or by having emitters hit the SM.

---

# TODO

- [x] Fix the SM by starting on its own.
---

# Changelog

🆑
- fix: SM no longer starts on round start.
- fix: SM will no longer delam from spacing unless it's activated.

---------

Co-authored-by: Nathaniel Adams <60526456+Nathaniel-Adams@users.noreply.github.com>
(cherry picked from commit 234ac6119f999ff2bfaabee6b93b5fa75c61c0fa)

* Automatic Changelog Update (#1901)

(cherry picked from commit 3a0c67ba9c6aa8341e9bfd529bb58818164e20c8)

* Tc rebalance

---------

Co-authored-by: Eagle-0 <114363363+Eagle-0@users.noreply.github.com>
Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Timfa <timfalken@hotmail.com>
Co-authored-by: RadsammyT <32146976+RadsammyT@users.noreply.github.com>
Co-authored-by: Paulo Artur Pinheiro Viana Villaça <112904295+AlgumCorrupto@users.noreply.github.com>
Co-authored-by: Solaris <60526456+SolarisBirb@users.noreply.github.com>
2025-03-09 14:01:34 +02:00
Skubman
f4192fa06e Ghost Bar!!!! (From Goobstation) (#1675)
# Description

Adds the Ghost Bar from Goob LRP. Upon spawn, the character's loadouts
and traits will also be applied as if their job was their Ghost Bar job.

Adjusts the weights for kill objectives, re-enabling the kill objective
and reducing the weight of Teach a Lesson now that there's more things
to do after getting round removed.

Goobstation cherry-picked PRs:
- https://github.com/Goob-Station/Goob-Station/pull/454
- https://github.com/Goob-Station/Goob-Station/pull/464
- https://github.com/Goob-Station/Goob-Station/pull/689 (partially
applied to Ghost bar files only)
- https://github.com/Goob-Station/Goob-Station/pull/963
- https://github.com/Goob-Station/Goob-Station/pull/974
- https://github.com/Goob-Station/Goob-Station/pull/982 (partially
applied to Ghost bar files only)
- https://github.com/Goob-Station/Goob-Station/pull/1288 (partially
applied to Ghost bar files only)

Wizden cherry-picked PRs:
- https://github.com/space-wizards/space-station-14/pull/29103 (for the
foam force rifle that spawns in the Ghost bar)

## Media

**Ghost Bar UI**

![image](https://github.com/user-attachments/assets/e46603b9-1798-4376-8af5-3df518ede76c)

**Ghost Bar In-Game**

![image](https://github.com/user-attachments/assets/14dbdc0a-9d75-487b-994e-1b1eabe7bff3)

Notice how the Ghost Bar character has loadout items in the backpack and
the Skeleton Accent trait.

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

🆑 Skubman
- add: Ghost Bar! When you die, you can now go to the Ghost Bar to chill
and talk about the round with other ghosts. (by Aidenkrz)
- add: Foam Force rifle to cargo lottery! (by IProduceWidgets)
- add: Re-enabled the Kill objective for traitors.
- tweak: Reduced the chances of traitors getting the "Teach a Lesson"
objective.

---------

Co-authored-by: Aiden <aiden@djkraz.com>
Co-authored-by: Rank #1 Jonestown partygoer <mary@thughunt.ing>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: Aviu00 <93730715+Aviu00@users.noreply.github.com>
(cherry picked from commit 0b4ceb21cc406cd39b894afe79decf40c2366369)
2025-01-29 20:27:23 +03:00
Eris
d6f3265e83 MODsuits (Port From Goob #1242) (#1640)
# Description

Ports MODsuits from Goobstation PR
https://github.com/Goob-Station/Goob-Station/pull/1242. The PR author
has confirmed that he is okay with me doing this.

---

# TODO

- [X] Port in sprites
- [x] Port in YMLs
- [X] Port code
- [x] Port code PATCHES
- [x] Update EE with required fixes

---

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

## Modsuit crafting

https://github.com/user-attachments/assets/8ff03d3a-0fc1-4818-b710-bfc43f0e2a68

## Modsuit sealing

https://github.com/user-attachments/assets/6671459a-7767-499b-8678-062fc1db7134

</p>
</details>

---

# Changelog

🆑
- add: Modsuits have been ported from Goobstation!

---------

Signed-off-by: Eris <erisfiregamer1@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>

(cherry picked from commit cb06c41fc07275e1f15af916babb44368c0c26c2)
2025-01-29 20:09:26 +03:00
John Willis
09ac2233f6 [Port] Add Time Transfer Panel From Goobstation (#1429)
<!--
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
This adds the Time Transfer Panel that Goobstation uses. This panel
enables Admins to do Time Transfers without commands and makes their
lives easier. This immediately has access to all playtime trackers and
allows an Admin to Add Time and/or Set Time (overwriting the previous
time) for any job role. It also enables extra strings since I ported
from Wizden upstream as well, which can be seen in the commit history.

A thing of note when testing this and using it in a server: the times
**DO NOT UPDATE** for Client until your **RELOG**. This is how it works
on Goobstation as well. The time adding process is faster and will be
easier tool.

This is tied to the AdminFlags.Admin so it can be customized on a
per-server basis if a custom flag is added.

---

# TODO
- [x] Port Upstream Role Define.
- [x] Port string extras for playtime commands.
- [x] Port Time Transfer Panel
- [x] Remove Overall (it just doesn't work on Goob either).

---

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

![image](https://github.com/user-attachments/assets/e9a50f41-9440-474b-b06f-a4387f12ae0b)

![image](https://github.com/user-attachments/assets/31dc2f1e-f1be-4489-bd6f-9390dfee4e72)

![image](https://github.com/user-attachments/assets/f2507f9a-f4a6-4d64-b554-e648e87ff16f)

![image](https://github.com/user-attachments/assets/724fa5c7-9abf-43e0-9eb0-af4484d00f03)

![image](https://github.com/user-attachments/assets/127e6a39-d0e8-426e-95d7-13f46ca40e17)

![image](https://github.com/user-attachments/assets/3856780a-75ca-4804-8832-1b8eed0be8d2)

![image](https://github.com/user-attachments/assets/eb9b9e88-c6fe-4755-a244-6af5b06acb54)

![image](https://github.com/user-attachments/assets/d0960206-2501-4afa-b030-e00ff0a44c01)

![image](https://github.com/user-attachments/assets/891df87e-d8c4-4c6d-a599-9706d592770e)

</p>
</details>

---

# Changelog
🆑
ADMIN:
- add: Add Time Transfer Panel

---------

Co-authored-by: BombasterDS <115770678+BombasterDS@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: flyingkarii <123355664+flyingkarii@users.noreply.github.com>
(cherry picked from commit a05bbce7491677a27656fd67ee72fb8dbdb4c53c)
2025-01-14 01:44:01 +03:00