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
Tayrtahn
c565b44965
Replace ValidatePrototypeId uses with ProtoId or EntProtoId ( #38814 )
...
* The easy ones
* For certain values of easy
* Easy test
* Hair
* Fix sandbox violations
* Sort usings
2025-07-07 21:57:05 +02:00
SplikZerys
a8d53b10e2
Фикс уязвимости химкомата. ( #2306 )
...
Co-authored-by: haiwwkes <49613070+rhailrake@users.noreply.github.com>
Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-06-10 00:38:22 +03:00
Nemanja
1540880eb2
Predict Labels ( #36406 )
...
* Predict Labels
* nitpicks
2025-04-10 22:19:48 -07:00
Dora
53dc27cb1e
Adding sorting to chem master ( #34763 )
...
* Adding sorting to chem master
* Chem Master can now sort based on following categories
- Alphabetical
- Quantity
- Time Added to Machine
* Sorting is disabled by default and persist in the machine for everyone
* Removed some pointless code from Chem Master's UI
* Changed None and Time Added's text to reflect what they do better
* Minor adjustments to the code requested by maintainers
2025-02-27 12:19:52 +01:00
Cojoke
ef1fadf275
Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem ( #30084 )
...
* Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem
* guap
* More fixes
* Wait you can do that?
---------
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2024-09-02 13:26:04 +02:00
metalgearsloth
5896e68752
Content update for UI prediction ( #27214 )
...
* Content update for UI refactor
* Big update
* Sharing
* Remaining content updates
* First big update
* Prototype updates
* AUGH
* Fix UI comp ref
* Cleanup
- Fix predicted message, fix item slots, fix interaction range check.
* Fix regressions
* Make this predictive
idk why it wasn't.
* Fix slime merge
* Merge conflict
* Fix merge
2024-04-26 18:16:24 +10:00
Skye
fbe72c848a
ChemMaster buffer preserves list ordering ( #23352 )
...
ChemMaster now maintains list order on reagent removal
2024-01-02 10:51:21 -05:00
TemporalOroboros
d23c8d5c19
Revert 'Revert 'Solution Entities'' ( #23168 )
2023-12-29 08:47:43 -04:00
Emisse
938d6d9945
Revert "Solution Entities" ( #23160 )
...
Revert "Solution Entities (#21916 )"
This reverts commit d75e743dd7
2023-12-28 20:45:42 -07:00
TemporalOroboros
d75e743dd7
Solution Entities ( #21916 )
...
* Creates Content.Shared.Chemistry.Solutions
Copies Solution class to new namespace
Obsoletes old Solution class
* Switches over to the Solutions.Solution Solution
* Creates Content.Shared.Chemistry.Containers
Copies relevant components/systems to the new namespace
Obsoletes old versions
* Switches over to the Containers.XYZ namespace
* Creates SolutionSystem and obsoletes old SolutionContainerSystem methods
* Start using SolutionSystem for Solution manipulation
* EnumerateSolutions
* Move TryGetMixableSolution
* Move EnsureSolution to Server
* Create Solution Entities
* Stop using obsolete solution system methods
* Fix prototype component tests
* Add using ..Audio.Systems; back
* Wrap solution container slots in ContainerSlots
* Actually add the slot to the solution container map
* Dirty SolutionContainerComponent when ensuring solutions
* Revert namespace changes
* Remerge SolutionSystem and SolutionContainerSystem
* SolutionContainerManagerComponent refactor
* Avoid wrapping necessary code in DebugTools.Assert as it is removed when compiling for release
* Readd examine reagent sorting
* Fix errors
* Poke tests
* Fix solution names not being applied
* Fix WoolyComponent including statement
* Fix merge skew
* Fix compile errors
* Make reactions use solntities
* Reindent solution class namespace
* Field attribute changes
* AutoGenerateComponentState for SolutionContainerComponent
* SolutionContainerComponent -> ContainedSolutionComponent
* ref ReactionAttemptEvent
* Denetwork preinit solutions
* Misc 1
* Nullable TryGetSolution out vars
* Cache associated solutions
* Fix merge skew
* Use explicit regions in SharedSolutionContainerSystem.Capabilities
* Add debug assert
* Use explicit regions in SharedSolutionContainerSystem.Relay + ref SolutionContainerChangedEvent
* ContainedSolutionComponent.Name -> ContainedSolutionComponent.ContainerName
* SolutionComponent doc comments
* Implicit DataField names and property purge
* ReagentEffect DataField names
* Local variables for readability
* Sort using statements + Entity<T> event handlers
* Fix compile erros
* Fix compile errors
---------
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2023-12-28 17:58:14 -08:00
Nemanja
cc8984d096
Grid Inventory ( #21931 )
...
* Grid Inventory
* oh boy we keep cracking on
* auto insertion is kinda working? gross, too!
* pieces and proper layouts
* fix the sprites
* mousing over grid pieces... finally
* dragging deez nuts all over the screen
* eek!
* dragging is 90% less horrendous
* auto-rotating
* flatten
* Rotation at last
* fix rotation and change keybind for removing items.
* rebinding and keybinding
* wow! look at that! configurable with a button! cool!
* dragging is a bit cooler, eh?
* hover insert, my beloved
* add some grids for storage, fix 1x1 storages, fix multiple inputs at once
* el navigation
* oh yeah some stuff i forgor
* more fixes and QOL stuff
* the griddening
* the last of it (yippee)
* sloth review :)
2023-12-04 16:04:39 -07:00
metalgearsloth
269c93245d
Unrevert audio ( #21330 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-11-27 22:12:34 +11:00
Nemanja
0c329ed661
Storage Standardization [Take 2] ( #21270 )
2023-10-30 20:55:55 -07:00
metalgearsloth
5b8f3c48c4
Revert "Update submodule to 175.0.0 ( #21318 )" ( #21319 )
2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed
Content audio ( #20862 )
2023-10-29 14:58:23 +11:00
metalgearsloth
c08349a947
Revert "Storage TEST MERGE" ( #21258 )
2023-10-26 00:46:22 -07:00
Nemanja
81f5e341c0
Some mild item size balancing + fixes ( #21250 )
2023-10-26 13:47:44 +11:00
Nemanja
41795720da
[TEST MERGE] Slot-based Storage ( #21212 )
2023-10-25 18:53:38 -04:00
DrSmugleaf
f560f88eb5
Remove 700 usages of Component.Owner ( #21100 )
2023-10-19 12:34:31 -07:00
TemporalOroboros
0775ab6a14
Moves SolutionContainerManagerComponent to Shared. ( #20944 )
2023-10-15 03:45:28 +11:00
metalgearsloth
7064f262b4
Add ore bag area pickups ( #19358 )
2023-09-12 22:34:04 +10:00
metalgearsloth
d5bd1c6f86
Predict StorageComponent ( #19682 )
2023-09-11 21:20:46 +10:00
Leon Friedrich
e4ca6f4fb9
Allow solutions to store extra reagent data ( #19323 )
2023-09-05 07:55:10 +10:00
Visne
c7b21b631b
Remove unused dependencies ( #19490 )
2023-08-24 09:55:15 -08:00
Vordenburg
7582474f1a
Lint more const string prototypes ( #18922 )
2023-08-13 20:26:59 -04:00
Leon Friedrich
a372daadb2
Remove server-side sprite references from chem master ( #15888 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-04-29 19:27:14 +10:00
DEATHB4DEFEAT
c02dd02c34
uichange Chemmaster ( #14237 )
2023-04-05 16:55:14 -06:00
Visne
c6d3e4f3bd
Fix warnings and code cleanup/fixes ( #13570 )
2023-01-19 13:56:45 +11:00
Leon Friedrich
466384b081
Solution rejig ( #12428 )
2023-01-12 14:41:40 +11:00
Leon Friedrich
881a2b2ece
PopupSystem public methods rejig ( #12830 )
2022-12-19 08:41:47 +11:00
Chief-Engineer
eb18363bd2
Add multiple logs ( #12857 )
2022-12-15 19:33:27 +01:00
Leon Friedrich
6917b0fe17
Misc audio and related changes for replays ( #12578 )
2022-11-22 11:49:48 +11:00
0x6273
a2e6ab2d07
Cap ChemMaster label length ( #12260 )
...
* Cap ChemMaster label length
* Reroll for green checkmark
2022-10-28 12:43:59 -05:00
0x6273
0c24f8b69b
ReagentDispenser ECS ( #11418 )
2022-10-03 17:57:32 -07:00
Illiux
8e7c1cb133
Fix ChemMaster labelling behavior ( #11290 )
2022-09-15 16:27:22 +10:00
Illiux
09df0dfb60
Remove ChemMasterSystem debug assertions ( #11288 )
2022-09-14 22:57:03 -05:00
Illiux
71e46de0fc
Rework the ChemMaster's output handling ( #11207 )
...
* Fix doc comment on FitsInDispenserComponent
It's clearly intended to be a doc comment, but wasn't.
* Allow the ChemMaster to accept canisters and bottles
* Give the ChemMaster an output container slot
* Tweak ChemMaster UI layout
* Make more ChemMaster UI tweaks
* Update ChemMaster SpinBox max handling
* Rework the ChemMaster
* Apply suggestions from code review
Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>
* Implement PR feedback
* Switch ChemMaster to a tabbed UI layout
* Rename Amount to Dosage for clarity
* Replace Amount with Dosage in messages
* Clarify dose in UI
Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>
2022-09-14 19:10:12 -05:00
0x6273
0c8e52c163
ChemMaster ECS ( #11052 )
2022-09-05 22:06:47 -07:00
wrexbe
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +10:00
Leon Friedrich
3b29ffdfa0
Make chemistry machines and IdCardConsole use item slots ( #5428 )
...
* chemistry item slots
* item slots id card console
2021-11-24 18:03:07 +11:00
Vera Aguilera Puerto
9921801f15
ActionBlocker CanPickup uses EntityUid exclusively
2021-11-09 13:43:39 +01:00
Vera Aguilera Puerto
51e785c0fd
ActionBlocker CanDrop uses EntityUid exclusively
2021-11-09 13:23:53 +01:00
20kdc
7220132be3
ChemMaster/Chemistry Dispenser constructability, fixed edition ( #5125 )
2021-11-02 10:04:07 +01:00
Ygg01
b2aca94586
Refactor Solution from Shared -> Server ( #5078 )
...
* Move entity solution entity systems to shared
* Move SolutionComponents to Server
* Fix namespaces
* Remove Networked Component.
* Fixes
* Add components to ignore list
2021-10-29 23:40:15 +11:00
Leon Friedrich
6cb58e608b
ECS verbs and update context menu ( #4594 )
...
* Functioning ECS verbs
Currently only ID card console works.
* Changed verb types and allow ID card insertions
* Verb GUI sorting and verb networking
* More networking, and shared components
* Clientside verbs work now.
* Verb enums changed to bitmask flags
* Verb Categories redo
* Fix range check
* GasTank Verb
* Remove unnecessary bodypart verb
* Buckle Verb
* buckle & unbuckle verbs
* Updated range checks
* Item cabinet verbs
* Add range user override
* construction verb
* Chemistry machine verbs
* Climb Verb
* Generalise pulled entity verbs
* ViewVariables Verb
* rejuvenate, delete, sentient, control verbs
* Outfit verb
* inrangeunoccluded and tubedirection verbs
* attach-to verbs
* remove unused verbs and move VV
* Rename DebugVerbSystem
* Ghost role and pointing verbs
* Remove global verbs
* Allow verbs to raise events
* Changing categories and simplifying debug verbs
* Add rotate and flip verbs
* fix rejuvenate test
* redo context menu
* new Add Gas debug verb
* Add Set Temperature debug verb
* Uncuff verb
* Disposal unit verbs
* Add pickup verb
* lock/unlock verb
* Remove verb type, add specific verb events
* rename verb messages -> events
* Context menu displays verbs by interaction type
* Updated context menu HandleMove
previously, checked if entities moved 1 tile from click location.
Now checks if entities moved out of view.
Now you can actually right-click interact with yourself while walking!
* Misc Verb menu GUI changes
* Fix non-human/ghost verbs
* Update types and categories
* Allow non-ghost/human to open context menu
* configuration verb
* tagger verb
* Morgue Verbs
* Medical Scanner Verbs
* Fix solution refactor merge issues
* Fix context menu in-view check
* Remove prepare GUI
* Redo verb restrictions
* Fix context menu UI
* Disposal Verbs
* Spill verb
* Light verb
* Hand Held light verb
* power cell verbs
* storage verbs
and adding names to insert/eject
* Pulling verb
* Close context menu on verb execution
* Strip verb
* AmmoBox verb
* fix pull verb
* gun barrel verbs
revolver verb
energy weapon verbs
Bolt action verb
* Magazine gun barrel verbs
* Add charger verbs
* PDA verbs
* Transfer amount verb
* Add reagent verb
* make alt-click use ECS verbs
* Delete old verb files
* Magboot verb
* finalising tweaks
* context menu visibility changes
* code cleanup
* Update AdminAddReagentUI.cs
* Remove HasFlag
* Consistent verb keys
* Remove Linq, add comment
* Fix in-inventory check
* Update GUI text alignment and padding
* Added close-menu option
* Changed some "interaction" verbs to "activation"
* Remove verb keys, use sorted sets
* fix master merge
* update some verb text
* Undo Changes
Remove some new verbs that can be added later
undid some .ftl bugfixes, can and should be done separately
* fix merge
* Undo file rename
* fix merge
* Misc Cleanup
* remove contraction
* Fix keybinding issue
* fix comment
* merge fix
* fix merge
* fix merge
* fix merge
* fix merge
* fix open-close verbs
* adjust uncuff verb
* fix merge
and undo the renaming of SharedPullableComponent to PullableComponent. I'm tired of all of those merge conflicts
2021-10-04 20:29:03 -07:00
Ygg01
c209e3f29b
Solution refactor ( #4407 )
...
* Rename SolutionContainerCaps -> Capability
* Move IExamine event to Chemistry System.
* ECS the ISolutionChange into SolutionChangeEvent
* Unify SolutionContainer into a single shared component
* Replace ISolutionInteraction with SolutionContainerComponent
* Move all methods from SolutionContainer to ChemistrySystem
* Refactor EntitySystem calls to Dependencies
* Refactor SolutionContainer to SolutionManager
* Fix yamls
* Fix test fails
* Fix post merge issues
* Fix various issues with SolutionManager
* More fixes
* Fix more components
* Fix events not being directed
* Fixes for Hypospray
* Separate removal and iteration on Metabolism
* Fix creampie problems
* Address some of sloth's issues
* Refactors for Systems
* Refactored solution location
* Fix tests
* Address more sloth issues
* Fix dependency
* Fix merge conflicts
* Add xmldocs for Capabilities components
* Remove HasSolution/TryGetDefaultSolution and Add/Remove Drainable/Refillable
* Replace Grindable/Juiceable with Extractable
* Refactor field names
* Fix Drainable
* Fix some issues with spillable and injector
* Fix issues with Grinder
* Fix Beaker having duplicate solutions
* Fix foaming
* Address some MGS issues
* Fix Uid issues
* Fix errors in solution Tranfer
* Fixed some extra values constant values
* Cola is drinkable now
2021-09-06 23:49:44 +10:00
