Ed dda8ea2b09 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream ...

# Conflicts:
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Maps/oasis.yml

2024-05-13 18:32:59 +03:00

..

_CP14

Alchemy tools: pestle and mortar (#144)

2024-05-08 17:15:31 +03:00

Actions/Implants/implants.rsi

Implanters and Subdermal Implants (#11840)

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

Clothing

Fix security jumpsuit sprite's asymmetry (#27925)

2024-05-11 08:52:57 -05: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 'refs/remotes/upstream/master' into ed-13-05-2024-upstream

2024-05-13 18:32:59 +03:00

LobbyScreens

New lobby art: Just a week away (#27717)

2024-05-06 01:17:35 -07: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

Gives vox The Brows in their front facing sprite (#27922)

2024-05-11 10:54:56 -04:00

Objects

Adds wielding for all large guns (#26970)

2024-05-09 19:58:15 -07:00

Parallaxes

Remove CRLF, enforce with workflow (#26401)

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

Shaders

Displacement map prototype (#26709)

2024-04-27 16:03:58 +10:00

Structures

Atmos pipes now deal blunt damage (#27673)

2024-05-08 23:00:47 -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

Floor trap (#26314)

2024-04-20 16:09:00 +10:00

Tips/tippy.rsi

Tippy, the helpful hint clown! (#26767)

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