Vigers Ray
3cf56cd5b3
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/Access/Systems/AgentIDCardSystem.cs
# Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs
# Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
# Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
# Content.Shared/Standing/StandingStateComponent.cs
# Content.Shared/Standing/StandingStateSystem.cs
# Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs
# Content.Shared/Stunnable/SharedStunSystem.cs
# Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-changeling.ftl
# Resources/Locale/en-US/_strings/ghost/observer-role.ftl
# Resources/Locale/en-US/_strings/robotics/borg_modules.ftl
# Resources/Prototypes/Entities/Clothing/Ears/specific.yml
# Resources/Prototypes/Entities/Clothing/Eyes/specific.yml
# Resources/Prototypes/Entities/Clothing/Hands/specific.yml
# Resources/Prototypes/Entities/Clothing/Head/specific.yml
# Resources/Prototypes/Entities/Clothing/Neck/specific.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
# Resources/Prototypes/Entities/Objects/Materials/parts.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
2025-08-13 14:13:30 +03:00
Vigers Ray
fb4ef153c8
я устал, смена окончена
2025-08-13 01:24:33 +03:00
pathetic meowmeow
39cb27fe21
Borg hands & hand whitelisting ( #38668 )
...
* Borg hands & hand whitelisting
* yaml linted
* yaml linted (x2)
* yaml linted (x3)
* my storage tests so pass
* no need for SetCount
* ok new stuff you can get fixed too
* oops
* staque
* what if we addressed feedback
* my place so holder
* what if we addresesd feedback
* what if i did it correctly
* terminating or deleted
2025-08-12 15:21:42 -07:00
Red
d7295d1ae4
Actions examine ( #39558 )
2025-08-11 17:52:20 +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
Perry Fraser
49fe34f78a
fix: fix emote wheel icons ( #39481 )
2025-08-08 15:27:46 -04:00
Vigers Ray
b52f640b5a
Порт стрельбы со старлайна ( #2640 )
...
Co-authored-by: KaiserMaus <kaiser.ratte@gmail.com>
2025-08-08 22:25:02 +03:00
PGray
92d6e79040
Remove redundant return statement in InventoryUIController ( #39381 )
2025-08-05 18:49:30 -07:00
ArtisticRoomba
e996fb62f1
Revert "Fix bug with pipe color" ( #39135 )
2025-08-04 13:10:54 -07:00
Pieter-Jan Briers
af4ff4e9de
Update content to remove redundant Robust math types ( #38930 )
...
Vector3, Vector4, Matrix4, and Quaternion are now gone. This switches us over to System.Numerics where applicable.
2025-07-22 12:29:17 +02:00
IgorAnt028
41a175636b
Fix bug with pipe color ( #30645 )
...
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-07-19 15:10:38 -07: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
Tayrtahn
9186b65b14
Validate ShaderPrototype IDs ( #38728 )
...
* Convert all shader prototype string literals to protoids in overlays
* Convert more shader prototype literal strings to protoids
* Convert ValidatePrototypeId to ProtoId
* Later
2025-07-03 18:11:31 -07:00
Nemanja
524725d378
HandsSystem Refactor ( #38438 )
...
* checkpoint
* pt 2
* pt... i forgot
* pt 4
* patch
* More test fixes
* optimization!!!
* the REAL hand system
* fix RetractableItemActionSystem.cs oversight
* the review
* test
* remove test usage of body prototype
* Update Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* hellcode
* hellcode 2
* Minor cleanup
* test
* Chasing the last of the bugs
* changes
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2025-06-25 15:13:03 +02:00
ScarKy0
6b8842c44d
Generic Numeric Alerts ( #38370 )
2025-06-21 20:59:37 +03:00
Perry Fraser
a0544fdbf2
Make gas tank UI a bit more network-happy ( #38184 )
...
* fix: network gas tank output pressure
* fix: don't overwrite gas tank output pressure during editing
2025-06-21 11:06:49 +02:00
Tayrtahn
81d09559c2
Cleanup static Logger use in ChatBox ( #38405 )
...
Convert static logger to resolved, resolve entman
2025-06-18 18:21:48 +02:00
little-meow-meow
c049852486
fix: no longer accidentally rotate held items ( #38331 )
...
Signed-off-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com>
2025-06-16 19:39:04 -07:00
Vigers Ray
e6be50745f
Merge remote-tracking branch 'space-wizards/master'
2025-06-13 01:15:48 +03:00
Tayrtahn
70ce570fe9
Cleanup chat highlighting code ( #38235 )
...
* Cache regexes
* Convert static LocManager to resolved
* Use Any instead of Count > 0
* Use var instead of explicit types
* Make _highlights readonly
2025-06-11 22:09:05 -07:00
ThereDrD
aea4f57a13
Удаление санрайзовской копии OutputPanel, RichText и связанных с ними ( #2258 )
2025-06-10 00:32:39 +03:00
Vigers Ray
390ffd9c7f
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/Body/Systems/BodySystem.cs
# Content.Server/Body/Systems/RespiratorSystem.cs
# Content.Server/Medical/VomitSystem.cs
# Content.Shared/Body/Systems/StomachSystem.cs
# Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/meta.json
# Resources/Textures/Objects/Tools/t-ray.rsi/meta.json
2025-06-09 22:00:17 +03:00
DrSmugleaf
7f9b2a0434
Fix eating and drinking verbs showing up after a short delay and making your verb UI bounce ( #38164 )
...
* Fix eating and drinking verbs showing up after a short delay and making your verb UI bounce
* Usings fix
* Usings fix
* Usings fix
* Usings fix
* CVar fix
* Predicted ppups
* Openable predicted popup
* Fix audio prediction
2025-06-09 10:36:04 -04: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
af38039aab
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Actions/ActionsSystem.cs
# Content.Shared/Actions/ActionContainerSystem.cs
# Content.Shared/Actions/Components/TargetActionComponent.cs
# Content.Shared/Actions/EntityTargetActionComponent.cs
# Content.Shared/Bed/SharedBedSystem.cs
# Content.Shared/Bed/Sleep/SleepingSystem.cs
# Resources/Prototypes/Actions/types.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
2025-05-29 10:45:58 +03:00
deltanedas
b3825dce97
action refactor proper ecs edition ( #27422 )
2025-05-28 15:52:11 -04:00
Vigers Ray
30323d6512
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-05-28 21:52:11 +03:00
Tayrtahn
a9f7cfbcb6
Update UIControllers to use Log ( #37792 )
...
Update UIControllers to use Log
2025-05-28 12:50:31 -04: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
ThereDrD
6dd451a5c7
Панель телепорта призрака ( #2157 )
...
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-05-27 01:34:29 +03:00
TrixxedHeart
b682da9d9c
Fixed Missing or Misconfigured Locale Keys ( #37595 )
...
* Fixes and adds many localization keys from #34343
Open
* Fix comment, that is not how that works.
* Update Resources/Locale/en-US/components/screen-component.ftl
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Fixes cmd-parse-failure-int -> cmd-parse-failure-integer in OptionsUIController.cs, removes cmd-parse-failure-int from options-menu.ftl
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-05-20 13:07:52 +02:00
Tayrtahn
c5ac160ea8
Cleanup more SpriteComponent warnings (part 6) ( #37607 )
...
* 1 warning in MechAssemblyVisualizerSystem
* 2 warnings in RecyclerVisualizerSystem
* 1 warning in ClusterGrenadeVisualizerSystem
* 2 warnings in BarSignSystem
* 4 warnings in AlertControl
* 1 warning in ToolSystem
* 2 warnings in PinpointerSystem
* 2 warnings in ClientSpriteMovementSystem
* 2 warnings in OptionsVisualizerSystem
* 1 warning in FlatpackSystem
* 1 warning in ZombieSystem
* 1 warning in StackSystem
* 1 warning in MiningOverlay
* 1 warning in FlippableClothingVisualizerSystem
* Guard clause for MechAssemblyVisualizerSystem
* Get SpriteSystem in AlertControl constructor
2025-05-20 01:52:03 +02:00
Tayrtahn
3dcfc3a99e
Cleanup more SpriteComponent warnings (part 4) ( #37550 )
...
* Cleanup warnings in ClickableSystem
* Cleanup warnings in FultonSystem
* Cleanup warning in HolidaySystem
* Cleanup warning in DoAfterOverlay
* Cleanup warning in EntityHealthBarOverlay
* Cleanup warning in SmokeVisualizerSystem
* Cleanup warning in VaporVisualizerSystem
* Cleanup warning in ColorFlashEffectSystem
* Cleanup warnings in StealthSystem
* Cleanup warnings in TrayScannerSystem
* Cleanup warnings in InventoryUIController
* Cleanup warnings in HideMechanismsCommand
* Cleanup warning in ShowMechanismsCommand
* Cleanup warnings in EntityPickupAnimationSystem
* Cleanup warnings in PointingSystem
* Cleanup warning in StickyVisualizerSystem
* Cleanup warnings in TabletopSystem
* Cleanup warnings in PillSystem
* Cleanup warnings in DiceSystem
* Cleanup warnings in ProjectileSystem
2025-05-18 03:48:11 +02:00
lzk
740ce0e8ad
Port fancy speech bubbles ( #29349 )
2025-05-06 20:49:42 +03:00
Vigers Ray
95b86d7a4b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Construction/UI/ConstructionMenu.xaml
# Content.Client/Construction/UI/ConstructionMenu.xaml.cs
# Content.Client/Construction/UI/ConstructionMenuPresenter.cs
# Content.Server/Warps/WarpPointSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
# Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Weapons/Reflect/ReflectSystem.cs
# Resources/Locale/en-US/_strings/plants/mutations.ftl
# Resources/Locale/en-US/_strings/stack/stacks.ftl
# Resources/Locale/en-US/_strings/teleportation/teleportation-menu-gui.ftl
# Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
# Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
# Resources/Prototypes/Entities/Objects/Power/powercells.yml
# Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/nuke.yml
# Resources/Prototypes/Reagents/toxins.yml
# Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_banana.yml
# Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/hamtr_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/honker_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/ripley_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/vim_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/blast_door.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/glassbox.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/secretdoor.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
# Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/APC.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_alarms.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/intercom.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/station_maps.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_generator.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/bladed_hats.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/bola.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_mine.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
# Resources/Prototypes/Recipes/Construction/structures.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/cleanbot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/firebot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/honkbot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/medibot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/supplybot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/firebomb.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pipebomb.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pneumatic_cannon.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratefreezer.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
# Resources/Prototypes/Recipes/Crafting/improvised.yml
# Resources/Prototypes/Recipes/Reactions/medicine.yml
# Resources/Prototypes/Roles/Jobs/CentComm/official.yml
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json
2025-05-04 23:13:12 +03:00
metalgearsloth
bd69fc612a
Predicted internals ( #33800 )
...
* Predicted gas pumps
I wanted to try out atmos and first thing I found.
* a
* Atmos device prediction
- Canisters
- Tanks
- Internals
AirMixes aren't predicted so nothing on that front but all the UIs should be a lot closer.
* Remove details range
* Gas tank prediction
* Even more sweeping changes
* Alerts
* rehg
* Popup fix
* Fix merge conflicts
* Fix
* Review
2025-05-02 18:22:29 +10: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
Vigers Ray
286a1f2265
QoL Истории ахелпа ( #1984 )
2025-04-27 22:34:04 +03:00
Nemanja
abb9e373bd
Fix storage ui hovering over the hotbar ( #36770 )
2025-04-25 00:10:43 +02:00
Zachary Yona
063bbfa77c
Ashen hud item status slot fix ( #31411 )
...
* new patchMargin variable added, horizontals fixed
* All sides now work, system is fully integarated
---------
Co-authored-by: Zachary Yona <magicalusf@gmail.com>
2025-04-22 14:40:58 -04:00
Vigers Ray
e2aab392db
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/PDA/PdaSystem.cs
# 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/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/borg_types.yml
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/full.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/meta.json
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state0.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state1.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state2.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state3.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state4.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state5.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state6.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state7.png
2025-04-20 02:52:59 +03:00
Kyle Tyo
8dc2cb8874
Minor dependency and variable cleanup. ( #36730 )
...
removal of misc unused or extra dependency definitions.
2025-04-19 18:11:34 +02:00
pathetic meowmeow
8e24308714
Make two inventories not dance around as much when opening/closing them ( #35041 )
...
* Make two inventories not dance around as much when opening/closing them
* Use .Any
2025-04-19 10:40:49 -04:00
Vigers Ray
0e350ab6d3
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Actions/ActionsSystem.cs
# Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
# Content.Server/GameTicking/GameTicker.GamePreset.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Actions/BaseActionComponent.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Weapons/Reflect/ReflectComponent.cs
# Content.Shared/Weapons/Reflect/ReflectSystem.cs
# README.md
# Resources/Prototypes/Actions/types.yml
# Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Mobs/Player/dragon.yml
# Resources/Prototypes/Recipes/Lathes/security.yml
# Resources/Prototypes/ai_factions.yml
2025-04-19 00:46:30 +03:00
Ciarán Walsh
ab1bcfe391
Implement client-side theming for OutputPanel scroll-down button. ( #35913 )
...
* Implement client-side theming for OutputPanel scroll-down button.
* Use OutputPanel constant for button class name
* Remove unused string
* Enable scroll button for ChatBox
* Update RobustToolbox
* Update to merged RT version
2025-04-18 17:42:59 +10:00
metalgearsloth
7d2ef2bd47
Action charges refactor ( #33993 )
...
* Action charges refactor
- Fixes the slight godmoding of baseactioncomponent.
- Gets back 1ms of server time.
* chorg
* Remove FrameUpdate
* Fixes
* More fixes
* Combine
* Fixes
* Updates
* weh
* Last fixes
* weh
* Fix naughty
* YAML fixes
* This one too
* Merge conflicts
* This thing
* Review
* Fix this as well
* Icon fix
* weh
* Review
* Review
* seamless
* Review
2025-04-18 13:45:48 +10:00
Nemanja
c3e43a78f3
Fix another storedSprite bug ( #36662 )
2025-04-18 12:15:31 +10:00
metalgearsloth
e1a21728e7
Storage fixes ( #36533 )
...
* Storage fixes
- Add size event.
- Fix reclaim not running always.
* Block the toggles
* Standardise and popup explaining
* Disable item toggles in bags
* Fix verb popping up even if we can't activate
* Conflicts
* Validate
* Stop drags if source closes
* Really fixes
* Real fix
* Revert this
2025-04-18 12:11:31 +10:00
Vigers Ray
f71f04558f
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
# Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
2025-04-17 23:48:59 +03:00
