Vigers Ray 6e8e359a66 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Resources/Locale/en-US/_strings/flash/components/flash-immunity-component.ftl # Resources/Locale/en-US/_strings/tiles/tiles.ftl # Resources/Prototypes/Actions/changeling.yml # Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml # Resources/Prototypes/Entities/Structures/Furniture/chairs.yml # Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml # Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml # Resources/Prototypes/Maps/Pools/default.yml # Resources/Prototypes/Stacks/floor_tile_stacks.yml # Resources/Prototypes/Tiles/floors.yml # Resources/Textures/Objects/Tiles/tile.rsi/meta.json # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json # Resources/Textures/Tiles/xeno_flooring.png # Resources/Textures/Tiles/xeno_maint.png # Resources/Textures/Tiles/xeno_steel.png		2025-06-16 01:51:55 +03:00
..
_RMC14	Метатель гранат СБ (#2317)	2025-06-12 21:48:36 +03:00
_Sunrise	Небольшие дополнения к худам (#2374)	2025-06-16 01:20:37 +03:00
Actions	Chameleon controller implant (Clothing fast switch) (#33887)	2025-05-30 12:07:25 +02:00
Changeling	Говнокрад (#268)	2024-08-08 09:28:44 +03:00
Clothing	Merge remote-tracking branch 'space-wizards/master'	2025-06-14 20:37:34 +03:00
Decals	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-19 16:09:00 +03:00
deprecated.rsi
Effects	Merge remote-tracking branch 'space-wizards/master'	2025-06-14 20:37:34 +03:00
Fluids	Make puddle smoothing better (#26171)	2024-03-18 10:15:45 +11:00
Interface	Merge remote-tracking branch 'space-wizards/master'	2025-06-16 01:51:55 +03:00
LobbyScreens	upstream	2024-09-16 12:40:23 +03:00
Logo	fix default logo	2025-04-19 16:24:29 +03:00
Markers	Decal Spawners (#37066)	2025-05-27 16:55:48 -07:00
Mobs	Merge remote-tracking branch 'space-wizards/master'	2025-06-13 01:15:48 +03:00
Objects	Merge remote-tracking branch 'space-wizards/master'	2025-06-16 01:51:55 +03:00
Parallaxes	Exo Station - Upstream Playtest Version (#33144)	2025-06-15 12:10:22 -07:00
Shaders	Merge remote-tracking branch 'space-wizards/master'	2025-06-13 01:15:48 +03:00
Structures	Merge remote-tracking branch 'space-wizards/master'	2025-06-16 01:51:55 +03:00
Template	EVA suit re-resprite (#37299)	2025-05-12 00:01:48 -04:00
Tiles	Merge remote-tracking branch 'space-wizards/master'	2025-06-16 01:51:55 +03:00
Tips/tippy.rsi	Tippy, the helpful hint clown! (#26767)	2024-04-28 21:38:16 -07:00