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
2b3750ab0e
фикс линтера
2025-08-05 05:57:15 +03:00
haiwwkes
3e4d6999d1
reset pos on client restart ( #2643 )
2025-07-24 21:01:16 +05:00
Vigers Ray
0a1289510a
Ротация режимов. Пул режимов. Цвары для паузы и отключения чата при голосовании.
2025-07-17 23:51:42 +03:00
Vigers Ray
a52e468d42
Питомцы выбираются через лобби. ( #2546 )
2025-07-13 10:48:16 -04:00
deathride58
08d9c0aedd
Playtime Reminders - Raising awareness of addiction by highlighting excessive playtime ( #36483 )
...
* grass touch protocol - Rebases to latest master to fix conflicts
* aight local tests are passing lets see if our golf works
* It is 5 am and our ass COMPLETELY overcomplicated this lmaooo
* Addresses feedback - Clarifies comments, swaps internal var names for grasstouchless and selfdestructive, makes the third tier a little less demanding, and fixes 1 hours
* Addresses review - conflict fix
* This too
* Axes playtime exclusion for ghosts
* Use switch expression
code style nit
* Refactor/cleanup
Use IGameTiming.RealTime to track time instead of DateTime. Use nullable instead of magic values.
Expose the current day value through a property that is always up to date, instead of making the API to read the CVar that updates at inconsistent times. This also makes it trivial to debug with VV.
Other minor cleanup like using string interp, code style fixes, comments, etc.
---------
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
2025-06-19 03:06:26 +02:00
Vigers Ray
0cbccf6f0e
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Shared/Access/Components/AccessReaderComponent.cs
# Resources/Locale/en-US/_strings/commands/melee-spread-command.ftl
# Resources/Locale/en-US/_strings/commands/persistence-save-command.ftl
# Resources/Locale/en-US/_strings/commands/show-access-readers-command.ftl
# Resources/Locale/en-US/_strings/commands/show-emergency-shuttle-command.ftl
# Resources/Locale/en-US/_strings/persistence/command.ftl
# Resources/Prototypes/Catalog/Fills/Crates/armory.yml
# Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
# Resources/Prototypes/Entities/Clothing/Belt/belts.yml
# Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml
# Resources/Prototypes/Entities/Objects/Fun/pai.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
# Resources/Prototypes/Recipes/Crafting/improvised.yml
2025-06-09 03:22:11 +03:00
Simon
d7d7a6c80e
Split codewords into its own system ( #37928 )
...
* Split codewords into its own system
* Fix admin log
* Nuke unused code
* Fix formatting errors
* Fix tests
* Make the codeword system add itself if called when not active
* Put comment in right place.
* Review: Rename prototypes
* Review: Make codewords serializable
* Fix build
* Reviews: Change the system to not be a gamerule.
* Fix YAML Linter
* Fix test fail
* Remove unused import
2025-06-05 19:19:41 -04:00
Vigers Ray
b378fdc706
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Client/Stylesheets/StyleNano.cs
# Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
# Content.Server/Nutrition/EntitySystems/FoodSystem.cs
# Content.Shared/Follower/FollowerSystem.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/PAI/SharedPAISystem.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
# Resources/Locale/en-US/_strings/access/components/genpop.ftl
# Resources/Locale/en-US/_strings/doors/components/turnstile.ftl
# Resources/Locale/en-US/_strings/power/battery.ftl
# Resources/Locale/en-US/_strings/store/pai-catalog.ftl
# Resources/Locale/en-US/_strings/tools/simple-tool-usage.ftl
# Resources/Locale/en-US/_strings/ui/controls.ftl
# Resources/Locale/en-US/_strings/weapons/ranged/upgrades.ftl
# Resources/Prototypes/Access/misc.yml
# Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Entities/Mobs/Player/dragon.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Entities/Objects/Fun/toys.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/Recipes/Lathes/Packs/science.yml
# Resources/Prototypes/Research/industrial.yml
# Resources/Prototypes/Species/vox.yml
# Resources/Prototypes/Store/currency.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/ai_factions.yml
# Resources/Prototypes/borg_types.yml
# Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png
# Resources/Textures/Structures/Wallmounts/posters.rsi/poster4_contraband.png
# Resources/migration.yml
2025-04-28 01:29:55 +03:00
Pieter-Jan Briers
ffe130b38d
Battery (SMES/substation) interface ( #36386 )
...
* Add ENERGYWATTHOURS() loc function
Takes in joules (energy), displays as watt-hours.
* Add simple OnOffButton control
* Re-add Inset style class
This was sloppily removed at some point?? Whatever, I need it.
* Add helper functions for setting title/guidebook IDs on FancyWindow
Reagent dispenser uses these, more in the next commits.
* Add BuiPredictionState helper
This enables me to implement coarse prediction manually in the battery UI.
Basically it's a local buffer of predicted inputs that can easily be replayed against future BUI states from the server.
* Add input coalescing infrastructure
I ran into the following problem: Robust's Slider control absolutely *spams* input events, to such a degree that it actually causes issues for the networking layer if directly passed through. For something like a slider, we just need to send the most recent value.
There is no good way for us to handle this in the control itself, as it *really* needs to happen in PreEngine. For simplicity reasons (for BUIs) I came to the conclusion it's best if it's there, as it's *before* any new states from the server can be applied. We can't just do this in Update() or something on the control as the timing just doesn't line up.
I made a content system, BuiPreTickUpdateSystem, that runs in the ModRunLevel.PreEngine phase to achieve this. It runs a method on a new IBuiPreTickUpdate interface on all open BUIs. They can then implement their own coalescing logic.
In the simplest case, this coalescing logic can just be "save the last value, and if we have any new value since the last update, send an input event." This is what the new InputCoalescer<T> type is for.
Adding new coalescing logic should be possible in the future, of course. It's all just small helpers.
* Battery interface
This adds a proper interface to batteries (SMES/substation). Players can turn IO on and off, and they can change charge and discharge rate. There's also a ton of numbers and stuff. It looks great.
This actually enables charge and discharge rates to be changed for these devices. The settings for both have been set between 5kW and 150kW.
* Oops, forgot to remove these style class defs.
2025-04-27 21:08:34 +10:00
Vigers Ray
091f0b22ee
Топ контрибюторов в лобби ( #1828 )
2025-04-17 06:27:30 +03:00
ThereDrD
6c8050eb1e
Новые эффекты взрывов ( #1410 )
...
Co-authored-by: Vero <73014819+vero5123@users.noreply.github.com>
Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
2025-02-20 17:29:41 +03:00
Vigers Ray
cfbd768f53
ы
2025-02-05 03:40:19 +03:00
Vigers Ray
4082ffc4bc
Анимации в лобби. Кастомный выбор фона в лобби. ( #562 )
...
* Анимации в лобби
* анимации сущностями
* прототипы анимаций
2024-10-30 20:14:26 +03:00
Vigers Ray
389ed704e1
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Client/IoC/ClientContentIoC.cs
# Content.Server/Administration/Managers/BanManager.cs
# Content.Server/Chat/Managers/ChatSanitizationManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Traitor/Uplink/UplinkSystem.cs
# Content.Shared/Interaction/SharedInteractionSystem.cs
# Content.Shared/Localizations/ContentLocalizationManager.cs
# Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs
# Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs
# Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Resources/Audio/Ambience/Antag/attributions.yml
# Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
# Resources/Locale/en-US/_strings/advertisements/other/firebot.ftl
# Resources/Locale/en-US/_strings/shuttles/commands.ftl
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
# Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
# RobustToolbox
2024-10-30 13:26:32 +03:00
Vasilis
a739b21b04
Change the window titlebar to show the joined server ( #32547 )
...
* Change the window titlebar to show the joined server
Requires https://github.com/space-wizards/RobustToolbox/pull/5475/
* Totally not a webedit
* Can you tell what cvar I copied?
* And this kids is why we don't webedit
* Reviews
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-10-17 13:06:07 +02:00
SplikZerys
27ee3abaa8
Revert "Proton ( #420 )"
...
This reverts commit 939249a3
2024-10-02 09:05:30 +03:00
VigersRay
b1cac7e781
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Chat/Managers/IChatManager.cs
# Content.Client/IoC/ClientContentIoC.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/GameTicking/GameTicker.Player.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Locale/en-US/_strings/administration/commands/custom-vote-command.ftl
# Resources/Locale/en-US/_strings/discord/vote-notifications.ftl
# Resources/Locale/en-US/_strings/npc/firebot.ftl
# Resources/Locale/en-US/_strings/paper/syndicate-business-card.ftl
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Recipes/Crafting/bots.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
2024-10-02 06:45:10 +03:00
VigersRay
2a523b73d3
Ну а чо я? Я ничо
2024-10-02 06:33:00 +03:00
pacable
939249a38b
Proton ( #420 )
...
* Proton-1 finished!
Signed-off-by: pacable <igor.mamaev1@gmail.com>
* fix
Signed-off-by: pacable <igor.mamaev1@gmail.com>
---------
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-09-30 16:15:53 +03:00
nikthechampiongr
a5840b925b
Fix RA0032 ( #32514 )
2024-09-29 02:25:21 +02:00
VigersRay
9328f4d9cb
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Chat/SharedChatSystem.cs
# Content.Shared/UserInterface/ActivatableUIComponent.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# SpaceStation14.sln
2024-08-28 19:12:01 +03:00
Simon
f92ef41538
Automated whitelists ( #23985 )
...
* Beginnings of making the breadmemes jobs easier
* stuff
* stuff pt. 2
* Stuff pt.3
* Stuff I forgot last time
* Basic whitelist
Only people that are added to the whitelist with the addwhitelist command will be able to join. I call this the "legacy" whitelist
* Remove always deny condition in favor of just breaking if playtime check fails
* Change default whitelist
Default whitelist is now the "legacy" whitelist.
* localization
* Admin check
* minor spelling change
* Fix build
* Whitelist message
* Fix vars not being datafield and spelling mistakes
* Minor spelling mistake
* Change config for salamander
* Reviews and stuff
* Add summaries
* Fix whitelists
* Forgot to add a datafield
* Fixing stuff I guess
* Reuse admin remarks to reduce load when connecting.
* Update log messages to be verbose instead of debug
* Reviews
* whoops
* Explain a bit more how whitelist checking works
* Apply CE's review
* Append Membership to Blacklist and Whitelist conditions
* Fix review comments
* Uncapitalize playerConnectionWhitelist, add to ignored client prototypes
* Make note count field work
* Fix cvar for thingy
---------
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2024-08-27 18:01:17 +02:00
VigersRay
9b78c5e9d9
SponsorLoadoutSystem
2024-07-12 04:53:31 +03:00
VigersRay
60cbcb2e9d
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
# Content.Client/Entry/EntryPoint.cs
# Content.Client/IoC/ClientContentIoC.cs
# Resources/migration.yml
2024-06-28 07:56:45 +03:00
Pieter-Jan Briers
ced15b7934
Fix coords monitor in replays ( #29512 )
...
The F3 coords manager is blocked if you're not an admin. This check happened even when playing a replay, where you actually aren't. There's now a check to make sure you are actually server-connected-to-game before running the logic.
Also moved it to a manager because this *shouldn't be a bloody entity system in the first place*.
2024-06-27 16:58:51 +02:00
VigersRay
7d0476aab0
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Shared/Roles/JobPrototype.cs
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Roles/Antags/nukeops.yml
# Resources/Prototypes/Roles/Antags/revolutionary.yml
# Resources/Prototypes/Roles/Antags/traitor.yml
# Resources/Prototypes/Roles/Antags/zombie.yml
2024-06-07 11:28:58 +03:00
Nemanja
1333b48747
Convert rules to use guidebook parsing ( #28647 )
2024-06-06 03:11:26 -04:00
Vigers Ray
e0566ffa3e
Хаб серверов ( #13 )
...
* Хаб серверов внутри игры
* чейнжлог
2024-06-04 10:03:48 +03:00
VigersRay
5f10d21fa6
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Administration/Commands/PlayTimeCommands.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Server/StationEvents/Events/BreakerFlipRule.cs
# Content.Shared/Roles/JobPrototype.cs
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
# Resources/Prototypes/Entities/Mobs/base.yml
# Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Roles/Antags/traitor.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
# Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
# Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
2024-06-04 09:41:27 +03:00
slarticodefast
1283989346
Flash overlay rework and bugfixes ( #27369 )
2024-06-02 00:17:53 -04:00
Vigers Ray
5775d4cdef
Merge sunrise build ( #2 )
...
* commit
2024-05-31 02:16:18 +03:00
metalgearsloth
332f54a3ae
Lobby refactor + species loadouts support ( #27576 )
...
* Vox stuff
* Species loadouts and lobby refactor
The control flow for lobby is all over the shop so I pulled it all up from the individual controls so now they handle the bare minimum required and LobbyUIController handles the rest.
* a
* Bulk changes
* a
* weh
* Character import / export
* finalise
* woops this stuff too
* Also datafield exporting
* comments
* Review
2024-05-12 09:18:21 +10:00
no
630a7a78ed
Add ghost role raffles ( #26629 )
...
* Add ghost role raffles
* GRR: Fix dialogue sizing, fix merge
* GRR: Add raffle deciders (winner picker)
* GRR: Make settings prototype based with option to override
* GRR: Use Raffles folder and namespace
* GRR: DataFieldify and TimeSpanify
* GRR: Don't actually DataFieldify HashSet<ICommonSession>s
* GRR: add GetGhostRoleCount() + docs
* update engine on branch
* Ghost role raffles: docs, fix window size, cleanup, etc
* GRR: Admin UI
* GRR: Admin UI: Display initial/max/ext of selected raffle settings proto
* GRR: Make a ton of roles raffled
2024-05-06 18:48:16 -07:00
Tayrtahn
794a447bb7
Separate "thank you" messages from general ads ( #25867 )
...
* Separated "thank you" messages from general ads
* Moved MessagePackPrototype to shared, cleaned up AdvertiseComponent, and actually killed AdvertisementsPackPrototype.
+More suggests changes.
* Rename PackPrototypeID to Pack in both components.
2024-03-28 17:46:26 +11:00
Leon Friedrich
646f7e07a8
Add reckless replay load button ( #26212 )
...
* Add reckless replay load button
* A
* More descriptive button
2024-03-18 18:31:36 +11:00
deltanedas
7561bef6a7
Move faction exception and everything it needs to shared ( #25154 )
...
* move faction prototype to shared
* move faction exception and member stuff to shared
* fix breaking changes for random stuff
* move pettable friend stuff to shared
* mostly fix
* final fixy
* dragonops
* final fixy II
* use querys and fix warpspeed fish (probably)
* fixer
* Rrrr!
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-03-18 18:23:25 +11:00
LordCarve
c47391011d
Refactor AME to use ItemSlot for Fuel ( #25558 )
...
* Using wrench on AME doesn't first try to put it in.
* Refactor AME to use ItemSlot for fuel.
* Apparently these names want to match.
2024-02-29 16:44:28 -05:00
metalgearsloth
bf79acd127
Salvage magnet revamp ( #23119 )
...
* Generic offering window
* More work
* weh
* Parity
* Progression meter
* magnet
* rona
* PG asteroid work
* code red
* Asteroid spawnings
* clams
* a
* Marker fixes
* More fixes
* Workings of biome asteroids
* A
* Fix this loading code
* a
* Fix masking
* weh
* Fixes
* Magnet claiming
* toe
* petogue
* magnet
* Bunch of fixes
* Fix default
* Fixes
* asteroids
* Fix offerings
* Localisation and a bunch of fixes
* a
* Fixes
* Preliminary draft
* Announcement fixes
* Fixes and bump spawn rate
* Fix asteroid spawns and UI
* More fixes
* Expeditions fix
* fix
* Gravity
* Fix announcement rounding
* a
* Offset tweak
* sus
* jankass
* Fix merge
2024-01-04 14:25:32 +11:00
Miro Kavaliou
c06586f942
Added a toggle fullscreen button (default F11) ( #20272 )
...
* Added a toggle fullscreen button (default F11)
* Removed un-needed comments
* Review Requested Changes
* Fixed Acidental Spacing Change
* bwoink, removed extraneous code
* nothing, litterally
2023-09-28 18:55:10 -05:00
c4llv07e
649cd34edc
Fix hud theme selection ( #19106 )
...
* Fix hud theme selection
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove iterator indexing in the theme configuration
Signed-off-by: c4llv07e <kseandi@gmail.com>
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
2023-09-14 22:05:55 -04:00
DrSmugleaf
98b49b8907
Remove redundant prototype ignores ( #19683 )
2023-08-30 21:01:13 -07:00
metalgearsloth
3b1e6d30e7
Remove GCQueue ( #18820 )
2023-08-07 11:27:46 -06:00
Leon Friedrich
541eb417e3
Rename Faction to NpcFaction ( #18079 )
2023-07-17 13:51:52 +10:00
TemporalOroboros
d9de405859
ECS AME ( #16779 )
2023-06-28 08:02:06 -04:00
Pieter-Jan Briers
bbd8ce8885
Replays: final boss ( #17621 )
...
* Replays: final boss
* Undo formatting change in EntryPoint
2023-06-24 18:56:33 -05:00
Leon Friedrich
2ef95a3225
Replay client ( #15001 )
2023-06-05 14:44:09 +10:00
metalgearsloth
be14380520
Role ban UI updates ( #16736 )
2023-05-27 14:22:22 +10:00
Leon Friedrich
be0d22ad5e
Move upload commands to engine ( #16582 )
2023-05-20 11:53:09 +10:00
Moony
e91fc652a3
Dynamic space world generation and debris. ( #15120 )
...
* World generation (squash)
* Test fixes.
* command
* o
* Access cleanup.
* Documentation touchups.
* Use a prototype serializer for BiomeSelectionComponent
* Struct enumerator in SimpleFloorPlanPopulatorSystem
* Safety margins around PoissonDiskSampler, cookie acquisition methodologies
* Struct enumerating PoissonDiskSampler; internal side
* Struct enumerating PoissonDiskSampler: Finish it
* Update WorldgenConfigSystem.cs
awa
---------
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
Co-authored-by: 20kdc <asdd2808@gmail.com>
2023-05-16 06:36:45 -05:00
