Ed cd736e4fd4 Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Maps/oasis.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/audio.yml

2024-12-11 14:49:02 +03:00

..

_CP14

Ed 10 12 2024 aah (#656)

2024-12-10 21:24:06 +03:00

Actions/Implants/implants.rsi

Implanters and Subdermal Implants (#11840)

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

Clothing

The Jumpsuit Re-Detailening (#33096)

2024-11-09 16:56:16 +11: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

Tech Anomaly (#31764)

2024-09-06 10:24:17 +03:00

Fluids

Make puddle smoothing better (#26171)

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

Interface

Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream

2024-12-11 14:49:02 +03:00

LobbyScreens

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

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

Logo

Edgefication (#590)

2024-11-18 14:40:52 +03:00

Markers

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

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

Mobs

Derelict Borg Revival (#33433)

2024-12-06 00:22:38 -06:00

Objects

Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream

2024-12-11 14:49:02 +03:00

Parallaxes

Remove CRLF, enforce with workflow (#26401)

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

Shaders

Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream

2024-08-05 15:28:42 +03:00

Structures

Fix swapped uniform printer east/west sprites (#33442)

2024-11-28 21:38:33 +11: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