fish-station/Resources
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
..
Audio Звуки кровотечения и печати автолатов (#2281) 2025-06-05 17:41:47 +03:00
Changelog Merge remote-tracking branch 'space-wizards/master' 2025-06-16 01:51:55 +03:00
ConfigPresets fix after upstream 2025-06-04 14:30:21 +03:00
Credits Update Credits (#38321) 2025-06-15 11:26:03 +02:00
Fonts Sentry turrets - Part 5: Reuseable UI components (#35149) 2025-05-03 12:19:08 -05:00
IgnoredPrototypes
Locale Merge remote-tracking branch 'space-wizards/master' 2025-06-16 01:51:55 +03:00
Maps Merge remote-tracking branch 'space-wizards/master' 2025-06-16 01:51:55 +03:00
Prototypes Merge remote-tracking branch 'space-wizards/master' 2025-06-16 01:51:55 +03:00
ServerInfo fix locale errors 2025-06-04 15:24:42 +03:00
Textures Merge remote-tracking branch 'space-wizards/master' 2025-06-16 01:51:55 +03:00
clientCommandPerms.yml Command to open chatbox in a new window (#33548) 2025-04-14 17:37:58 +02:00
engineCommandPerms.yml
keybinds.yml Merge remote-tracking branch 'space-wizards/master' 2025-05-27 03:41:41 +03:00
manifest.yml returned default ss14 logos 2025-04-18 17:41:44 +03:00
map_attributions.txt Amber Station - Small Improvements (#36335) 2025-04-14 11:58:21 -07:00
mapping_actions.yml action refactor proper ecs edition (#27422) 2025-05-28 15:52:11 -04:00
migration.yml Merge remote-tracking branch 'space-wizards/master' 2025-06-13 01:15:48 +03:00
sunrise_map_attributions.txt Возвращение барратри (#1788) 2025-04-18 00:51:17 +03:00
toolshedEngineCommandPerms.yml