Ed 5b2020d708 Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream ...

# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml

2024-09-08 21:20:54 +03:00

..

_CP14

Cucumber! Potato! (#430)

2024-09-01 16:14:56 +03:00

Actions/Implants/implants.rsi

Implanters and Subdermal Implants (#11840)

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

Clothing

Add justice helm (#31905)

2024-09-06 21:04:31 -06:00

Decals

New decals for mapping (#30374)

2024-08-09 17:06:37 +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/master' into ed-08-09-2024-upstream

2024-09-08 21:20:54 +03:00

LobbyScreens

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

2024-09-05 01:37:52 +10: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

Metamorphosis - FoodSequence 3 (#31012)

2024-09-08 02:22:27 -04:00

Objects

Metamorphosis - FoodSequence 3 (#31012)

2024-09-08 02:22:27 -04: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

Tech Anomaly (#31764)

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

Template

Sign Resprite (#29806)

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

Tiles

Small json files fixes (#30907)

2024-08-11 23:26:45 +10:00

Tips/tippy.rsi

Tippy, the helpful hint clown! (#26767)

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