Commit Graph

24329 Commits

Author SHA1 Message Date
Ed b9f41c2d48
Convert "IgnoreWeatherComponent" into "BlockWeatherComponent" (#26135)
* ignore

* doc

(cherry picked from commit 4aa72af574cc7a3370085fb70831fbde1df29077)
2024-03-17 15:10:41 +01:00
Nikolai Korolev 8a3b0f6d13
Small performance optimization. Don't do String.Trim() second time (#26161)
Don't do Trim 2 times

(cherry picked from commit 3425444c5383f73c830f6299885e44cb4bcab46a)
2024-03-17 15:10:38 +01:00
deltanedas 98ea628ed2
fix eggsplosion (#26146)
Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit d87be642ee9ec81064eff22389705755ab557b54)
2024-03-17 15:10:37 +01:00
lzk 4cb89d0641
Fix light replacer popup (#26136)
(cherry picked from commit 456b2a7b5613fdedc508d930bc7842211664c73f)
2024-03-17 15:10:33 +01:00
Plykiya 575d169605
Sleep on Stasis Beds (#26129)
* eepy stasis bed

* Make healing 100x worse because it's funny

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
(cherry picked from commit 5912b062503841ad8adc6a4a959f97670063f1fb)
2024-03-17 15:10:32 +01:00
Tayrtahn 77577475b1
Fix tranq rounds injecting when reflected (#26141)
* Fix tranq rounds injecting when reflected

* Cleanup using directives

* Remove FixtureId from component

(cherry picked from commit f0dfe3f6fb10e1b1f4e1a4b40c860fc0bac8427b)
2024-03-17 15:10:28 +01:00
Nairod 8ec5d2ba9b
Red Neck Gaiter (#25891)
* Red Neck Gaiter

* Minor Meta Mistake

(cherry picked from commit 1938768ea69ad2f69758036816142a205552eb63)
2024-03-17 15:10:26 +01:00
Magnus Larsen e47e00dc13
Prevent dead players from turning bar stools (#24308)
Prevent dead users from turning their bar stools

Previously, players could always turn a bar stool or office chair they
were buckled into; even while stone cold dead!

(cherry picked from commit 15a7520df17a6fa95cbd8ce8914edab5b0d7ed50)
2024-03-17 15:10:22 +01:00
metalgearsloth e4d29e140c
Update submodule to 214.1.0 (#2613) 2024-03-17 15:10:16 +01:00
Ed a74bbc0fc0
Fashion is my profession - Procedural jumpsuit variants (#25888)
* add color field to clothing layers

* add support to randomsprite

* bababa

* finalize spriting work

* add to game

* fix

* remove space

* edit patelle, +1 decor variant

* added only pants, some sprite fix

* inflation

* fix mixed

* not tested commit

* Revert "not tested commit"

This reverts commit 4a904df3452263e87c9cb819ab5d8cf411ebe468.

* naked human is fun

* update

* add new style

* some sprite pixel tweak

* Update meta.json

(cherry picked from commit 986ac589b44687fd2f3b71da00a52434db75abe3)
2024-03-17 15:09:40 +01:00
metalgearsloth abaade5fcf
Freeze clothesmate (#26125)
People will do anything but add uniform dying.

(cherry picked from commit 3c814f4652c679821613c618cd206988f011599a)
2024-03-17 15:09:38 +01:00
shamp e9bdb23d28
Added cheap sunglasses into ClothesMate (#25479)
* cheap sunglasses

* Update glasses.yml

* Update Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

* Fix price

---------

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

(cherry picked from commit d370f16e04fc12c8fa2b89c41c3fce12225334b4)
2024-03-17 15:08:53 +01:00
Tayrtahn e339c2c50c
Code cleanup: puddles and spreaders (#26102)
* Removed obsolete MapManager calls

* More code cleanup

* EnsureComp

* Rerun tests

(cherry picked from commit cf0da11eb791b78590b5a57b0a9ef8572217b7a6)
2024-03-17 15:08:24 +01:00
Leon Friedrich 24109e6c10
Add PVS command permissions (#26124)
(cherry picked from commit 361092a40b110049b85187e935f4eb531f36a99f)
2024-03-17 15:08:18 +01:00
deltanedas 76330eae64
add more carp plushies (#26081)
* carp plushie textures

* add the plushies

* add plushies to spawners

* rainbow carp and make special plushies rarer

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit f8305a26a9bd1dc080daca8f45f7289829b91682)
2024-03-17 15:08:11 +01:00
Krunklehorn faa39fccf5
StrippableSystem doafter overhaul (#25994)
* Initial commit

* Fixed short circuiting

* Use DebugTools

* Use Entity<TComp> more, and make them nullable

* Bring these two together

(cherry picked from commit 41ca8f3dfcb986432e1e509247bf239cac137836)
2024-03-17 15:08:10 +01:00
lzk 2f641412dc
Sort all tags in aplhabetical order (#26114)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 0fdb551c3d54824b8191a94befdd97ae88cc0102)
2024-03-17 15:08:09 +01:00
Pieter-Jan Briers 3fde6555b6
Update submodule (#26119)
(cherry picked from commit b581b11f6819dd47f40bb6f3b4d0541097ed06f6)
2024-03-17 15:08:05 +01:00
Brandon Hu 99a46a3be1
Agent IDs default to passenger icon (#25993)
(cherry picked from commit 0aee4bf3479df41583a2e7101ab2028f0db2d1aa)
2024-03-17 15:08:01 +01:00
nikthechampiongr 554aa0774b
Make radio jammer block suit sensors (#26046)
* Make radio jammer block suit sensors

* Fix stupid

Use CancellableEventArgs instead of doing what the hell I was doing before.

* Address Reviews.

Change the event from a CancellableEntityEventArgs to a ByRefEvent.

(cherry picked from commit dce24dfd03b3ddfe1044297edf9d35bc9f75c523)
2024-03-17 15:07:58 +01:00
Crotalus 38dd9e4955
Sort agents by success rate in end game summary (#26058)
* Sort agents by completed objectives

* Use StringBuilder

(cherry picked from commit d674be697e83b590db5aaec9f4411dd57c131861)
2024-03-17 15:07:57 +01:00
Ghagliiarghii 5527d8e52c
Democratize C-20r SMG Magazines (#26086)
Previously the C-20r magazines were only available for nukies to purchase, but regular syndicate agents could purchase the actual C-20r bundle to get the gun. This strikes me an inconsistent.

(cherry picked from commit c07213c2473453179f525956ff16631a5b77c9cc)
2024-03-17 15:07:52 +01:00
Tayrtahn 5e95b01dd6
Split smoke grenade sound into two parts (#26095)
* Split smoke grenade sound into two parts and converted to mono

* Restore old sound for admin trigger effect

(cherry picked from commit 696f97f78ecfb86e4483148588a52e39bf27073c)
2024-03-17 15:07:15 +01:00
Pieter-Jan Briers 17c1a5a7fa
Throttle people trying to connect to a full server. (#20972)
* Throttle people trying to connect to a full server.

To reduce spam/load on the server and connection logs table.

Players are forced to wait 30 seconds after getting denied for "server full", before they can try connecting again.

This code is an absolute nightmare mess. I tried to re-use the existing code for the redial timer but god everything here sucks so much.

Requires https://github.com/space-wizards/RobustToolbox/pull/4487

* Use new NetDisconnectMessage API instead.

* Add admin.bypass_max_players CVar.

Just something to help with debugging the player cap on dev, I don't expect this to ever be disabled on real servers.

(cherry picked from commit 0ecc5e8c96c235af265ab747d7345b363f94b1e4)
2024-03-17 15:07:14 +01:00
Mr. 27 d7c48b4028
Pipebombs and IED rework (#25705)
* inital

* 2-9

* add crafting function, rename ied to fire bomb

* add firebomb ignition

* fikss

* change damage values

* add note

* fix tests i think

* ok

* good

* Review

* warning

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

(cherry picked from commit 3cb1c585c53f694f5ceb9720057bb765673970ec)
2024-03-17 15:06:54 +01:00
maylokana 4cba6732b5
Drink from closed container fix (#26103)
(cherry picked from commit 2f2cd4aab70703717541e5db3f46ae4831b4129d)
2024-03-17 15:06:11 +01:00
Alzore 19eea0c3e2
Remove the blue tint from the health analyzer (#26101)
nomoreblue

(cherry picked from commit e5f05b735d10138a4f3244ecc29e05c5b5b2c413)
2024-03-17 15:06:10 +01:00
Repo 798138bb98
Typo in guidebook for cyro pressure (#26094)
Typo in pressure that will kill someone.

(cherry picked from commit 0cba172130488766cdde8334308a5627ab3e5fc2)
2024-03-17 15:06:07 +01:00
lzk 16eee4e608
Fix some tags for prototypes (#26088)
* Fix some tags

* oop

(cherry picked from commit 2a1d6e0ae0513445e82f683bf323bf65ebe5397a)
2024-03-17 15:06:06 +01:00
wafehling 17ca360528
Trading Outpost now has half buy-only and half sell-only pallets (#25955)
* Added new Buy & Sell specific cargo pallets

* Remapped trading outpost with new pallets, tweaked texture

* Removed debug message

* Fixed/Compacted conditional checking to let old pallets still work for backwards compatability

* Update Content.Server/Cargo/Components/CargoPalletComponent.cs

Alright, updating all the references to it.

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Changed textures, changed to enum instead of string for pallet type check

* Few minor code tweaks/formatting fixes

* Missed the prototype change

* Update Content.Server/Cargo/Components/CargoPalletComponent.cs

* Update Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit c0bbbc33c19eafcc8defaa7f1ec2df42e485b435)
2024-03-17 15:06:02 +01:00
nikthechampiongr 29582a48dc
Add log when a player starts observing. (#26091)
(cherry picked from commit 85e0a5328a28b02fc29575648cfa7421f5bfb410)
2024-03-17 15:05:58 +01:00
lzk c7ea45da59
More good looking inventory part 2.2 (instruments version) (#26090)
(cherry picked from commit 91aa6445714d6b833474fcb911c4c8555a54f799)
2024-03-17 15:05:57 +01:00
lzk ba79603f62
Some more whitelists for belts (#26085)
* Allow surgery tools in medbelt

* add lil more changes

(cherry picked from commit 2b5a75ba6619b9fdd6c4f7e17a18d2af85167505)
2024-03-17 15:05:54 +01:00
Gyrandola d66335cfbd
Make fireaxe & shotgun cabinets destructible (#25962)
* Update fireaxe_cabinet.yml

* added min(75) and max (100) dmg threshold

100 dmg destroys the axe as well.

* made the cabinet tougher

(cherry picked from commit 6574681bcb88e9c524b998c525d1980e88884e96)
2024-03-17 15:05:53 +01:00
Errant 1f519737e2
Fix vox custom sprites (#25989)
fix vox specific sprites

(cherry picked from commit 8a77722f91a94846f0027f56b8d8f2ec76254d81)
2024-03-17 15:05:50 +01:00
Debug d3c23632e9
Add Psychologist stamp back hopefully 2024-03-17 15:05:42 +01:00
Mangohydra 0603f3ec77
The lawyer finally gets a stamp (#26012)
lawyer stamp

(cherry picked from commit 61b3eb4de0460bf3ca44008ae6cff87442d6b865)
2024-03-17 15:02:28 +01:00
Debug 000d55c932
Revert "Psychologist & Lawyer stamp (#849)"
This reverts commit 344aa7bff7.
2024-03-17 15:02:07 +01:00
icekot8 942e02d0e7
foxes are now neutral🦊 (#25992)
foxes became neutral

(cherry picked from commit 86ab7a10743bd98d1f187e7158cb316e106ea3b9)
2024-03-17 14:59:11 +01:00
Velcroboy a5c824d375
Fix placement mode on chairs (#26041)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit bcc147634af1fea7b5f53f18d136f44ed46cb053)
2024-03-17 14:59:10 +01:00
PJBot 95f93080fe
Automatic changelog update
(cherry picked from commit 5b72f3faaf45df7eab1e894db51eb5503085d042)
2024-03-17 14:59:07 +01:00
778b 3493b63074
Fixed bug with appearance of ammo battery magazine guns (#26009)
fixed

(cherry picked from commit 63232389ca9a499fb614960ccf9eae9b3d186037)
2024-03-17 14:59:06 +01:00
PursuitInAshes ad34720b58
Contraband Storage Crate (#25974)
* Contraband Storage Crate

* Better description

* Better Communication of Purpose

* Update Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 49c819373919d6ad2c7e1d802025782ecdce370b)
2024-03-17 14:59:05 +01:00
PJBot fe35391b4a
Automatic changelog update
(cherry picked from commit 469162077cd597dc83f67fc3ea98b05d4055c376)
2024-03-17 14:59:00 +01:00
PJBot 07cc8747fd
Automatic changelog update
(cherry picked from commit 3e04ed43c65792e51aa0898ff5d94ca58d3c4ea8)
2024-03-17 14:58:58 +01:00
Krunklehorn 1f9fa51a56
Fix Butcherable handling, ItemSlots for clown shoes (#25661)
* Fix butcherable handling

* ItemSlots for clown shoes

* Return if handled

* Handle if popup

* Whitespace, spoons are metal

* Zero damage plastic utensils, blacklist by metal+melee

* Hmmm truthy

* Plastic knives are knives too, just use that

* Delete unused tag

* Always true if doAfter

* Raw rat meat should be sliceable too

(cherry picked from commit 674b42b3a0ab9fa607887c1401f38ca1f8bb3911)
2024-03-17 14:58:56 +01:00
Mr. 27 6af478ae29
Zombie wideswing and misc fix (#26064)
* inital

* b

* Update MeleeWeaponComponent.cs

* Update Content.Shared/Zombies/ZombieComponent.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 3981173a1546dd1d4a21b1c85451ea7eaf69c6f8)
2024-03-17 14:58:53 +01:00
PJBot 9547604243
Automatic changelog update
(cherry picked from commit 67d4fee2858702b4d06aaeef594a72bed94bb2cb)
2024-03-17 14:58:51 +01:00
veprolet ac09dc586c
Cycle injector transfer amount on alt. use (#25566)
* Add toggle verb for injector transfer amount

* Fix injector verb priority scalability

---------

Co-authored-by: veprolet <>
(cherry picked from commit ad6ac73f6f41d1cbd3fe80a43c8bf4b83e03f392)
2024-03-17 14:58:50 +01:00
PJBot 0f6d334b31
Automatic changelog update
(cherry picked from commit a773182e3ebdaa35f5200b513d64c1ec2e3f86d1)
2024-03-17 14:58:45 +01:00