Ed 3a910a7f7f Merge remote-tracking branch 'upstream/master' into ed-21-06-2024-upstream-sync ...

# Conflicts:
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/train.yml

2024-06-21 18:30:31 +03:00

..

_CP14

Tiles update + iron bards (#260)

2024-06-21 00:18:47 +03:00

Actions/Implants/implants.rsi

Implanters and Subdermal Implants (#11840)

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

Clothing

hos cap resprite (#29208)

2024-06-19 10:49:19 -04: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

Vox sprite rework (#26985)

2024-04-27 16:04:51 +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-13-06-2024-upstream2

2024-06-13 12:35:00 +03:00

LobbyScreens

Revert "Ed 09 06 2024 upstream (#230)"

2024-06-11 15:20:47 +03: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

Fix Underwing wings (#29092)

2024-06-18 22:24:28 -04:00

Objects

golden plunger (#29043)

2024-06-21 00:24:36 +10:00

Parallaxes

Remove CRLF, enforce with workflow (#26401)

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

Shaders

Flash overlay rework and bugfixes (#27369)

2024-06-02 00:17:53 -04:00

Structures

Fix terrible portable scrubber unlit layers (#29232)

2024-06-19 18:14:47 -04:00

Template

Fixes reptilian "full" sprite + adds reptilian template to the raw sprites folder (#22112)

2023-12-08 17:29:54 -05:00

Tiles

Removes Trials of Mana grassland sprites: Bare Minimum Edition (#28868)

2024-06-11 23:04:43 -07:00

Tips/tippy.rsi

Tippy, the helpful hint clown! (#26767)

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