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

# Conflicts:
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/lobbyscreens.yml

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

..

_CP14

Entity ru localization sync (#285)

2024-06-28 12:25:20 +03:00

Actions/Implants/implants.rsi

Implanters and Subdermal Implants (#11840)

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

Clothing

Security Webbing Resprite (#29441)

2024-06-25 22:00:16 -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

Fix SSD indicator for scaled humanoids (#29310)

2024-06-22 11:11:40 +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

Fix Underwing wings (#29092)

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

Objects

Revert "plutonium core steal objective" (#29578)

2024-06-30 01:23:03 +10: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

Add sprite for vent under-pressure lock-out (#29527)

2024-06-28 22:02:48 -07: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