Ed 6174713383 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-27-04-2024-displacement-upstream ...

# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml

2024-04-27 10:45:35 +03:00

..

_CP14

update cave wall to high format (#113)

2024-04-27 10:02:59 +03:00

Actions/Implants/implants.rsi

Implanters and Subdermal Implants (#11840)

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

Clothing

welding gas mask (#27108)

2024-04-27 15:47:38 +10: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 'space-station-14/master' into 21-04-2024-cleaning-up

2024-04-21 20:54:50 +03:00

LobbyScreens

Upstream suka (#45)

2024-04-06 13:13:22 +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

Vox sprite rework (#26985)

2024-04-27 16:04:51 +10:00

Objects

Added Chopsticks (#27298)

2024-04-26 22:39:32 +10: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

Revert "Maints Exit Sign" (#27271)

2024-04-23 20:40:26 +02: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