Commit Graph
23329 Commits
Author SHA1 Message Date
nikthechampiongr c3629bc043 Fix end of round messages looping forever (#24920)
* Fix End of Round messages looping forever and ever and ever

* Use the correct setting for round restart sounds

(cherry picked from commit 09daa534bd)
2024-02-08 12:32:25 +01:00
deltanedas 508568a6bb Add carp pocket (#24888)
* texture

* add the item

* add it to present and salv loot

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 604748534e)
2024-02-08 12:32:24 +01:00
PJBot f4098941af Automatic changelog update
(cherry picked from commit 07523b5615)
2024-02-08 12:32:23 +01:00
shamp 1b913a2b7d Fixed incorrect path to the uranium spear image in the construction menu (#24895)
Update weapons.yml

Fixed incorrect path to the uranium spear image in the construction menu

(cherry picked from commit 8af1bea937)
2024-02-08 12:32:22 +01:00
Arendian d6cb163db3 Fix sliding bug (#24846)
* Fix slip bug

* debug assert

* count

* DebugAssert

(cherry picked from commit 9e484c4b61)
2024-02-08 12:32:21 +01:00
PJBot 48bcdcd39b Automatic changelog update
(cherry picked from commit 864904dd5d)
2024-02-08 12:32:05 +01:00
Krunklehorn c12dacd966 Travelling pointing arrows, brains can no longer point (#24864)
* Decoupled from gravity, constant animation time, manual networking, cubic interpolation

* Reduced overshoot

* Implemented PointAttemptEvent, reacts with mobstate & sleeping

* Brains can no longer point, PBs must be inside a chassis

* Removed chassis check, made callback more obvious

(cherry picked from commit d01d75073c)
2024-02-08 12:32:04 +01:00
PJBot a7579b472c Automatic changelog update
(cherry picked from commit 240ebfa3a6)
2024-02-08 12:32:03 +01:00
Krunklehorn 731da5de6b Fixed unable to select None for character spawn priority (#24897)
Allows None to be selected

(cherry picked from commit 778a704b58)
2024-02-08 12:32:02 +01:00
PJBot 516bd1852a Automatic changelog update
(cherry picked from commit 3484e69dff)
2024-02-08 12:32:01 +01:00
Nemanja 49a1b47c09 Decouple panels and wires (#24840)
decouple panels and wires

(cherry picked from commit 5db6a3eafc)
2024-02-08 12:32:00 +01:00
lzk aded2ef145 Remove soapy water (#24301)
* localize shuttle timer eta etd

* remove soapy water for real

(cherry picked from commit c4e7f1ebe8)
2024-02-08 12:31:59 +01:00
PJBot e74e88d265 Automatic changelog update
(cherry picked from commit f7b61f6cda)
2024-02-08 12:31:58 +01:00
metalgearsloth 7e7655b3c4 Pulling rework (#20906)
* Pulling rework

Fixing up the FOUR systems managing pulling, all the shitcode, and also making it nicer ingame.

* More pulling cleanup

* stats

* More cleanup

* First draft

* More pulling

* weh

* Fix puller

* Pulling working

* Fix merge

* Dunked

* Self-merge time

(cherry picked from commit 0d8254b2a2)
2024-02-08 12:31:57 +01:00
Tayrtahn a1e09ff808 Update FollowerSystem's fix to use new helper property (#24889)
Updated FollowerSystem's fix to use new helper property

(cherry picked from commit 79e3a6630d)
2024-02-08 12:31:40 +01:00
PJBot 3818bfadf8 Automatic changelog update
(cherry picked from commit 3630956526)
2024-02-08 12:31:30 +01:00
Jajsha 38bbf2bf5f Various borg law fixes (#24870)
* Various fixes

* Fix bad ordering with scrambled law orders

(cherry picked from commit e4f6a4bea6)
2024-02-08 12:31:29 +01:00
Tayrtahn b659a3c61a Fix pressing shift while held triggering escape (#24878)
* We meet again, my old friend.

* Helper property

(cherry picked from commit 31207006f5)
2024-02-08 12:31:28 +01:00
PJBot fa9861e8c7 Automatic changelog update
(cherry picked from commit f0dddd48ad)
2024-02-08 12:31:27 +01:00
Adrian16199 51707741b8 Make scarfs craftable (#24735)
* Make scarfs craftable

Also sorted the lathe a bit because I like it when it looks nice.

* reverts sorting

(cherry picked from commit bff50de746)
2024-02-08 12:31:25 +01:00
Hannah Giovanna Dawson 29e65fd324 Actually fix round restart audio this time (#24754)
In which I'm a goober and don't clean up after
myself and accientally don't fix the issue I tried
to fix in my last round restart PR.

The audio is now maintained just like music during
restarts (yippee to ContentAudioSystem::OnRoundRestart)

This needs a refactor but at least the defect is fixed now.

(cherry picked from commit 2e7d23674e)
2024-02-08 12:31:24 +01:00
lapatison 5c149505cd Space-Up flavor quick-fix (#24863)
Fix spaceup flavor

(cherry picked from commit e7ee364af3)
2024-02-08 12:31:23 +01:00
PJBot 047b7250da Automatic changelog update
(cherry picked from commit 215da3fb36)
2024-02-08 12:31:22 +01:00
IProduceWidgets 160ec32471 freezer prevents nuclear annihilation (#24884)
(cherry picked from commit ca5db8a8d4)
2024-02-08 12:31:21 +01:00
PJBot e967e1c8cf Automatic changelog update
(cherry picked from commit b6dbdf217d)
2024-02-08 12:30:17 +01:00
Tayrtahn 3de3e13bb3 Add Stonk Pockets (#24876)
* Added stonk pockets

* Give me a little credit

* Update Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json

* Update Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 765ea789cc)
2024-02-08 12:30:17 +01:00
metalgearsloth 00586dd79f Add puller sanity test (#24885)
* Add puller sanity test

* weh

* NRTs

(cherry picked from commit 641fb665b7)
2024-02-08 12:28:50 +01:00
PJBot 0c0d9cda95 Automatic changelog update
(cherry picked from commit 7e97d540b7)
2024-02-08 12:27:30 +01:00
metalgearsloth ed2d91526e Remove puller from simplemob (#22957)
Not every mob needs to be able to pull, no, if you want it implement it manually.

(cherry picked from commit 2191c7558a)
2024-02-08 12:27:25 +01:00
Anzarot121 7678ac3d75 Fix mob pull issue (#22485)
* fix issue

* fix fix

* add space

* really fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 30bd3d1da0)
2024-02-08 12:27:16 +01:00
Bixkitts 971502af2c MeleeSoundComponent Working With 0 Damage (#24872)
* made hit sound logic potentially better

* Function already tries all fallbacks, no reason to return bool

* NoDamageSound execution path

(cherry picked from commit b98dc66974)
2024-02-08 12:27:15 +01:00
Leon Friedrich dcf188f617 Fix storage destruction/deletion bug (#24882)
(cherry picked from commit 3ffa15ce34)
2024-02-08 12:27:14 +01:00
Ubaser d5d844d354 Fix drug descriptions (#24622)
(cherry picked from commit 84c5057bb5)
2024-02-08 12:27:13 +01:00
PJBot d53fd5f77e Automatic changelog update
(cherry picked from commit 5973341236)
2024-02-08 12:27:12 +01:00
Psychpsyo 3c2f10a9c0 Screen Shake Intensity Slider in Accessibility Settings (#24749)
* Reduced motion toggle disables screen shake

* Actually, screen shake is its own slider instead

* Cache screen shake intensity cvar

(cherry picked from commit ba0ca39a7a)
2024-02-08 12:27:11 +01:00
Kevin Zheng 1376f8f0ba Add popup message for activating trigger with hand (#24858)
(cherry picked from commit 6b1524138b)
2024-02-08 12:27:10 +01:00
deltanedas 5826739524 fix spray paint popup spam on invalid door (#24857)
fix popup spam on invalid door

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 58e28b5136)
2024-02-08 12:26:41 +01:00
metalgearsloth b6a3448108 Make popups nullable (#24802)
This standardises it with audio and whatever. Me when I sprinkle nullchecks everywhere.

Was 50/50 on making new non-nullable methods but figured it would bloat too hard and you can't access strings by .Value anyway.

(cherry picked from commit 606c5a8c8b)
2024-02-08 12:26:32 +01:00
PJBot 087526a584 Automatic changelog update
(cherry picked from commit dfa86fbff8)
2024-02-08 12:26:24 +01:00
Arendian c68e6eac1a Fix slipping through fences (#24850)
* Can't slide under fences anymore

* Small mobs can't pass instead

(cherry picked from commit 214961f46e)
2024-02-08 12:26:23 +01:00
Hanz d47df4cceb Booze/Soda Dispenser label fix (#24848)
This is literally it

Ayup

(cherry picked from commit 82434e7959)
2024-02-08 12:26:22 +01:00
PJBot 203ef202a6 Automatic changelog update
(cherry picked from commit d356a075e6)
2024-02-08 12:26:21 +01:00
Vasilis 1f3659ab14 Nerf the fridge explosion resistance (#24844)
Nerf

(cherry picked from commit 20ecbc252c)
2024-02-08 12:26:20 +01:00
PJBot 08452730d3 Automatic changelog update
(cherry picked from commit 92dcc0a037)
2024-02-08 12:26:01 +01:00
PJBot 08bd54468f Automatic changelog update
(cherry picked from commit 1b424d6925)
2024-02-08 12:25:40 +01:00
themias 7113ea3a13 Add Diona salute sound (#24836)
(cherry picked from commit f25093e85e)
2024-02-08 12:25:38 +01:00
themias 22acbfd31c Fix cryopod debug assert (#24830)
(cherry picked from commit efb623de19)
2024-02-08 12:25:37 +01:00
deltanedas 0b0de4eb50 spray painter rework (#23287)
* refactor and add Department to PaintableAirlock, move it to server dir since its in namespace

* add departments to doors, cleanup

* add style -> departments mapping

* AirlockDepartmentsPrototype

* update shared spray stuff to have department

* name file the same as the class name

* department optional

* refactor spray painter system + send department

* fixy

* client

* no need to rewrite ActivateableUi

* pro ops

* the reckoning

* hiss

* .

* :trollface:

* add standard atmos colors to palette

* Update Content.Shared/SprayPainter/SharedSprayPainterSystem.cs

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit c49c78bafa)
2024-02-08 12:25:35 +01:00
SlamBamActionman 4ca11a55e5 Remove gondola donkpocket & change berry box description (#24655)
* Remove gondola & change berry box description

* Removed map gondolas

* Revert "Removed map gondolas"

This reverts commit 42fcfb85f16e778df135d2a68b9cea08d794e28b.

* Updated migration.yml to remove FoodBoxDonkpocketGondola

* Replacing is better than removing

* Changed description slightly

(cherry picked from commit e36844de47)
2024-02-08 12:25:20 +01:00
PJBot 3875e191ea Automatic changelog update
(cherry picked from commit 912b5915d4)
2024-02-08 12:24:29 +01:00