Commit Graph

22838 Commits

Author SHA1 Message Date
PJBot 7cc1094dea
Automatic changelog update
(cherry picked from commit 0b37dbbfbd22ac616f0f4a72e7ed75f3591639aa)
2024-01-26 23:13:44 +01:00
Hannah Giovanna Dawson 0ce2cb5b29
Fixes round restart audio clipping (#24044)
* Fix round end audio clipping

* weh

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 5af1d0ea8b5a54cd1f1b48308176318032a457ea)
2024-01-26 23:13:43 +01:00
metalgearsloth 419a28aa23
Add netserializable to test doafter (#24313)
Might fix the test failure

(cherry picked from commit ed2fa96ca024df553b2559632ba923e8e51d443e)
2024-01-26 23:13:42 +01:00
PJBot 05a158e8fa
Automatic changelog update
(cherry picked from commit a65e3eeb8fdbecbc02731f8a1b1d6d4fb1f2b837)
2024-01-26 23:13:40 +01:00
Arendian 46fe22709b
Prevent EntityStorages from being opened while inside another container (#24253)
* Prevent EntityStorages from being opened while inside a mech.

* compressed into few lines

* unneeded line

* Popup client

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit e89be95d4c3085d7d6d08ad5aafa942cfc32c934)
2024-01-26 23:13:33 +01:00
PJBot fc7c882e50
Automatic changelog update
(cherry picked from commit 91e8234a574d33124aae96ac0d28b34db4e66bde)
2024-01-26 23:13:24 +01:00
Agoichi cee8ded8c3
Rebalance of Lobbying bundle (#24303)
* Rebalance of Lobbying bundle

- More money, mickey (5000 -> 30000)
- Added trader`s rubberstump for high iq players
- Phone to call upper managment
- Some fancy and absolutely unsuspicious clothings
- Patriotic Flag for the most valuable lobist of Syndicate

* Thief problem fix

Thief now have have separate lobbying bundle, now it calls bribing bundle

* Fixing

Money count, suffix

* Hi

Fixing money

(cherry picked from commit 559ff13a121ee1a79bf6d59e427d9c0fc93ec9a1)
2024-01-26 23:13:23 +01:00
metalgearsloth 997ee75d14
Revert "Adds more grindables (#24267)" (#24311)
This reverts commit 16a1f2f16a8549d538c7523f5abefea63c7ad3db.

(cherry picked from commit 34806400bd3fd3cf4ef30333eb3eb64770026982)
2024-01-26 23:13:21 +01:00
PJBot 3cf90833b2
Automatic changelog update
(cherry picked from commit df768b289e7ece83f146b1932eddc2a78eb9579b)
2024-01-26 23:13:20 +01:00
Drayff f7561b4c51
Toolboxes (#24305)
* Added animations for opening toolboxes

* Fix cow toolbox

(cherry picked from commit f71df97b5eebbe1224c9a4d203e0a6b3bbeca3c7)
2024-01-26 23:13:13 +01:00
PJBot 920009ef3c
Automatic changelog update
(cherry picked from commit f33a3f98cde0c6c833ebce2402902eb3a77efbcb)
2024-01-26 23:13:03 +01:00
Scribbles0 830ae5579f
Unrevivable trait (#24226)
* unrevivable trait + remove unclonable remnants

* cleanup

* change to hascomp

(cherry picked from commit 7a2e500f689738b64abc24929e8d4a387749ba64)
2024-01-26 23:13:01 +01:00
PJBot 8177b3fa97
Automatic changelog update
(cherry picked from commit ac809c492990746b67e948a30ec36542679084e1)
2024-01-26 23:12:52 +01:00
Nemanja 40f7e0b53e
Lathe Categories (#24247)
* Lathe Categories

* serilog my beloathed

(cherry picked from commit 73e94dfa92e0afe3ad0decd1d7248d13fa4f208c)
2024-01-26 23:12:38 +01:00
Ubaser d511f31243
Mustard, ketchup and mayonnaise now tastes distinct (#24297)
add

(cherry picked from commit a6e16d99610120d086105de867d7e82712964109)
2024-01-26 23:11:15 +01:00
Ubaser 4e1d2e2f24
Fix reagents obtained from grinding iron ore. (#24215)
add

(cherry picked from commit 08c7386074b2da46ace4e4f12cdf65782f37089d)
2024-01-26 23:11:14 +01:00
Flareguy b89a6d7f26
Adds more grindables (#24267)
* Adds more grindables

* fuc

* A

(cherry picked from commit 16a1f2f16a8549d538c7523f5abefea63c7ad3db)
2024-01-26 23:11:12 +01:00
PJBot b6126e799a
Automatic changelog update
(cherry picked from commit f44661c82a5b95226c4bd3d008b55ecd173ad79e)
2024-01-26 23:11:11 +01:00
SpeltIncorrectyl 46b8eaad4b
Can emag artifact crusher (#23957)
* initial commit

* made it emaggable

* removed OnAttemptEmagEvent

* moved emagging to shared

* added local file to git

(cherry picked from commit fd673cf6e30599f5895d58c3281eba2901301401)
2024-01-26 23:11:10 +01:00
PJBot 2609c7cc28
Automatic changelog update
(cherry picked from commit 884c866e4d446cce0f5f4c5db0886a33823891a3)
2024-01-26 23:10:55 +01:00
Kara 6ca85e719b
Destruction & impact sound rework pass 1 (#24282)
* Various sounds ported

* Replace wall_bonk.ogg

* Metal/metalglass break sound pass

* Replace metalbreak.ogg

* Replace woodhit

* Replcae tap.ogg n some smack uses

* Fix lint

* Replace bang.ogg and some instances of hit_kick.ogg

* couple more

* fix wood sound

* i may be stupid

* le attributing

* bro what

* standardize more destruction sounds

* fix melee hit sound cutting off

* window threshold sounds and remove `destroySound` it literally doesnt exist

(cherry picked from commit 818b07ecf82bdd72dc5524f6bc093067b2ef6472)
2024-01-26 23:10:41 +01:00
Ubaser 3d7d4eed5f
Actually fix carrot oculine this time (#24290)
SEEDS MAN

(cherry picked from commit bdb1399ada20dfe7638ce7af1727192e6d9de17f)
2024-01-26 23:10:03 +01:00
Ubaser bfb7aa6a89
Improve light tube sprites (#24270)
* fix

* blocky

* glowier

* darker

(cherry picked from commit e3d5dc4d76908cb1da4d71187f7cc77ac146eb68)
2024-01-26 23:10:02 +01:00
PJBot 36a35845bd
Automatic changelog update
(cherry picked from commit 95815c7f2b8e949e1cde3991786b9d3d28109966)
2024-01-26 23:10:01 +01:00
metalgearsloth e9bb444936
Fix gun bolt crash (#24283)
Deleting non-predicted entities moment.

(cherry picked from commit b535909a4983919b4764c72f7409d881cea02ae8)
2024-01-26 23:10:00 +01:00
PJBot bc7f8c91d2
Automatic changelog update
(cherry picked from commit 8aeeacce9719f08b5d24cc1854f28ad4f1df2619)
2024-01-26 23:08:07 +01:00
metalgearsloth b51b6f65b5
Add ability to put spesos into cargo console (#24263)
I thought we had it already but maybe it was an unfinished pr or something.

(cherry picked from commit ad23facb7a9670bcc10e2f9e89d2e22db2052697)
2024-01-26 23:08:06 +01:00
PJBot f9919cdf75
Automatic changelog update
(cherry picked from commit 217e8658f00cb8c147797a4e0dcf223a18ede227)
2024-01-26 23:08:04 +01:00
Repo 13d79489a9
Restart votes check player count and ghost levels (#23453)
* Restarts have max player count

* Now counts ingame ghosts to determine if restart can be called

* consistant cvar name

* Added a player count with state conditional

(cherry picked from commit 7bf62f1d1904b591580b17b2b5079f0dfe769e4b)
2024-01-26 23:07:50 +01:00
iacore 2cd501fc6f
Change the station map dot color to cyan (#24082)
Change the station map tracking dot color to cyan

Co-authored-by: iacore <noreply+gpg-stub@1a-insec.net>
(cherry picked from commit c35b9964c770714f5ba56fce827912cd33312fe6)
2024-01-26 23:07:49 +01:00
Ubaser c3e95f02a0
Make super bite burger easier to craft (#24231)
* add

* needs space for salt

(cherry picked from commit 8cc24c9a5d6de080067fe35a46d7d69d54b20a28)
2024-01-26 23:07:24 +01:00
metalgearsloth 831427e90e
Rework wheelchairbound (#24173)
* Rework wheelchairbound

Fixes the save/load bug and fixes it being a singleton.

* weh

(cherry picked from commit 243491dd596ffad3698d1d00a645195f2224386f)
2024-01-26 23:07:23 +01:00
Ubaser 9392f73772
Fix salvage wreck names (#24256)
add

(cherry picked from commit 4b77d5519a0b637740521ac9cd4e656bfee03f37)
2024-01-26 23:07:22 +01:00
Ubaser 2edc8151d7
Adjust produce (#24220)
(cherry picked from commit f0b21e2edc9bfa2c82aba007ac3d96f4a660a7af)
2024-01-26 23:07:21 +01:00
IlyaElDunaev b67dcf5a02
Botany guide chemicals (#24194)
(cherry picked from commit 09b3a4489c4a042f40ee3ab0060ebc8c9c9e0a2f)
2024-01-26 23:07:20 +01:00
PJBot a0305bf6b2
Automatic changelog update
(cherry picked from commit b94265a5a86583440cf11fadebde90dd4f539c0d)
2024-01-26 23:07:19 +01:00
metalgearsloth e8af371fbd
Update submodule to 207.0.0 (#24255)
(cherry picked from commit 58877453f6c8b310533dfe9d1a142785bb917543)
2024-01-26 23:06:25 +01:00
PJBot 18f550e184
Automatic changelog update
(cherry picked from commit c01b5a30ae1b950e5c43b5e574b9fef7ab47d6cf)
2024-01-26 23:06:24 +01:00
Nemanja c6ee831dba
fix gas canister names (#24252)
fix canister names

(cherry picked from commit f69f3e0f410cde280dfedd5570f39d6b7728c439)
2024-01-26 23:05:55 +01:00
PJBot af5641c219
Automatic changelog update
(cherry picked from commit b543c05cf827d368c85bf2198b595ba19bdb2d4e)
2024-01-26 23:05:54 +01:00
lapatison 6e088d4782
Spawn guidebooks on random bookshelves (#24036)
(cherry picked from commit 21b7b112a2ab5ae5078f4a2cf9565b05c8ed6dfc)
2024-01-26 23:05:53 +01:00
PJBot dced39ad79
Automatic changelog update
(cherry picked from commit 38eaf9e5a62ae08841858e0bdead97287b5cd8fa)
2024-01-26 23:05:42 +01:00
Nemanja 79b0c0e3d4
Finally fix cryostorage duping (#24251)
(cherry picked from commit ea299caff9143fe97eeb0873dada4e4fed8df3bd)
2024-01-26 23:05:41 +01:00
themias de7c8de5ac
More sprite movement states (#24237)
* More sprite movement states

* what

(cherry picked from commit 0c944ed81ee8f96769f77e0d535629d90abf40f5)
2024-01-26 23:05:40 +01:00
Kevin Zheng 25499c5c07
Fix drink examine text (#24241)
(cherry picked from commit 3506e67e88082ca22dc7b720f52748df36de4ab4)
2024-01-26 23:05:39 +01:00
Kevin Zheng 1ab0ed77f6
Wrap objective briefing text (#24244)
(cherry picked from commit 0d53dad58ac5efc8d6cbd76a5e43eae7450ea25d)
2024-01-26 23:05:38 +01:00
PJBot 68b730147d
Automatic changelog update
(cherry picked from commit d47052820ca969973a168adb439f5b2108c6b541)
2024-01-26 23:05:36 +01:00
Kot efcaea8153
Fix entity menu grouping and sorting (#24243)
* Group entity menu by the displayed name instead of by the prototype

* Sort entity menu by the displayed name (with label) in current culture

(cherry picked from commit 9b97c7f2f215ec9862d8146e7db07ba03005a71f)
2024-01-26 23:05:35 +01:00
themias 043f6205d8
Add fill visuals and inhand sprites to water bottle (#24240)
* Add fill visuals and inhand sprites to water bottle

* adjust sprite

(cherry picked from commit 6931848f1d875b22a1529e0868bff72f5dde663d)
2024-01-26 23:05:34 +01:00
Tayrtahn 297bb10095
Fix solution corruption when grinding a stack of items (#24242)
Fix corruption when grinding a stack of items

(cherry picked from commit 20dadf45ec92aecd244ae9e77d87c4531c6d1493)
2024-01-26 23:05:33 +01:00