Ed 7328f3449c Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/EntityTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Procedural/DungeonSystem.Rooms.cs
#	Content.Server/Procedural/RoomFillComponent.cs
#	Content.Server/Procedural/RoomFillSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Projectiles/SharedProjectileSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/migration.yml

2025-02-16 11:58:47 +03:00

..

_CP14

Modular weapon inlay (#903)

2025-02-16 11:41:43 +03:00

Actions/Implants/implants.rsi

…

Clothing

Move the soles of the feet on the backward facing part of the RD's vox hardsuit sprite to the left by 1 pixel (#35134)

2025-02-13 21:09:06 +01:00

Decals

Make fire leave burnt decals on the tiles (#31939)

2024-09-19 10:23:50 +10:00

deprecated.rsi

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

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

Effects

Upstream sync (#786)

2025-01-21 23:57:12 +03:00

Fluids

Make puddle smoothing better (#26171)

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

Interface

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +03:00

LobbyScreens

Recompress some lobby images to be under a 1mb (#31404)

2024-09-05 01:37:52 +10:00

Logo

Upstream sync (#846)

2025-02-06 13:57:14 +03:00

Markers

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

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

Mobs

Elf Ears (#33572)

2025-02-05 08:49:04 -08:00

Objects

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +03:00

Parallaxes

Removes weh.txt from Textures/Parallaxes (#34097)

2024-12-28 17:52:27 +01:00

Shaders

Merge remote-tracking branch 'upstream/staging' into ed-22-12-2024-upstream

2024-12-22 15:48:30 +03:00

Structures

Sentry turrets - Part 1: Art assets (#35025)

2025-02-11 00:25:30 -06:00

Template

Sign Resprite (#29806)

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

Tiles

Removes burnt tiles (#33422)

2024-11-28 09:49:41 +03:00

Tips/tippy.rsi

Tippy, the helpful hint clown! (#26767)

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