rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Server/StationEvents/Events
History
VigersRay 0441b8b814 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/Launcher/LauncherConnecting.cs
#	Content.Client/Launcher/LauncherConnectingGui.xaml
#	Content.Client/Launcher/LauncherConnectingGui.xaml.cs
#	Content.Server/Administration/Managers/BanManager.cs
#	Content.Server/Medical/Components/HealthAnalyzerComponent.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Content.Server/StationEvents/Events/RandomSentienceRule.cs
#	Content.Shared/Interaction/Components/BlockMovementComponent.cs
#	Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
#	Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Objectives/objectiveGroups.yml
#	Resources/Prototypes/Objectives/stealTargetGroups.yml
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Prototypes/Species/human.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
#	Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
#	Resources/migration.yml
2024-08-22 06:50:04 +03:00
..
AlertLevelInterceptionRule.cs move gamerule components to shared (#28572) 2024-06-04 21:53:24 +10:00
AnomalySpawnRule.cs move gamerule components to shared (#28572) 2024-06-04 21:53:24 +10:00
BluespaceArtifactRule.cs move gamerule components to shared (#28572) 2024-06-04 21:53:24 +10:00
BluespaceLockerRule.cs Fix replayghost spawning location (#30252) 2024-07-22 20:32:30 +01:00
BreakerFlipRule.cs Fix replayghost spawning location (#30252) 2024-07-22 20:32:30 +01:00
BureaucraticErrorRule.cs move gamerule components to shared (#28572) 2024-06-04 21:53:24 +10:00
CargoGiftsRule.cs move gamerule components to shared (#28572) 2024-06-04 21:53:24 +10:00
ClericalErrorRule.cs move gamerule components to shared (#28572) 2024-06-04 21:53:24 +10:00
FalseAlarmRule.cs move gamerule components to shared (#28572) 2024-06-04 21:53:24 +10:00
GasLeakRule.cs move gamerule components to shared (#28572) 2024-06-04 21:53:24 +10:00
ImmovableRodRule.cs move gamerule components to shared (#28572) 2024-06-04 21:53:24 +10:00
IonStormRule.cs Fix replayghost spawning location (#30252) 2024-07-22 20:32:30 +01:00
KudzuGrowthRule.cs move gamerule components to shared (#28572) 2024-06-04 21:53:24 +10:00
MassHallucinationsRule.cs MassHallucinationsRule Minor Refactor (#28748) 2024-07-20 15:53:57 +10:00
MeteorSwarmSystem.cs Фикс оповещений и возможно спама говна 2024-08-16 03:07:44 +03:00
PowerGridCheckRule.cs Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-07-24 20:36:22 +03:00
RandomEntityStorageSpawnRule.cs move gamerule components to shared (#28572) 2024-06-04 21:53:24 +10:00
RandomSentienceRule.cs Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-08-22 06:50:04 +03:00
RandomSpawnRule.cs move gamerule components to shared (#28572) 2024-06-04 21:53:24 +10:00
SolarFlareRule.cs move gamerule components to shared (#28572) 2024-06-04 21:53:24 +10:00
SpaceSpawnRule.cs item toggling giga rework + full ninja refactor (#28039) 2024-07-11 15:55:56 +10:00
StationEventSystem.cs Фикс оповещений и возможно спама говна 2024-08-16 03:07:44 +03:00
VentClogRule.cs Fix replayghost spawning location (#30252) 2024-07-22 20:32:30 +01:00
VentCrittersRule.cs Fix replayghost spawning location (#30252) 2024-07-22 20:32:30 +01:00