fish-station/Resources/Prototypes/Entities
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
..
Clothing Merge remote-tracking branch 'space-wizards/master' 2025-06-14 20:37:34 +03:00
Debugging Новые смешные эффекты для артефактов с Fire Station (#2135) 2025-05-27 01:10:10 +03:00
Effects Merge remote-tracking branch 'space-wizards/master' 2025-06-16 01:51:55 +03:00
Guidebook фиксы 2024-09-19 16:57:23 +03:00
Markers Merge remote-tracking branch 'space-wizards/master' 2025-06-14 20:37:34 +03:00
Mobs Merge remote-tracking branch 'space-wizards/master' 2025-06-16 01:51:55 +03:00
Objects Merge remote-tracking branch 'space-wizards/master' 2025-06-16 01:51:55 +03:00
Stations Артефакты-предметы, смешной хаос и не только (#2263) 2025-06-02 22:11:30 +03:00
Structures Merge remote-tracking branch 'space-wizards/master' 2025-06-16 01:51:55 +03:00
Tiles IconSmooth additional smoothing keys (#35790) 2025-03-13 00:51:48 +01:00
Virtual Replace noSpawn: true with categories: [ HideSpawnMenu ] (#30100) 2024-07-25 05:24:00 -07:00
World Replace noSpawn: true with categories: [ HideSpawnMenu ] (#30100) 2024-07-25 05:24:00 -07:00
categories.yml convert it to entity category 2025-01-29 12:22:38 +01:00
foldable.yml Deploy foldable (#30000) 2024-08-02 17:05:12 +10:00