Commit graph

147 commits

Author SHA1 Message Date
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
Vigers Ray
2136b0b9f9 Переименованы прототипы и пути для фоновых изображений лобби, добавлен новый LobbyArtPrototype, внедрена поддержка разных типов фонов (арт, анимация, параллакс). 2026-01-07 13:07:27 +01:00
Vigers Ray
2beed69bcf
Сетевая подгрузка артов, анимаций и паралаксов. (#3646) 2026-01-07 06:40:08 +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
ThereDrD
c6f4b59e3a
Реверт системы эхо (#3531) 2025-12-28 21:38:18 +03:00
iertis
0736327c08
Фикс панели эмоутов и роадмапа (#3530) 2025-12-28 19:09:11 +03:00
iertis
a700c7628e
Fix "ыыыы" (#3516) 2025-12-26 17:44:36 +03: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
KAVALDi
9b7905e8f5
ПТ | Обновление | 2.1.0 | (#3337)
Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-12-25 20:15:10 +03:00
banumbas
7a977ad62c
Теперь можно настраивать тряску экрана в настройках доступности (#126)
* Теперь можно настраивать тряску экрана

* минимум 20%
2025-11-30 00:05:56 +02:00
slarticodefast
8c9c6dad82
Add keybinds for openening a specified component in VV (#41348)
* quick inspect

* Update Content.Client/Commands/QuickInspectCommand.cs

Co-authored-by: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com>

* documentation!!!

---------

Co-authored-by: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com>
2025-11-12 23:10:48 +00:00
Brandon Li
545cacbcae
StyleNano removal: Palette system and Sheetlets (#29903)
* Apply patch 1777eea9a4..6b32bb2b14

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* make red squiggly line go away

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Add todo list

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Add palette to `TextureButton`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Rename `PalettedButtonSheetlet` to `NTButtonSheetlet` and move useful methods to `ButtonSheetlet`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* migrate `ContextMenu` styles

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Update todo

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* tweak NT colors

* New stylesheet: `InterfaceStylesheet` & `InterfaceTooltipSheetlet`

* Move inheritance of `IButtonConfig` to `NanotransenStylesheet.Buttons`

* move `MenuButtonSheetlet` & actually implement `InterfaceStylesheet` correctly

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* tweak color & update todo

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* chat is this real (update chat palette)

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Update todo

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* `SmallButton` and remove some obsolete things from `StyleNano`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* rename `StyleClasses` to `StyleClass` so `Stylesheets.Redux.StyleClasses` syntax is dead

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* replace `ButtonColorGreen` with `Positive`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* `Placeholder`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Examine popup buttons

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* move over more things & cleanup `StyleNano` more (under 1000 lines!!!!)

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Remove some more redundant stuff

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Undo style change for chat window

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* paper editing works now

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* `OptionButton` styles

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* `ListContainer`, move `DefaultWindow` styles (for now) & more cleanup

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* fix `ActionButton` not having highlighting

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* remove imports of `Robust.Client.UserInterface.StylesheetHelpers` & format

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* `ButtonBig` and more cleanup

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Move items inheriting from `ISheetletConfig` into their own directory

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Cleanup & move `Label` styles

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Action search box styles

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Moved, stuff is

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* rename `LabelSubtext` to `LabelSubText` & move more stuff (were almost there!!)

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* yap & move over MORE stuff (just like one thing left!!!)

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Change status classes to appropriate existing classes

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* remove remaining references to `StyleNano`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Fix some hardcoding & broken code, `GetFromControl`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Scrollbars!

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* chores

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* clean up `StyleClass.cs`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* `ItemListSheetlet` refactor

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* more chores!

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Consistency w/ directory structure

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Move `MainMenuSheetlet`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* `ColorPalette`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* whoopsie

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Remove most sheet-specific sheetlets

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* fix warnings, cleanup, & fix scrollbar (this is why we fix warnings boys)

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* yap

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* MASSIVE resharper skill issue

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* actually use `ISheetletConfig`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* have specific sheetlet be specific

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* `GetResourceOr`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* cleanup & move / remove `IPalette`s

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* actually do specific stylesheets correctly & fix tooltips

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* cleanup & logging

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* Move `FontKind` and `FontKindExtensions` to their own files

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* rename `InterfaceStylesheet` to `SystemStylesheet`

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* change `ButtonHovered` etc to `PseudoHovered` etc

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* give the palettes fun names

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* `StyleSpace` is no more

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* It should compile now! I am now going to bed (fr) if it fails it fails

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* make squiggly red line go away

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

* add additional type restrictions to sheetlets

* `CommonStylesheet`

* minor cleanup

* Make `GetSheetletRules` not horrible

* wait this was duplicating style rules. oops!

* move some sheetlets to their associated xamls

* oh wait apparently that was important

* review pass 1

* review pass 2 (font & color stuff)

* review pass 3: remove unused stuff / filename fix

* fix warnings & "replace cast with explicit variable type"

* move `Palette` stuff to its own directory

* tweak colors (they're different now that I actually fixed the OKlab thing)

* review pass 4: little things

* make window close button grey before hovering

* refactor `HLine` to make it less terrible and allow it to be styled

* fix `NanoHeading` (it's been broken for a while whoops) and cleanup hardcoding

* band-aid missing references in `StyleNano`

* move `StyleBox` generating functions out of `IButtonSheetlet` into `StyleBoxHelper`

* remove dictionary field from `IStylesheetManager`

* Add check for unloaded sheetlets

* style tweaks to satisfy OCD

* I somehow missed this: `Caution` styleclass replaced with `negative`, refactor `PowerChargeWindow`

* tweak palettes for like the fourth time

* construct `StyleNano` / `StyleSpace` in `StylesheetManager` and mark them as obsolete

* rename `BackgroundPanel` classes for consistency

* tweak window / `ListContainer`

* oh right you use `///` not `/**`

* font system is bad, make it temporary

* acknowledge Divider funkyness

* remove use of class `Disabled`

* `ColorPalette` allow overriding colors with brace initialization

* review pass again

* tweak disabled button colors

* `StatusPalette` tweaks

* typo

* Make squiggly red line go away

* Delete `Redux`

* Remove all references to `Redux`

* make red less radioactive

* Store stylesheet name inside stylesheet class

* fix merge errors

* use RT's Oklab support instead

* shuffle around `StylesheetManager` fields

* apply stylesheets based off `StylesheetComponent`

* simplify `ColorPalette` construction

* add todo for `SheetletConfigType`

* `OptionButton` has a background color now

* fix disabled buttons

* sigh (red color palette fixed)

* make `ItemList` use primary palette

* Revert "apply stylesheets based off `StylesheetComponent`"

This reverts commit c05b147da845f6e04ff33d1cbd91a18a92c676d7.

* dead code removal

* buttons are green when pressed (we need togglebuttons)

---------

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
2025-10-19 21:10:44 +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
K-Dynamic
6661449633
Adds smart equip to pocket 1, pocket 2, and suit storage slots (#37975)
* pockets and exosuit smartequip

* add localisation
2025-10-04 01:33:59 +00:00
Vigers Ray
e67f4a6672 Merge remote-tracking branch 'space-wizards/master' 2025-09-27 03:54:27 +03:00
Copilot
aba00f7e8f
Implement Mentor Help System (MHelp) - Complete Ticket-based Help for Game Questions (#2915)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-09-09 20:54:52 +03:00
Copilot
d6747fa9ab
Add "Replays" button to escape menu and lobby with configurable URL (#3173)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
2025-09-08 20:26:10 +03:00
Vasilis The Pikachu
5100068a78
Revert "Admin Log Browser Improvements (#39130)"
This reverts commit f67cebf7a4.

Per request of @Kowlin and @southbridge-fur

Check out https://github.com/space-wizards/space-station-14/issues/39960 for further information
2025-08-31 17:50:37 +02:00
Copilot
c39491fe62
Реворк системы оповещений: пространственные динамики с очередью и умной фильтрацией чата (#3000)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-08-25 02:47:27 +03:00
Vigers Ray
252e81c728 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
#	Content.Server/Mindshield/MindShieldSystem.cs
#	Content.Shared/Gravity/SharedGravitySystem.cs
#	Content.Shared/Implants/SharedSubdermalImplantSystem.cs
#	Resources/Locale/en-US/_strings/traits/traits.ftl
#	Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
#	Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
#	Resources/Prototypes/Entities/Objects/Misc/implanters.yml
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
#	Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
#	Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-08-23 23:10:05 +03:00
Southbridge
f67cebf7a4
Admin Log Browser Improvements (#39130) 2025-08-21 22:12:16 +02:00
Vigers Ray
e61b998076 Revert "temp fix of radio icons"
This reverts commit 13cc38b490.
2025-08-15 21:38:03 +03:00
SplikZerys
13cc38b490 temp fix of radio icons 2025-08-15 16:07:37 +03:00
Vigers Ray
939076ff99 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	.github/CODEOWNERS
#	.github/workflows/publish.yml
#	Content.Client/Administration/UI/BanPanel/BanPanel.xaml
#	Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/Hands/Systems/HandsSystem.cs
#	Content.Client/Humanoid/HumanoidAppearanceSystem.cs
#	Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Client/Lobby/LobbyState.cs
#	Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
#	Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml.cs
#	Content.Client/Lobby/UI/LobbyGui.xaml
#	Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml
#	Content.Client/Options/UI/EscapeMenu.xaml
#	Content.Client/Stealth/StealthSystem.cs
#	Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
#	Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
#	Content.Client/UserInterface/Systems/Emotes/EmotesUIController.cs
#	Content.Client/Weapons/Ranged/Systems/GunSystem.cs
#	Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
#	Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Administration/Commands/AdminWhoCommand.cs
#	Content.Server/Administration/Commands/PardonCommand.cs
#	Content.Server/Administration/Commands/RoleUnbanCommand.cs
#	Content.Server/Administration/Commands/SetOutfitCommand.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
#	Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
#	Content.Server/Body/Components/BloodstreamComponent.cs
#	Content.Server/Body/Systems/BloodstreamSystem.cs
#	Content.Server/Body/Systems/MetabolizerSystem.cs
#	Content.Server/Body/Systems/RespiratorSystem.cs
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Chat/Systems/ChatSystem.Emote.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/CrewManifest/CrewManifestSystem.cs
#	Content.Server/Emp/EmpSystem.cs
#	Content.Server/Explosion/EntitySystems/TriggerSystem.cs
#	Content.Server/Fax/FaxSystem.cs
#	Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
#	Content.Server/GameTicking/Commands/ForceMapCommand.cs
#	Content.Server/GameTicking/Commands/ForcePresetCommand.cs
#	Content.Server/GameTicking/Presets/GamePresetPrototype.cs
#	Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs
#	Content.Server/GameTicking/Rules/Components/ChangelingRuleComponent.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/Ghost/Roles/GhostRoleSystem.cs
#	Content.Server/Implants/Components/ScramImplantComponent.cs
#	Content.Server/Implants/SubdermalImplantSystem.cs
#	Content.Server/Materials/ProduceMaterialExtractorSystem.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
#	Content.Server/NPC/Systems/NPCSystem.cs
#	Content.Server/Polymorph/Systems/PolymorphSystem.cs
#	Content.Server/Radio/EntitySystems/HeadsetSystem.cs
#	Content.Server/Repairable/RepairableSystem.cs
#	Content.Server/Revenant/EntitySystems/RevenantSystem.cs
#	Content.Server/RoundEnd/RoundEndSystem.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
#	Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
#	Content.Server/Speech/EntitySystems/FrontalLispSystem.cs
#	Content.Server/Speech/EntitySystems/LizardAccentSystem.cs
#	Content.Server/Speech/EntitySystems/MothAccentSystem.cs
#	Content.Server/Speech/EntitySystems/OwOAccentSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
#	Content.Server/Stunnable/Components/StunOnCollideComponent.cs
#	Content.Server/SurveillanceCamera/Components/SurveillanceCameraRouterComponent.cs
#	Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs
#	Content.Server/Zombies/ZombieSystem.Transform.cs
#	Content.Server/Zombies/ZombieSystem.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Bed/SharedBedSystem.cs
#	Content.Shared/Blocking/BlockingSystem.cs
#	Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
#	Content.Shared/Chemistry/Components/SolutionRegenerationComponent.cs
#	Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs
#	Content.Shared/Construction/Conditions/TileNotBlocked.cs
#	Content.Shared/Cuffs/SharedCuffableSystem.cs
#	Content.Shared/Doors/Systems/SharedDoorSystem.cs
#	Content.Shared/Emoting/EmoteAttemptEvent.cs
#	Content.Shared/Eye/Blinding/Systems/BlindableSystem.cs
#	Content.Shared/Eye/VisibilityFlags.cs
#	Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Interaction/SmartEquipSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
#	Content.Shared/Medical/Healing/HealingSystem.cs
#	Content.Shared/Medical/HealingComponent.cs
#	Content.Shared/Nutrition/EntitySystems/FoodSystem.cs
#	Content.Shared/Slippery/SlipperySystem.cs
#	Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
#	Content.Shared/Standing/StandingStateComponent.cs
#	Content.Shared/Standing/StandingStateSystem.cs
#	Content.Shared/Station/SharedStationSpawningSystem.cs
#	Content.Shared/Stunnable/SharedStunSystem.cs
#	Content.Shared/SurveillanceCamera/SharedSurveillanceCameraMonitorSystem.cs
#	Content.Shared/VendingMachines/VendingMachineComponent.cs
#	Content.Shared/Warps/WarpPointSystem.cs
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
#	Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
#	Content.Shared/Wieldable/SharedWieldableSystem.cs
#	Resources/Audio/Ambience/Antag/attributions.yml
#	Resources/Audio/Ambience/Antag/changeling_start.ogg
#	Resources/Audio/Effects/attributions.yml
#	Resources/Audio/Lobby/attributions.yml
#	Resources/Audio/Machines/attributions.yml
#	Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
#	Resources/Locale/en-US/_strings/administration/antag.ftl
#	Resources/Locale/en-US/_strings/administration/commands/camera.ftl
#	Resources/Locale/en-US/_strings/administration/commands/dsay-command.ftl
#	Resources/Locale/en-US/_strings/administration/commands/follow-command.ftl
#	Resources/Locale/en-US/_strings/administration/smites.ftl
#	Resources/Locale/en-US/_strings/administration/ui/admin-camera-window.ftl
#	Resources/Locale/en-US/_strings/administration/ui/role-bans.ftl
#	Resources/Locale/en-US/_strings/alerts/alerts.ftl
#	Resources/Locale/en-US/_strings/atmos/gas-pressure-regulator-system.ftl
#	Resources/Locale/en-US/_strings/bonk/components/bonkable-component.ftl
#	Resources/Locale/en-US/_strings/commands/add-body-part-command.ftl
#	Resources/Locale/en-US/_strings/commands/admin-logs-command.ftl
#	Resources/Locale/en-US/_strings/commands/admin-who-command.ftl
#	Resources/Locale/en-US/_strings/commands/asay-command.ftl
#	Resources/Locale/en-US/_strings/commands/crew-manifest-command.ftl
#	Resources/Locale/en-US/_strings/commands/deadmin-command.ftl
#	Resources/Locale/en-US/_strings/commands/delete-component-command.ftl
#	Resources/Locale/en-US/_strings/commands/destroy-mechanism-command.ftl
#	Resources/Locale/en-US/_strings/commands/dirty-command.ftl
#	Resources/Locale/en-US/_strings/commands/dsay-command.ftl
#	Resources/Locale/en-US/_strings/commands/dump-reagent-guide-text-command.ftl
#	Resources/Locale/en-US/_strings/commands/eye-commands.ftl
#	Resources/Locale/en-US/_strings/commands/follow-command.ftl
#	Resources/Locale/en-US/_strings/commands/force-map-command.ftl
#	Resources/Locale/en-US/_strings/commands/force-preset-command.ftl
#	Resources/Locale/en-US/_strings/commands/ghost-kick-command.ftl
#	Resources/Locale/en-US/_strings/commands/ghost-visibility-commands.ftl
#	Resources/Locale/en-US/_strings/commands/go-lobby-command.ftl
#	Resources/Locale/en-US/_strings/commands/grid-drag-command.ftl
#	Resources/Locale/en-US/_strings/commands/is-afk-command.ftl
#	Resources/Locale/en-US/_strings/commands/makesentient-command.ftl
#	Resources/Locale/en-US/_strings/commands/map-commands.ftl
#	Resources/Locale/en-US/_strings/commands/mapping-client-side-setup-command.ftl
#	Resources/Locale/en-US/_strings/commands/mappingclientsidesetup-command.ftl
#	Resources/Locale/en-US/_strings/commands/me-command.ftl
#	Resources/Locale/en-US/_strings/commands/mind-info-command.ftl
#	Resources/Locale/en-US/_strings/commands/node-vis-commands.ftl
#	Resources/Locale/en-US/_strings/commands/npc-command.ftl
#	Resources/Locale/en-US/_strings/commands/nukecodes-command.ftl
#	Resources/Locale/en-US/_strings/commands/ooc-command.ftl
#	Resources/Locale/en-US/_strings/commands/pardon-command.ftl
#	Resources/Locale/en-US/_strings/commands/powerstat-command.ftl
#	Resources/Locale/en-US/_strings/commands/promote-host-command.ftl
#	Resources/Locale/en-US/_strings/commands/radiation-command.ftl
#	Resources/Locale/en-US/_strings/commands/readmin-command.ftl
#	Resources/Locale/en-US/_strings/commands/remove-extra-components-command.ftl
#	Resources/Locale/en-US/_strings/commands/role-commands.ftl
#	Resources/Locale/en-US/_strings/commands/say-command.ftl
#	Resources/Locale/en-US/_strings/commands/set-battery-percent-command.ftl
#	Resources/Locale/en-US/_strings/commands/show-ambient-command.ftl
#	Resources/Locale/en-US/_strings/commands/show-gun-spread-command.ftl
#	Resources/Locale/en-US/_strings/commands/show-htn-command.ftl
#	Resources/Locale/en-US/_strings/commands/showrules-command.ftl
#	Resources/Locale/en-US/_strings/commands/spawn-entity-list-command.ftl
#	Resources/Locale/en-US/_strings/commands/start-singularity-command.ftl
#	Resources/Locale/en-US/_strings/commands/tile-pry-command.ftl
#	Resources/Locale/en-US/_strings/commands/toggle-decals-command.ftl
#	Resources/Locale/en-US/_strings/commands/toggle-disallow-late-join-command.ftl
#	Resources/Locale/en-US/_strings/commands/unlocknode-command.ftl
#	Resources/Locale/en-US/_strings/commands/whisper-command.ftl
#	Resources/Locale/en-US/_strings/components/gas-pressure-regulator-component.ftl
#	Resources/Locale/en-US/_strings/engineer-painter/engineer-painter.ftl
#	Resources/Locale/en-US/_strings/game-ticking/forcemap-command.ftl
#	Resources/Locale/en-US/_strings/interaction/interaction-popup-component.ftl
#	Resources/Locale/en-US/_strings/markings/vox_tattoos.ftl
#	Resources/Locale/en-US/_strings/materials/material-extractor.ftl
#	Resources/Locale/en-US/_strings/movement/eye.ftl
#	Resources/Locale/en-US/_strings/nutrition/components/food-component.ftl
#	Resources/Locale/en-US/_strings/nutrition/components/ingestion-system.ftl
#	Resources/Locale/en-US/_strings/nutrition/components/sealable-component.ftl
#	Resources/Locale/en-US/_strings/radiation/radiation-command.ftl
#	Resources/Locale/en-US/_strings/reagents/meta/physical-desc.ftl
#	Resources/Locale/en-US/_strings/research/technologies.ftl
#	Resources/Locale/en-US/_strings/seeds/seeds.ftl
#	Resources/Locale/en-US/_strings/weapons/grenades/timer-trigger.ftl
#	Resources/Locale/en-US/_strings/weapons/grenades/voice-trigger.ftl
#	Resources/Locale/en-US/commands/mapping-client-side-setup-command.ftl
#	Resources/Locale/en-US/recipes/tags.ftl
#	Resources/Maps/_Sunrise/Station/bagel.yml
#	Resources/Maps/_Sunrise/Station/barratry.yml
#	Resources/Maps/_Sunrise/Station/box.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/amber.yml
#	Resources/Maps/centcomm.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/service.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
#	Resources/Prototypes/Entities/Clothing/Belt/belts.yml
#	Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
#	Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
#	Resources/Prototypes/Entities/Clothing/Head/hats.yml
#	Resources/Prototypes/Entities/Clothing/Head/helmets.yml
#	Resources/Prototypes/Entities/Clothing/Head/hoods.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Entities/Mobs/Player/clone.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
#	Resources/Prototypes/Entities/Mobs/base.yml
#	Resources/Prototypes/Entities/Objects/Fun/pai.yml
#	Resources/Prototypes/Entities/Objects/Fun/toys.yml
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
#	Resources/Prototypes/Entities/Objects/Shields/shields.yml
#	Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
#	Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
#	Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
#	Resources/Prototypes/Entities/Objects/Tools/matches.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.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/Projectiles/grenade.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
#	Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
#	Resources/Prototypes/Entities/Structures/Furniture/beds.yml
#	Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
#	Resources/Prototypes/Entities/Structures/Power/debug_power.yml
#	Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
#	Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml
#	Resources/Prototypes/GameRules/subgamemodes.yml
#	Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
#	Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
#	Resources/Prototypes/Reagents/medicine.yml
#	Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml
#	Resources/Prototypes/Recipes/Lathes/categories.yml
#	Resources/Prototypes/Recipes/Reactions/chemicals.yml
#	Resources/Prototypes/Roles/Antags/changeling.yml
#	Resources/Prototypes/name_identifier_groups.yml
#	Resources/Prototypes/tool_qualities.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
#	Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
#	Resources/ServerInfo/Guidebook/Command.xml
#	Resources/ServerInfo/Guidebook/Glossary.xml
#	Resources/ServerInfo/Guidebook/NewPlayer/YourFirstCharacter.xml
#	Resources/ServerInfo/Guidebook/Science/Robotics.xml
#	Resources/ServerInfo/Guidebook/Science/ScannersAndVessels.xml
#	Resources/ServerInfo/Guidebook/Science/Science.xml
#	Resources/ServerInfo/Guidebook/SpaceStation14.xml
#	Resources/ServerInfo/Guidebook/Survival.xml
#	Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json
#	Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Objects/Misc/Lights/lampgreen.rsi/meta.json
#	Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
#	Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json
#	Resources/engineCommandPerms.yml
#	Resources/keybinds.yml
#	Resources/migration.yml
2025-08-10 01:49:23 +03:00
Vigers Ray
b52f640b5a
Порт стрельбы со старлайна (#2640)
Co-authored-by: KaiserMaus <kaiser.ratte@gmail.com>
2025-08-08 22:25:02 +03:00
Vigers Ray
24da82197e
Прицеливание через ПКМ. (#2694) 2025-08-02 05:04:30 +03:00
Pok
688c91b597
Add scaling filter option (Nearest/Bilinear) (#39111) 2025-07-27 20:26:17 +03:00
Ligyb
30f8e8d4d8
отключение ттс рации у гостов (#2629) 2025-07-22 19:54:25 +03:00
Princess Cheeseballs
dec2d42a1d
Crawling Part 1: The Knockdownening (#36881)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-07-20 01:54:42 +02:00
iertis
10065096fc
Настройка очереди ТТС в рации (#2465)
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-07-18 01:33:48 +03:00
SplikZerys
12c008f0f5
INTERACTION PANEL (#2551)
Co-authored-by: rhailrake <splatt.pr@gmail.com>
Co-authored-by: haiwwkes <49613070+rhailrake@users.noreply.github.com>
2025-07-13 16:48:32 -04:00
beck-thompson
14668f2414
Minor escape menu UX improvements (#38650) 2025-07-05 12:28:59 +03:00
metalgearsloth
60341cb245
Add wall-based ambient occlusion (#38276)
* Add wall ambient occlusion

* wawawewa

* Work

* cvars

* Comment to make slart happy
2025-06-24 17:56:14 +10:00
Vigers Ray
d791eb37bd Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Options/UI/Tabs/AccessibilityTab.xaml
#	Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
#	Content.Server/Access/Systems/AgentIDCardSystem.cs
#	Content.Server/Clothing/Systems/ChameleonClothingSystem.cs
#	Content.Server/Entry/IgnoredComponents.cs
#	Content.Shared/Access/Systems/SharedIdCardSystem.cs
#	Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
#	Resources/Locale/en-US/_strings/atmos/atmos-pipe-layers.ftl
#	Resources/Locale/en-US/_strings/chat/highlights.ftl
#	Resources/Locale/en-US/_strings/implant/chameleon-controller.ftl
#	Resources/Locale/en-US/_strings/prototypes/roles/antags.ftl
#	Resources/Locale/en-US/_strings/reagents/absinthe.ftl
#	Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
#	Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
#	Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
#	Resources/Prototypes/Entities/Structures/cryogenic_sleep_unit.yml
#	Resources/Prototypes/Recipes/Lathes/categories.yml
#	Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
#	Resources/Prototypes/Roles/Jobs/CentComm/official.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
#	Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.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/Textures/Structures/Doors/secret_door.rsi/assembly.png
#	Resources/Textures/Structures/Doors/secret_door.rsi/closed.png
#	Resources/Textures/Structures/Doors/secret_door.rsi/closing.png
#	Resources/Textures/Structures/Doors/secret_door.rsi/meta.json
#	Resources/Textures/Structures/Doors/secret_door.rsi/open.png
#	Resources/Textures/Structures/Doors/secret_door.rsi/opening.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png
#	Resources/migration.yml
2025-06-04 13:39:57 +03:00
vitopigno
f8d0b0cba3
Add text highlighting (#31442)
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Hans Larsson <hanandlia@gmail.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2025-06-04 12:12:37 +02:00
Vigers Ray
d6c0a011b7 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Client/Clothing/ClientClothingSystem.cs
#	Content.Client/Clothing/Systems/ChameleonClothingSystem.cs
#	Content.Client/Fax/UI/FaxWindow.xaml
#	Content.Client/Ghost/GhostSystem.cs
#	Content.Client/Holiday/HolidaySystem.cs
#	Content.Client/Humanoid/HumanoidAppearanceSystem.cs
#	Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
#	Content.Client/Lobby/UI/LobbyGui.xaml
#	Content.Client/Lobby/UI/LobbyGui.xaml.cs
#	Content.Client/Mech/MechSystem.cs
#	Content.Client/Stealth/StealthSystem.cs
#	Content.Client/Weapons/Ranged/Systems/GunSystem.cs
#	Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
#	Content.Server/Bed/BedSystem.cs
#	Content.Server/Body/Systems/BodySystem.cs
#	Content.Server/Body/Systems/RespiratorSystem.cs
#	Content.Server/Cargo/Systems/CargoSystem.Orders.cs
#	Content.Server/Communications/CommunicationsConsoleComponent.cs
#	Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
#	Content.Server/EntityEffects/Effects/MakeSentient.cs
#	Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
#	Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
#	Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
#	Content.Server/EntityEffects/Effects/PlantMutateGases.cs
#	Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Content.Server/Nutrition/EntitySystems/FoodSystem.cs
#	Content.Server/Power/EntitySystems/PowerNetSystem.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Content.Server/RoundEnd/RoundEndSystem.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Content.Server/Weapons/Ranged/Systems/GunSystem.cs
#	Content.Shared/Bed/Components/HealOnBuckleComponent.cs
#	Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
#	Content.Shared/EntityEffects/Effects/ExplosionReactionEffect.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Item/ItemToggle/Components/ComponentTogglerComponent.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Content.Shared/Preferences/Loadouts/RoleLoadout.cs
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
#	Content.Shared/Wieldable/SharedWieldableSystem.cs
#	Resources/Audio/Machines/attributions.yml
#	Resources/Locale/en-US/_strings/atmos/plaque-component.ftl
#	Resources/Locale/en-US/_strings/chat/chat-channel.ftl
#	Resources/Locale/en-US/_strings/components/screen-component.ftl
#	Resources/Locale/en-US/_strings/inventory/components/slot-block-component.ftl
#	Resources/Locale/en-US/_strings/mass-media/news-discord.ftl
#	Resources/Locale/en-US/_strings/objectives/commands/stripall.ftl
#	Resources/Locale/en-US/_strings/salvage/job-board.ftl
#	Resources/Locale/en-US/_strings/ui/spray-painter-window.ftl
#	Resources/Locale/en-US/_strings/ui/turret-controls.ftl
#	Resources/Maps/_Sunrise/Station/box.yml
#	Resources/Prototypes/Access/misc.yml
#	Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/service.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
#	Resources/Prototypes/Entities/Clothing/Head/helmets.yml
#	Resources/Prototypes/Entities/Clothing/Masks/masks.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
#	Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/Player/dragon.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
#	Resources/Prototypes/Entities/Mobs/Species/moth.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Prototypes/LootTables/suspicion_loot_table.yml
#	Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
#	Resources/Prototypes/Reagents/medicine.yml
#	Resources/Prototypes/Recipes/Lathes/Packs/science.yml
#	Resources/Prototypes/Recipes/Lathes/medical.yml
#	Resources/Prototypes/SoundCollections/NukeMusic.yml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/equipped-OUTERCLOTHING-reptilian.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json
#	Resources/Textures/Effects/speech.rsi/alien3.png
#	Resources/Textures/Effects/speech.rsi/alienroyal3.png
#	Resources/Textures/Effects/speech.rsi/default3.png
#	Resources/Textures/Effects/speech.rsi/guardian3.png
#	Resources/Textures/Effects/speech.rsi/holo3.png
#	Resources/Textures/Effects/speech.rsi/lawyer3.png
#	Resources/Textures/Effects/speech.rsi/lizard3.png
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Effects/speech.rsi/moth3.png
#	Resources/Textures/Effects/speech.rsi/robot3.png
#	Resources/Textures/Effects/speech.rsi/slime3.png
#	Resources/Textures/Effects/speech.rsi/spider3.png
#	Resources/Textures/Effects/speech.rsi/syndibot3.png
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
#	Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_f.png
#	Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_m.png
#	Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
#	Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_unlit.png
#	Resources/Textures/Structures/Piping/disposal.rsi/meta.json
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/steel_dirty.png
#	Resources/migration.yml
#	runclient-Tools.bat
#	runclient.bat
2025-05-27 03:41:41 +03:00
slarticodefast
f3c4ff8a2a
Add keybind for swapping hands in the other direction (#37588)
add swap hands reverse
2025-05-18 21:17:35 -04:00
ThereDrD
4b97741aba
Фикс и переработка системы сердцебиения (#2098) 2025-05-07 03:27:36 +03:00
Vigers Ray
6020a6fd5b Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
#	Content.Server/Weapons/Ranged/Systems/GunSystem.cs
#	Content.Server/Zombies/ZombieSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Zombies/SharedZombieSystem.cs
#	Content.Shared/Zombies/ZombieComponent.cs
#	Resources/Locale/en-US/_strings/research/technologies.ftl
#	Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
#	Resources/Prototypes/Polymorphs/polymorph.yml
#	Resources/Prototypes/Recipes/Lathes/security.yml
#	Resources/Prototypes/Research/arsenal.yml
#	Resources/Prototypes/Research/experimental.yml
2025-04-17 00:07:59 +03:00
Errant
fb388d2265
Role subtypes (#35359) 2025-04-16 19:04:48 +02:00
Vigers Ray
13193b095a Removes the option for players to disable recoil their own recoil. (#5220) 2025-04-11 04:59:11 +03:00
Vigers Ray
812815ac1d Revert "Add undergarments & "Censor Nudity" toggle to options (#33185)"
This reverts commit 27cfc093
2025-04-11 04:57:06 +03:00
Babaev
2df43d876c
Отключение звука новых ролей (#1658) 2025-04-04 12:38:31 +03:00
Vigers Ray
100c44d16f Выключение музыки голосования и выключение звука прыжка по дефолту 2025-04-02 21:50:25 +03:00
Vigers Ray
84c607c84a Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
#	Content.Server/Ghost/GhostSystem.cs
#	Resources/Locale/en-US/_strings/administration/antag.ftl
#	Resources/Locale/en-US/_strings/administration/commands/adminnotes.ftl
#	Resources/Locale/en-US/_strings/construction/components/block-anchor-component.ftl
#	Resources/Locale/en-US/_strings/power/commands.ftl
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/eggy.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce.png
2025-03-27 20:37:49 +03:00
Errant
c82d531a8f
Admin Overlay stacking and ghost hiding (#35622)
* ghostbuster mouse and overlay stacks

* variable adjustment

* use map coords for distance check

* vertical stack ordering, and cvars

* skreee

* fix stack merge 'sidedness' issue

* overlays no longer try to stack to overlays at the wrong coordinates

* options slider for stack merge distance

* admin option sliders for ghost fade/hide

* Update AdminOptionsTab.xaml.cs

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-03-25 21:15:22 +01:00
Errant
72141abf8a
Admin playerlist antag presentation rework (#35538)
* refactor(src): Minor refactor of Draw in "AdminNameOverlay. And new info about playtime player

* fix(src): Add configure classic admin owerlay

* fix

* antag status indication rework

* the cvars are free, you can just take them

* update playerlist on cvar change

* more overlay options

* tweak(src): Use _antagLabelClassic and tweak style

* tweak(src): Add config display overlay for startingJob and playTime

* tweak(src): Vector2 is replaced by var

* tweak(src): return to the end of the list

* add new option checkboxes

* passing ConfigurationManager through constructor, some format changes

* made sorting values more futureproof

* comments

* labels

* no point commenting this out when the overlay stack PR will uncomment it again anyway

* sorting prototype

* localize symbols because why not

* symmetry

* Revert "localize symbols because why not"

This reverts commit 922d4030300285a45777d62fcfd9c74b25fe7a60.

* layout and formatting stuff

* fix errant space

---------

Co-authored-by: Schrödinger <132720404+Schrodinger71@users.noreply.github.com>
2025-03-25 17:03:59 +01:00
Vigers Ray
d0f5e8d361 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	.github/workflows/validate-rgas.yml
#	.github/workflows/validate-rsis.yml
#	Content.Client/Changelog/ChangelogTab.xaml.cs
#	Content.Client/Humanoid/HumanoidAppearanceSystem.cs
#	Content.Client/Options/UI/OptionsMenu.xaml.cs
#	Content.Client/SubFloor/SubFloorHideSystem.cs
#	Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs
#	Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs
#	Content.Server/Antag/AntagSelectionSystem.cs
#	Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
#	Content.Server/Explosion/EntitySystems/TriggerSystem.cs
#	Content.Server/Mindshield/MindShieldSystem.cs
#	Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
#	Content.Server/Standing/StandingStateSystem.cs
#	Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
#	Content.Server/VendingMachines/VendingMachineSystem.cs
#	Content.Server/Zombies/ZombieSystem.Transform.cs
#	Content.Server/Zombies/ZombieSystem.cs
#	Content.Shared/Damage/Systems/DamageableSystem.cs
#	Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
#	Content.Shared/Humanoid/Markings/MarkingManager.cs
#	Content.Shared/Humanoid/NamingSystem.cs
#	Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
#	Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
#	Content.Shared/Implants/Components/SubdermalImplantComponent.cs
#	Content.Shared/Standing/StandingStateSystem.cs
#	Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
#	Content.Shared/VendingMachines/VendingMachineComponent.cs
#	Resources/Audio/Lobby/attributions.yml
#	Resources/Locale/en-US/_strings/administration/commands/forceghost.ftl
#	Resources/Locale/en-US/_strings/clothing/components/fire-protection-component.ftl
#	Resources/Locale/en-US/_strings/components/storage-voice-control-component.ftl
#	Resources/Locale/en-US/_strings/prototypes/roles/antags.ftl
#	Resources/Locale/en-US/_strings/reagents/meta/physical-desc.ftl
#	Resources/Locale/en-US/lathe/lathe-categories.ftl
#	Resources/Prototypes/Access/command.yml
#	Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
#	Resources/Prototypes/Catalog/thief_toolbox_sets.yml
#	Resources/Prototypes/Datasets/Names/Operation_prefix.yml
#	Resources/Prototypes/Datasets/Names/Operation_suffix.yml
#	Resources/Prototypes/Datasets/Names/arachnid_first.yml
#	Resources/Prototypes/Datasets/Names/arachnid_last.yml
#	Resources/Prototypes/Datasets/Names/borg.yml
#	Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
#	Resources/Prototypes/Datasets/Names/clown.yml
#	Resources/Prototypes/Datasets/Names/diona.yml
#	Resources/Prototypes/Datasets/Names/fake_human_first.yml
#	Resources/Prototypes/Datasets/Names/fake_human_last.yml
#	Resources/Prototypes/Datasets/Names/first.yml
#	Resources/Prototypes/Datasets/Names/first_female.yml
#	Resources/Prototypes/Datasets/Names/first_male.yml
#	Resources/Prototypes/Datasets/Names/fortunes.yml
#	Resources/Prototypes/Datasets/Names/hologram.yml
#	Resources/Prototypes/Datasets/Names/last.yml
#	Resources/Prototypes/Datasets/Names/military.yml
#	Resources/Prototypes/Datasets/Names/moth_first_female.yml
#	Resources/Prototypes/Datasets/Names/moth_first_male.yml
#	Resources/Prototypes/Datasets/Names/moth_last.yml
#	Resources/Prototypes/Datasets/Names/mushman_first.yml
#	Resources/Prototypes/Datasets/Names/mushman_last.yml
#	Resources/Prototypes/Datasets/Names/ninja.yml
#	Resources/Prototypes/Datasets/Names/ninja_title.yml
#	Resources/Prototypes/Datasets/Names/regalrat.yml
#	Resources/Prototypes/Datasets/Names/reptilian_female.yml
#	Resources/Prototypes/Datasets/Names/reptilian_male.yml
#	Resources/Prototypes/Datasets/Names/revenant.yml
#	Resources/Prototypes/Datasets/Names/skeleton_first.yml
#	Resources/Prototypes/Datasets/Names/syndicate.yml
#	Resources/Prototypes/Datasets/Names/vox.yml
#	Resources/Prototypes/Datasets/Names/wizard_first.yml
#	Resources/Prototypes/Datasets/Names/wizard_last.yml
#	Resources/Prototypes/Datasets/adjectives.yml
#	Resources/Prototypes/Datasets/corporations.yml
#	Resources/Prototypes/Datasets/criminal_records.yml
#	Resources/Prototypes/Datasets/rat_king_commands.yml
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Clothing/Head/specific.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
#	Resources/Prototypes/Entities/Mobs/Player/human.yml
#	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
#	Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Entities/Mobs/Species/moth.yml
#	Resources/Prototypes/Entities/Mobs/Species/vox.yml
#	Resources/Prototypes/Entities/Objects/Devices/pda.yml
#	Resources/Prototypes/Entities/Objects/Misc/paper.yml
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Entities/Stations/nanotrasen.yml
#	Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
#	Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Prototypes/Procedural/salvage_loot.yml
#	Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
#	Resources/Prototypes/Recipes/Lathes/biogen.yml
#	Resources/Prototypes/Recipes/Lathes/categories.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Prototypes/Species/arachnid.yml
#	Resources/Prototypes/Species/diona.yml
#	Resources/Prototypes/Species/moth.yml
#	Resources/Prototypes/ai_factions.yml
#	Resources/Prototypes/game_presets.yml
#	Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
#	Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
#	Resources/ServerInfo/Guidebook/Service/Botany.xml
#	Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/meta.json
#	Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/meta.json
#	Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/meta.json
#	Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json
#	Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/meta.json
#	Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json
#	Resources/Textures/Clothing/Eyes/Glasses/science.rsi/meta.json
#	Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json
#	Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json
#	Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/meta.json
#	Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-left.png
#	Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-right.png
#	Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/meta.json
#	Resources/Textures/Clothing/Eyes/Hud/synd.rsi/meta.json
#	Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
#	Resources/Textures/Interface/Misc/program_icons.rsi/meta.json
#	Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json
#	Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
#	Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json
#	Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json
#	Resources/migration.yml
#	Tools/actions_changelogs_since_last_run.py
2025-03-25 11:30:01 +03:00
Łukasz Mędrek
0be41cebb9
Text related keybinds can now be changed in Controls (#35630)
* Add ability to rebind text related keybinds

* fix placement of locales
2025-03-08 13:42:50 +11:00
SlamBamActionman
27cfc0939c
Add undergarments & "Censor Nudity" toggle to options (#33185)
* Initial commit

* Attribution

* Review changes

* Added comment for upstream
2025-03-05 10:14:01 +01:00