fish-station/Resources/Prototypes
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
_Sunrise Расширение функционала зависимости работок от работок (#2372) 2025-06-16 01:21:26 +03:00
Accents
Access
Actions Merge remote-tracking branch 'space-wizards/master' 2025-06-16 01:51:55 +03:00
AlertLevels
Alerts Merge remote-tracking branch 'space-wizards/master' 2025-06-04 17:17:06 +03:00
Anomaly
AppearanceCustomization
Atmospherics
Body
Catalog Merge remote-tracking branch 'space-wizards/master' 2025-06-14 20:37:34 +03:00
Chemistry
Codewords Split codewords into its own system (#37928) 2025-06-05 19:19:41 -04:00
Damage Merge remote-tracking branch 'space-wizards/master' 2025-06-14 20:37:34 +03:00
Datasets
Decals Exo Station - Upstream Playtest Version (#33144) 2025-06-15 12:10:22 -07:00
Device
DeviceLinking
Entities Merge remote-tracking branch 'space-wizards/master' 2025-06-16 01:51:55 +03:00
EntityLists/Tools
Flavors Add corgium (#37951) 2025-06-14 11:07:48 +02:00
GameRules мини реворк революции 2025-06-13 05:03:48 +03:00
GhostRoleRaffles
Guidebook
Hydroponics
InventoryTemplates Merge remote-tracking branch 'space-wizards/master' 2025-06-14 20:37:34 +03:00
Loadouts Merge remote-tracking branch 'space-wizards/master' 2025-06-04 13:39:57 +03:00
LootTables
Magic Merge remote-tracking branch 'space-wizards/master' 2025-06-04 13:39:57 +03:00
Maps Merge remote-tracking branch 'space-wizards/master' 2025-06-16 01:51:55 +03:00
Mood
NPCs
Objectives Merge remote-tracking branch 'space-wizards/master' 2025-06-09 22:00:17 +03:00
Palettes
Parallaxes Merge remote-tracking branch 'space-wizards/master' 2025-06-16 01:51:55 +03:00
Polymorphs Merge remote-tracking branch 'space-wizards/master' 2025-06-14 20:37:34 +03:00
Procedural Merge remote-tracking branch 'space-wizards/master' 2025-06-04 13:39:57 +03:00
RCD
Reagents Merge remote-tracking branch 'space-wizards/master' 2025-06-14 20:37:34 +03:00
Recipes Merge remote-tracking branch 'space-wizards/master' 2025-06-16 01:51:55 +03:00
Research Метатель гранат СБ (#2317) 2025-06-12 21:48:36 +03:00
Roles мини реворк революции 2025-06-13 05:03:48 +03:00
Shaders Merge remote-tracking branch 'space-wizards/master' 2025-06-04 13:39:57 +03:00
Shuttles
SoundCollections
Species
Stacks Merge remote-tracking branch 'space-wizards/master' 2025-06-16 01:51:55 +03:00
StatusIcon Фикс ерророк (#2312) 2025-06-11 05:38:56 +03:00
Store
StoryGen
Tiles Merge remote-tracking branch 'space-wizards/master' 2025-06-16 01:51:55 +03:00
Traits Merge remote-tracking branch 'space-wizards/master' 2025-06-04 13:39:57 +03:00
Vampire
Voice
Wires
World
XenoArch Артефакты-предметы, смешной хаос и не только (#2263) 2025-06-02 22:11:30 +03:00
ai_factions.yml
audio.yml
bar_signs.yml
borg_types.yml
contraband_severities.yml
edge_spreaders.yml
explosion.yml
floor_trap.yml
fonts.yml
game_presets.yml
holidays.yml
hud.yml
item_size.yml
lobbyscreens.yml
name_identifier_groups.yml
ore.yml
radio_channels.yml
round_announcements.yml
secret_weights.yml
silicon-laws.yml
status_effects.yml
tags.yml Merge remote-tracking branch 'space-wizards/master' 2025-06-14 20:37:34 +03:00
themes.yml
threats.yml
tool_qualities.yml
typing_indicator.yml
weather.yml
whitelists.yml
wizardsDenWhitelists.yml