Ed 2367085160 Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream ...

# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Client/Clothing/ClientClothingSystem.cs
#	Content.Client/Hands/Systems/HandsSystem.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Hands/Components/HandsComponent.cs
#	Content.Shared/Inventory/InventoryComponent.cs
#	Content.Shared/Storage/StorageComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Entities/Mobs/Player/human.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/saltern.yml

2024-07-23 12:24:42 +03:00

..

_CP14

Wave shader WIP (#288)

2024-07-23 11:27:09 +03:00

Actions/Implants/implants.rsi

Implanters and Subdermal Implants (#11840)

2022-11-20 17:49:37 +11:00

Clothing

Minor vox headwear update (#30150)

2024-07-23 12:18:32 +10:00

Decals

Upstream suka (#45)

2024-04-06 13:13:22 +03:00

deprecated.rsi

Adds stair entities (with new sprites,) nukes stair decals (#20279)

2023-09-18 13:17:19 -06:00

Effects

Add FTL arrival visuals (#29402)

2024-07-01 16:11:30 +10:00

Fluids

Make puddle smoothing better (#26171)

2024-03-18 10:15:45 +11:00

Interface

Merge remote-tracking branch 'upstream/master' into ed-30-06-2024-upstream

2024-06-30 11:18:30 +03:00

LobbyScreens

reclaimer-lobby-art (#29343)

2024-06-25 15:28:37 +02:00

Logo

new logo + localization pack (до speech) (#5)

2024-03-30 01:17:43 +03:00

Markers

Adds Hellspawn (Nar'Sie demon mob) (#20291)

2024-01-04 05:53:15 -07:00

Mobs

Displacement maps big update (#30093)

2024-07-23 12:04:09 +03:00

Objects

add an arabian lamp. (#27270)

2024-07-21 01:24:28 -06:00

Parallaxes

Remove CRLF, enforce with workflow (#26401)

2024-03-24 22:06:17 +01:00

Shaders

Update hcut.swsl (#284)

2024-06-27 14:35:06 +03:00

Structures

The Shelfs Update (#27858)

2024-07-21 11:16:58 -06:00

Template

Sign Resprite (#29806)

2024-07-17 14:35:18 +10:00

Tiles

metal foam grenades (#29428)

2024-07-08 00:26:58 +10:00

Tips/tippy.rsi

Tippy, the helpful hint clown! (#26767)

2024-04-28 21:38:16 -07:00