VigersRay 47cdabdaed Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Shared/StatusEffect/StatusEffectsSystem.cs # Resources/Audio/Effects/attributions.yml # Resources/Locale/en-US/_strings/anomaly/inner_anomaly.ftl # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml # Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml		2024-09-19 16:09:00 +03:00
..
basalt.rsi	Add basalt tiles (#13462)	2023-01-17 11:28:37 -07:00
bricktile.rsi	Респрайт тайлов и декалей (#11)	2024-06-04 10:56:26 +03:00
burnt.rsi	Make fire leave burnt decals on the tiles (#31939)	2024-09-19 10:23:50 +10:00
concretetrim.rsi	Concrete and asphalt tiles (#19642)	2023-08-29 17:50:11 -05:00
derelictsign.rsi	Ports the derelict sign decal (#23544)	2024-01-04 22:35:31 -05:00
dirty.rsi	Adds Checkerboard Tiles, External Hull Plating, Hardened Reinforced Floors, & Monotile Dirty Decal (#18676)	2023-08-06 02:27:48 -06:00
Flora	Flora: rock fix (#7333)	2022-04-05 17:22:18 +10:00
markings.rsi	Респрайт тайлов и декалей (#11)	2024-06-04 10:56:26 +03:00
minitile.rsi	Респрайт тайлов и декалей (#11)	2024-06-04 10:56:26 +03:00
originsign.rsi	New station map Origin (#11659)	2022-10-27 09:12:56 -05:00
Overlays	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-14 19:55:44 +03:00
ss14sign.rsi	Old School Space Station 14 Sign (#10742)	2022-08-21 13:44:38 +02:00
syndlogo.rsi	Syndicate Logo (#14033)	2023-02-17 13:54:01 -08:00
wood_trim.rsi	Респрайт тайлов и декалей (#11)	2024-06-04 10:56:26 +03:00