Vigers Ray
e521cac521
Merge remote-tracking branch 'space-sunrise/master'
...
# Conflicts:
# Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
# Resources/migration.yml
2026-02-01 05:35:23 +01:00
Vigers Ray
bf135fe706
Спам в мессенжере ( #3835 )
2026-02-01 07:01:38 +03:00
Daniel
ce5ead1ecd
RobustChat в ignore_list.yml ( #3827 )
2026-01-30 18:46:45 +01:00
Vigers Ray
fc453a88c3
Merge remote-tracking branch 'space-sunrise/master'
2026-01-30 06:30:28 +01:00
KaiserMaus
4d7887aede
Update catalogs and Fix
...
Locale and Linter fix
2026-01-29 15:00:19 +00:00
Vigers Ray
ce86bdb8ad
Merge remote-tracking branch 'space-sunrise/master'
...
# Conflicts:
# Content.Server/_Sunrise/StationGoal/StationGoalPaperSystem.cs
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Guidebook/species.yml
# Resources/Prototypes/_Sunrise/AssaultOps/ghost_roles.yml
# Resources/Prototypes/_Sunrise/Entities/Customization/Markings/human_tails.yml
# Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml
2026-01-27 02:54:35 +01:00
KaiserMaus
e16ec96c5e
Экспедиции Пиратов ( #3659 )
2026-01-07 14:26:01 +03:00
Vigers Ray
869cf87d4f
Merge remote-tracking branch 'space-sunrise/master'
...
# Conflicts:
# Resources/Prototypes/Entities/Stations/nanotrasen.yml
# Resources/Prototypes/Maps/debug.yml
# Resources/Prototypes/_Sunrise/secret_weights.yml
# Resources/migration.yml
2026-01-04 03:42:53 +01:00
KaiserMaus
4788269210
Локаль+фикс стейтов Лазеров режимами в руке ( #3565 )
2025-12-31 17:43:07 +03:00
Vigers Ray
7eee898afc
Merge remote-tracking branch 'space-sunrise/master'
...
# Conflicts:
# Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
# Content.Client/_Sunrise/MentorHelp/MentorHelpControl.xaml.cs
# Content.Packaging/ServerPackaging.cs
# Content.Server/Content.Server.csproj
# Content.Server/Entry/EntryPoint.cs
# Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
# Content.Server/Fax/FaxSystem.cs
# Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleSystem.cs
# Content.Server/_Sunrise/Biocode/Systems/BiocodeDeactivationSystem.cs
# Content.Shared/CCVar/CCVars.Atmos.cs
# Content.Shared/Repairable/RepairableSystem.cs
# Content.Shared/_Sunrise/FleshCult/CauseFleshCultInfection.cs
# Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/belt/belts.ftl
# Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl
# Resources/Locale/en-US/_strings/medical/components/crew-monitoring-component.ftl
# Resources/Locale/en-US/_strings/reagents/meta/medicine.ftl
# Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/belt/belts.ftl
# Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/mech/mechs.ftl
# Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl
# Resources/Locale/ru-RU/_strings/_sunrise/markings/vulpkanin.ftl
# Resources/Locale/ru-RU/_strings/_sunrise/mentor-help/mentor-help-ui.ftl
# Resources/Locale/ru-RU/_strings/reagents/meta/medicine.ftl
# Resources/Maps/Nonstations/nukieplanet.yml
# Resources/Maps/_Sunrise/Nonstations/nukieplanet.yml
# Resources/Prototypes/Catalog/Fills/Items/belt.yml
# Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
# Resources/Prototypes/Damage/containers.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
# Resources/Prototypes/Reagents/fun.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Reagents/narcotics.yml
# Resources/Prototypes/Reagents/toxins.yml
# Resources/Prototypes/Roles/Antags/nukeops.yml
# Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
# Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml
# Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
# Resources/Prototypes/Store/currency.yml
# Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
# Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml
# Resources/Prototypes/_Sunrise/Chemistry/medicine.yml
# Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml
# Resources/Prototypes/_Sunrise/Entities/Mobs/Player/eviltwin.yml
# Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ghost_roles.yml
# Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml
# Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/_Sunrise/Entities/Objects/Specific/NTUplink.yml
# Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_brains.yml
# Resources/Prototypes/_Sunrise/Entities/Objects/Tools/biocode.yml
# Resources/Prototypes/_Sunrise/GameRules/events.yml
# Resources/Prototypes/_Sunrise/Reagents/gases.yml
# Resources/Prototypes/_Sunrise/Reagents/narcotics.yml
# Resources/Prototypes/_Sunrise/Roles/Jobs/Blueshield/blueshield_officer.yml
# Resources/Prototypes/_Sunrise/Roles/Jobs/Security/senior_officer.yml
# Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/meta.json
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonalert.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonalertdirect.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonalertnull.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonclose.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirect.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirectlarge.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirectsmall.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirectxtrlarge.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonfar.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonmedium.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonnull.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinpointer_bloodcult.png
# Resources/manifest.yml
2025-12-29 18:37:56 +01:00
Vigers Ray
2da8b9f545
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/CODEOWNERS
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Client/Changelog/ChangelogTab.xaml.cs
# Content.Client/Chemistry/UI/ChemMasterWindow.xaml
# Content.Client/Entry/EntryPoint.cs
# Content.Client/GameTicking/Managers/ClientGameTicker.cs
# Content.Client/Launcher/LauncherConnectingGui.xaml
# Content.Client/Lobby/LobbyState.cs
# Content.Client/Lobby/UI/LobbyGui.xaml
# Content.Client/Paper/UI/PaperWindow.xaml.cs
# Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs
# Content.Client/Stylesheets/StyleNano.cs
# Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
# Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs
# Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
# Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.IntegrationTests/Tests/Power/StationPowerTests.cs
# Content.Packaging/ServerPackaging.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
# Content.Server/Atmos/TileAtmosphere.cs
# Content.Server/Bible/BibleSystem.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Content.Server.csproj
# Content.Server/Discord/DiscordLink/DiscordLink.cs
# Content.Server/GameTicking/GameTicker.LobbyBackground.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Ghost/GhostSystem.cs
# Content.Server/Kitchen/Components/MicrowaveComponent.cs
# Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
# Content.Server/Mech/Systems/MechSystem.cs
# Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleSystem.cs
# Content.Server/Medical/DefibrillatorSystem.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Radio/EntitySystems/HeadsetSystem.cs
# Content.Server/Remotes/DoorRemoteSystem.cs
# Content.Server/RoundEnd/RoundEndSystem.cs
# Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
# Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
# Content.Server/Tips/TipsSystem.cs
# Content.Server/Traitor/Uplink/UplinkSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Bed/BedSystem.cs
# Content.Shared/Blocking/BlockingSystem.User.cs
# Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
# Content.Shared/Chat/SharedSuicideSystem.cs
# Content.Shared/Chemistry/Components/HyposprayComponent.cs
# Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs
# Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs
# Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
# Content.Shared/Chemistry/Events/HyposprayEvents.cs
# Content.Shared/Content.Shared.csproj
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/Friction/TileFrictionController.cs
# Content.Shared/GameTicking/SharedGameTicker.cs
# Content.Shared/Interaction/InteractHand.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/Medical/Healing/HealingSystem.cs
# Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
# Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
# Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
# Content.Shared/Throwing/ThrowingSystem.cs
# Content.Shared/Trigger/Systems/TriggerOnHitscanSystem.cs
# Content.Shared/Weapons/Hitscan/Systems/HitscanBasicDamageSystem.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Content.Shared/Weapons/Ranged/Components/BatteryWeaponFireModesComponent.cs
# Content.Shared/Weapons/Ranged/Components/HitscanBatteryAmmoProviderComponent.cs
# Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
# Content.Shared/Zombies/ZombieComponent.cs
# Content.Shared/_Sunrise/Lobby/LobbyBackgroundPrototype.cs
# README.md
# Resources/Locale/en-US/_strings/borg/borg.ftl
# Resources/Locale/en-US/_strings/chemistry/components/hypospray-component.ftl
# Resources/Locale/en-US/_strings/chemistry/components/injector-component.ftl
# Resources/Locale/en-US/_strings/commands/pauseatmos-command.ftl
# Resources/Locale/en-US/_strings/commands/quick-inspect-command.ftl
# Resources/Locale/en-US/_strings/commands/show-wallmounts-command.ftl
# Resources/Locale/en-US/_strings/commands/substepatmos-command.ftl
# Resources/Locale/en-US/_strings/fluids/components/equip-spray-component.ftl
# Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-revolutionary.ftl
# Resources/Locale/en-US/_strings/job/job-names.ftl
# Resources/Locale/en-US/_strings/lobby/lobby-state-background.ftl
# Resources/Locale/en-US/_strings/reagents/meta/medicine.ftl
# Resources/Locale/en-US/_strings/reagents/meta/physical-desc.ftl
# Resources/Locale/en-US/_strings/silicons/borg-module.ftl
# Resources/Locale/en-US/_strings/store/changeling-catalog.ftl
# Resources/Locale/en-US/_strings/store/currency.ftl
# Resources/Locale/en-US/_strings/store/store.ftl
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Body/Organs/slime.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/backpack.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
# Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
# Resources/Prototypes/Catalog/Fills/Crates/antag.yml
# Resources/Prototypes/Catalog/Fills/Crates/armory.yml
# Resources/Prototypes/Catalog/Fills/Crates/botany.yml
# Resources/Prototypes/Catalog/Fills/Crates/fun.yml
# Resources/Prototypes/Catalog/Fills/Crates/medical.yml
# Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
# Resources/Prototypes/Catalog/Fills/Crates/security.yml
# Resources/Prototypes/Catalog/Fills/Crates/service.yml
# Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
# Resources/Prototypes/Catalog/Fills/Items/belt.yml
# Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
# Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
# Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
# Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
# Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
# Resources/Prototypes/Entities/Debugging/debug_sweps.yml
# Resources/Prototypes/Entities/Debugging/stress_test.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
# Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml
# Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
# Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml
# Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
# Resources/Prototypes/Entities/Objects/Materials/parts.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Shields/shields.yml
# Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
# Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
# Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
# Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
# Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
# Resources/Prototypes/Entities/Structures/Walls/walls.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/GameRules/unknown_shuttles.yml
# Resources/Prototypes/InventoryTemplates/aghost_inventory_template.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/Maps/amber.yml
# Resources/Prototypes/Maps/oasis.yml
# Resources/Prototypes/Maps/reach.yml
# Resources/Prototypes/Objectives/objectiveGroups.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Reagents/narcotics.yml
# Resources/Prototypes/Reagents/toxins.yml
# Resources/Prototypes/Recipes/Reactions/medicine.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml
# Resources/Prototypes/Roles/play_time_trackers.yml
# Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
# Resources/Prototypes/Species/species_weights.yml
# Resources/Prototypes/Store/presets.yml
# Resources/Prototypes/ai_factions.yml
# Resources/Prototypes/borg_types.yml
# Resources/Prototypes/explosion.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/lobbyscreens.yml
# Resources/Prototypes/silicon-laws.yml
# Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-med.png
# Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-broken.png
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-empty.png
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-open.png
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley.png
# Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_chassis.png
# Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_harness+o.png
# Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_harness.png
# Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
# Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json
# Resources/Textures/Structures/Storage/canister.rsi/meta.json
# Resources/Textures/Structures/Storage/tanks.rsi/meta.json
# Resources/migration.yml
# RobustToolbox
# SECURITY.md
# SpaceStation14.sln
2025-12-26 04:19:27 +01:00
Vigers Ray
3d383e5377
Уменьшение количества редактирований файлов оффов ( #3365 )
2025-12-26 03:30:36 +03:00
KaiserMaus
33b4dbb91f
NPC Пираты, снаряжение пиратов, консоль-аплинк пиратов. ( #3370 )
...
Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-12-25 20:25:55 +03:00
KAVALDi
9b7905e8f5
ПТ | Обновление | 2.1.0 | ( #3337 )
...
Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-12-25 20:15:10 +03:00
KaiserMaus
bc354f0587
Новая HellspawnBoss Арена ( #3489 )
2025-12-24 17:32:17 +03:00
KaiserMaus
3372b953a5
Tajaran resprite ( #3452 )
2025-12-19 18:05:21 +00:00
Myra
c6430203cf
Update the erase script to support the latest migration ( #41524 )
...
No changes needed, its compatible still
Tested in production :3
2025-12-09 18:46:34 +00:00
KaiserMaus
94cbb081ac
Фиксы прошлый Пров и апстримов ( #3444 )
2025-12-06 16:59:03 +00:00
VigersRay
60ee33dd38
gay
2025-11-15 15:01:35 +01:00
VigersRay
c8add26210
ыыы
2025-11-15 14:40:13 +01:00
VigersRay
444f237f5e
ssss
2025-11-15 14:14:03 +01:00
Vigers Ray
f8a718f2ac
Update genai configuration to use Client class
2025-11-15 06:00:54 +01:00
Vigers Ray
2596df712f
Update ai_review.py
2025-11-15 05:40:16 +01:00
Vigers Ray
7dffb85dbb
Increase MAX_OUTPUT_TOKENS to 1500
2025-11-15 04:47:48 +01:00
Vigers Ray
68af43f0a0
Refactor AI review script for improved functionality
2025-11-15 04:47:33 +01:00
Vigers Ray
0155988f90
Refactor AI review to use Google Gemini API
2025-11-15 04:28:49 +01:00
Vigers Ray
732f75b876
Change AI model from Phi-4 to GPT-4.1
2025-11-15 03:32:52 +01:00
Vigers Ray
a442ba8974
Change AI model to Microsoft Phi-4 reasoning
2025-11-15 03:26:00 +01:00
Vigers Ray
f19225b6f7
Refactor imports and update AI review function
2025-11-15 03:21:22 +01:00
Vigers Ray
ab4da0ef91
Refactor AI review to use Azure AI SDK
2025-11-15 03:10:51 +01:00
Vigers Ray
eb327ef7b1
Update ai_review.py
2025-11-15 02:58:55 +01:00
Vigers Ray
ad7209044b
Implement functions to get PR title and body
...
Added functions to retrieve PR title and body from text files.
2025-11-15 02:36:18 +01:00
Vigers Ray
904dc97fcd
Fix formatting of SystemMessage and UserMessage
2025-11-15 02:34:13 +01:00
Vigers Ray
0fd56f0411
Update ai_review.py
2025-11-15 01:27:33 +01:00
Vigers Ray
a7f8d22ebc
Add AI review script for Pull Request analysis
...
This script reads a diff from a file, loads a game design document, and uses AI to review the changes against the GDD, providing feedback and recommendations.
2025-11-15 01:23:57 +01:00
Pieter-Jan Briers
b37970a6ae
Update GDPR dump script to latest migration ( #41387 )
2025-11-10 22:33:53 +00:00
VigersRay
6c158e6f0b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/CODEOWNERS
# .github/ISSUE_TEMPLATE/config.yml
# .github/ISSUE_TEMPLATE/issue_report.md
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
# Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
# Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml
# Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
# Content.Client/Weapons/Ranged/Systems/GunSystem.cs
# Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
# Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
# Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs
# Content.Server/Atmos/EntitySystems/FlammableSystem.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Destructible/Thresholds/DamageThreshold.cs
# Content.Server/Entry/EntryPoint.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.cs
# Content.Server/GuideGenerator/ReagentEntry.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Medical/VomitSystem.cs
# Content.Server/Radio/EntitySystems/HeadsetSystem.cs
# Content.Server/Revenant/EntitySystems/RevenantSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Armor/SharedArmorSystem.cs
# Content.Shared/Bed/Sleep/SleepingSystem.cs
# Content.Shared/Cabinet/ItemCabinetSystem.cs
# Content.Shared/Chat/SharedChatSystem.Emote.cs
# Content.Shared/Chat/SharedChatSystem.cs
# Content.Shared/Clothing/EntitySystems/MaskSystem.cs
# Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
# Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Content.Shared/IoC/SharedContentIoC.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/Ninja/Components/NinjaSuitComponent.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Revenant/Components/RevenantComponent.cs
# Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
# Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Content.Shared/Weapons/Ranged/HitscanPrototype.cs
# Content.Shared/Xenoarchaeology/Artifact/XAT/BaseQueryUpdateXATSystem.cs
# README.md
# Resources/Audio/Weapons/attributions.yml
# Resources/Locale/en-US/_strings/ghost/make-ghost-gui.ftl
# Resources/Locale/en-US/_strings/guidebook/chemistry/conditions.ftl
# Resources/Locale/en-US/_strings/guidebook/chemistry/effects.ftl
# Resources/Locale/en-US/_strings/guidebook/chemistry/healthchange.ftl
# Resources/Locale/en-US/_strings/guidebook/chemistry/statuseffects.ftl
# Resources/Locale/en-US/_strings/job/job-description.ftl
# Resources/Locale/en-US/_strings/medical/components/crew-monitoring-component.ftl
# Resources/Locale/en-US/_strings/npc/hugbot.ftl
# Resources/Locale/en-US/_strings/npc/npc-debug.ftl
# Resources/Locale/en-US/_strings/speech/speech-triggers.ftl
# Resources/Locale/en-US/_strings/ui/stat-values.ftl
# Resources/Locale/en-US/guidebook/chemistry/conditions.ftl
# Resources/Locale/en-US/guidebook/chemistry/effects.ftl
# Resources/Locale/en-US/guidebook/chemistry/healthchange.ftl
# Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl
# Resources/Locale/en-US/guidebook/entity-effects/effects.ftl
# Resources/Locale/en-US/guidebook/entity-effects/healthchange.ftl
# Resources/Maps/Shuttles/cargo_relic.yml
# Resources/Maps/_Sunrise/Station/bagel.yml
# Resources/Maps/_Sunrise/Station/barratry.yml
# Resources/Maps/_Sunrise/Station/fland.yml
# Resources/Maps/_Sunrise/Station/marathon.yml
# Resources/Maps/_Sunrise/Station/oasis.yml
# Resources/Maps/_Sunrise/Station/packed.yml
# Resources/Maps/_Sunrise/Station/plasma.yml
# Resources/Maps/_Sunrise/Station/relic.yml
# Resources/Maps/_Sunrise/event/clon_mine.yml
# Resources/Maps/_Sunrise/event/void.yml
# Resources/Prototypes/Body/Prototypes/vox.yml
# Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
# Resources/Prototypes/Catalog/Fills/Crates/fun.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Clothing/Belt/belts.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
# Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
# Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Objectives/objectiveGroups.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Reagents/narcotics.yml
# Resources/Prototypes/Reagents/toxins.yml
# Resources/Prototypes/Recipes/Lathes/Packs/biogen.yml
# Resources/Prototypes/Recipes/Lathes/Packs/security.yml
# Resources/Prototypes/Recipes/Lathes/biogen.yml
# Resources/Prototypes/Roles/Antags/nukeops.yml
# Resources/Prototypes/Roles/Antags/revolutionary.yml
# Resources/Prototypes/Roles/Antags/thief.yml
# Resources/Prototypes/Roles/Antags/traitor.yml
# Resources/Prototypes/Roles/Antags/wizard.yml
# Resources/Prototypes/Roles/Antags/zombie.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
# Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
# Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
# Resources/Prototypes/Roles/Jobs/Science/scientist.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/Stacks/Materials/crystals.yml
# Resources/Prototypes/Stacks/floor_tile_stacks.yml
# Resources/Prototypes/tags.yml
# Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/moth3.png
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mw.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw0.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwb.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody0.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwo.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw0.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_running_unlit.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_unlit.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwb.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png
# Resources/migration.yml
# RobustToolbox
2025-10-19 17:38:04 +02:00
Pieter-Jan Briers
3fb57679be
Prometheus exporter for github repo stats ( #38607 )
...
* Prometheus exporter for github repo stats
I want more grafana charts
Already deployed on moon, this is just so other codebases can use it if they want.
* Add docs and issue/PR priorities
* Sure add merge conflicts too
2025-10-14 21:44:05 +00:00
opl-
b9254d9ebf
Replace all usages of /bin/bash shebang with /usr/bin/env ( #40756 )
...
Replace all usages of /bin/bash with /usr/bin/env
/usr/bin/env is nearly guaranteed to always exist at that location, which can't be said about /bin/bash and /bin/sh.
Co-authored-by: opl <4833621+opl@users.noreply.github.com>
2025-10-12 19:49:41 +00:00
Pieter-Jan Briers
4eaf7526e4
Fix patrons in in-game credits ( #40840 )
2025-10-12 10:51:33 +00:00
Vigers Ray
e67f4a6672
Merge remote-tracking branch 'space-wizards/master'
2025-09-27 03:54:27 +03:00
KaiserMaus
242b1a0a82
Разделение аплинков ОБР по тегам и их асортимента ( #3246 )
2025-09-27 00:56:03 +03:00
KaiserMaus
ba64320dac
Refactor ammo craft and Ammo, Uplink tweaks ( #3214 )
2025-09-27 00:51:02 +03:00
KaiserMaus
7d81ad1544
Локаль Ментор Хелпа ( #3210 )
2025-09-12 01:15:30 +01:00
KaiserMaus
81c0ac9fb6
Новые Кибер руки и увелечение цен имплантов ( #3162 )
2025-09-11 18:01:48 +01:00
ReWAFFlution
09881da898
Merge remote-tracking branch 'sunrise/master'
2025-09-07 11:40:50 +03:00
KaiserMaus
bb43ab9d92
Ядрёные оперативники: небольшие изменения в цене в аплинке ( #3067 )
2025-09-05 00:27:17 +01:00
ReWAFFlution
bc3d585341
пжуп
2025-08-30 01:51:25 +03:00
ReWAFFlution
cdf03865ae
wtf
2025-08-29 20:04:35 +03:00
Southbridge
5ddf503331
Updated Aseprite Tools ( #39358 )
...
Modified aesprite tools
2025-08-28 17:44:50 -04:00
