Vigers Ray
2da8b9f545
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/CODEOWNERS
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Client/Changelog/ChangelogTab.xaml.cs
# Content.Client/Chemistry/UI/ChemMasterWindow.xaml
# Content.Client/Entry/EntryPoint.cs
# Content.Client/GameTicking/Managers/ClientGameTicker.cs
# Content.Client/Launcher/LauncherConnectingGui.xaml
# Content.Client/Lobby/LobbyState.cs
# Content.Client/Lobby/UI/LobbyGui.xaml
# Content.Client/Paper/UI/PaperWindow.xaml.cs
# Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs
# Content.Client/Stylesheets/StyleNano.cs
# Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
# Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs
# Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
# Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.IntegrationTests/Tests/Power/StationPowerTests.cs
# Content.Packaging/ServerPackaging.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
# Content.Server/Atmos/TileAtmosphere.cs
# Content.Server/Bible/BibleSystem.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Content.Server.csproj
# Content.Server/Discord/DiscordLink/DiscordLink.cs
# Content.Server/GameTicking/GameTicker.LobbyBackground.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Ghost/GhostSystem.cs
# Content.Server/Kitchen/Components/MicrowaveComponent.cs
# Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
# Content.Server/Mech/Systems/MechSystem.cs
# Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleSystem.cs
# Content.Server/Medical/DefibrillatorSystem.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Radio/EntitySystems/HeadsetSystem.cs
# Content.Server/Remotes/DoorRemoteSystem.cs
# Content.Server/RoundEnd/RoundEndSystem.cs
# Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
# Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
# Content.Server/Tips/TipsSystem.cs
# Content.Server/Traitor/Uplink/UplinkSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Bed/BedSystem.cs
# Content.Shared/Blocking/BlockingSystem.User.cs
# Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
# Content.Shared/Chat/SharedSuicideSystem.cs
# Content.Shared/Chemistry/Components/HyposprayComponent.cs
# Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs
# Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs
# Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
# Content.Shared/Chemistry/Events/HyposprayEvents.cs
# Content.Shared/Content.Shared.csproj
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/Friction/TileFrictionController.cs
# Content.Shared/GameTicking/SharedGameTicker.cs
# Content.Shared/Interaction/InteractHand.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/Medical/Healing/HealingSystem.cs
# Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
# Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
# Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
# Content.Shared/Throwing/ThrowingSystem.cs
# Content.Shared/Trigger/Systems/TriggerOnHitscanSystem.cs
# Content.Shared/Weapons/Hitscan/Systems/HitscanBasicDamageSystem.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Content.Shared/Weapons/Ranged/Components/BatteryWeaponFireModesComponent.cs
# Content.Shared/Weapons/Ranged/Components/HitscanBatteryAmmoProviderComponent.cs
# Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
# Content.Shared/Zombies/ZombieComponent.cs
# Content.Shared/_Sunrise/Lobby/LobbyBackgroundPrototype.cs
# README.md
# Resources/Locale/en-US/_strings/borg/borg.ftl
# Resources/Locale/en-US/_strings/chemistry/components/hypospray-component.ftl
# Resources/Locale/en-US/_strings/chemistry/components/injector-component.ftl
# Resources/Locale/en-US/_strings/commands/pauseatmos-command.ftl
# Resources/Locale/en-US/_strings/commands/quick-inspect-command.ftl
# Resources/Locale/en-US/_strings/commands/show-wallmounts-command.ftl
# Resources/Locale/en-US/_strings/commands/substepatmos-command.ftl
# Resources/Locale/en-US/_strings/fluids/components/equip-spray-component.ftl
# Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-revolutionary.ftl
# Resources/Locale/en-US/_strings/job/job-names.ftl
# Resources/Locale/en-US/_strings/lobby/lobby-state-background.ftl
# Resources/Locale/en-US/_strings/reagents/meta/medicine.ftl
# Resources/Locale/en-US/_strings/reagents/meta/physical-desc.ftl
# Resources/Locale/en-US/_strings/silicons/borg-module.ftl
# Resources/Locale/en-US/_strings/store/changeling-catalog.ftl
# Resources/Locale/en-US/_strings/store/currency.ftl
# Resources/Locale/en-US/_strings/store/store.ftl
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Body/Organs/slime.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/backpack.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
# Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
# Resources/Prototypes/Catalog/Fills/Crates/antag.yml
# Resources/Prototypes/Catalog/Fills/Crates/armory.yml
# Resources/Prototypes/Catalog/Fills/Crates/botany.yml
# Resources/Prototypes/Catalog/Fills/Crates/fun.yml
# Resources/Prototypes/Catalog/Fills/Crates/medical.yml
# Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
# Resources/Prototypes/Catalog/Fills/Crates/security.yml
# Resources/Prototypes/Catalog/Fills/Crates/service.yml
# Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
# Resources/Prototypes/Catalog/Fills/Items/belt.yml
# Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
# Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
# Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
# Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
# Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
# Resources/Prototypes/Entities/Debugging/debug_sweps.yml
# Resources/Prototypes/Entities/Debugging/stress_test.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
# Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml
# Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
# Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml
# Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
# Resources/Prototypes/Entities/Objects/Materials/parts.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Shields/shields.yml
# Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
# Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
# Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
# Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
# Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
# Resources/Prototypes/Entities/Structures/Walls/walls.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/GameRules/unknown_shuttles.yml
# Resources/Prototypes/InventoryTemplates/aghost_inventory_template.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/Maps/amber.yml
# Resources/Prototypes/Maps/oasis.yml
# Resources/Prototypes/Maps/reach.yml
# Resources/Prototypes/Objectives/objectiveGroups.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Reagents/narcotics.yml
# Resources/Prototypes/Reagents/toxins.yml
# Resources/Prototypes/Recipes/Reactions/medicine.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml
# Resources/Prototypes/Roles/play_time_trackers.yml
# Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
# Resources/Prototypes/Species/species_weights.yml
# Resources/Prototypes/Store/presets.yml
# Resources/Prototypes/ai_factions.yml
# Resources/Prototypes/borg_types.yml
# Resources/Prototypes/explosion.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/lobbyscreens.yml
# Resources/Prototypes/silicon-laws.yml
# Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-med.png
# Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-broken.png
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-empty.png
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-open.png
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley.png
# Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_chassis.png
# Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_harness+o.png
# Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_harness.png
# Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
# Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json
# Resources/Textures/Structures/Storage/canister.rsi/meta.json
# Resources/Textures/Structures/Storage/tanks.rsi/meta.json
# Resources/migration.yml
# RobustToolbox
# SECURITY.md
# SpaceStation14.sln
2025-12-26 04:19:27 +01:00
Errant
432c9578be
move GameMapPrototype and GameMapCondition to shared ( #41742 )
...
* move GameMapPrototype and GameMapCondition to shared
* fix
2025-12-06 15:45:50 +00:00
Vigers Ray
fb4ef153c8
я устал, смена окончена
2025-08-13 01:24:33 +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
Nemanja
1374ceea47
Move some Station methods into shared ( #38976 )
2025-08-08 11:22:34 -04:00
Pieter-Jan Briers
e99fc501a6
Revert biome rework ( #38724 )
...
* Revert "Fix world generation (#38713 )"
This reverts commit 10fa6ff4af#37735 )"
This reverts commit fe7b96147c
2025-07-03 20:48:04 +02:00
metalgearsloth
fe7b96147c
Biome rework ( #37735 )
...
* DungeonData rework
Back to fields, serializes better, just make new layers dumby.
* wawawewa
* Fix this
* Fixes
* Port the work over
* wawawewa
* zoom
* Kinda workin
* Adjust wawa
* Unloading work
* Ore + entitytable fixes
Iterate every dungeon not just last.
* Big shot
* wawawewa
* Fixes
* true
* Fixes
# Conflicts:
# Content.Server/Procedural/DungeonJob/DungeonJob.cs
* wawawewa
* Fixes
* Fix
* Lot of work
* wawawewa
* Fixing
* eh?
* a
* Fix a heap of stuff
* Better ignored check
* Reserve tile changes
* biome
* changes
* wawawewa
* Fixes & snow
* Shadow fixes
* wawawewa
* smol
* Add layer API
* More work
* wawawewa
* Preloads and running again
* wawawewa
* Modified
* Replacements and command
* Runtime support
* werk
* Fix expeds + dungeon alltiles
* reh
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-07-03 00:36:06 -04:00
Kyle Tyo
d316fa3483
Command resolve and LEC conversion batch 3 ( #38378 )
...
* I'm just a silly goober
* requested changes
* Update Content.Server/Interaction/TilePryCommand.cs
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-06-17 11:39:42 +02:00
Vigers Ray
d6c0a011b7
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Client/Clothing/ClientClothingSystem.cs
# Content.Client/Clothing/Systems/ChameleonClothingSystem.cs
# Content.Client/Fax/UI/FaxWindow.xaml
# Content.Client/Ghost/GhostSystem.cs
# Content.Client/Holiday/HolidaySystem.cs
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
# Content.Client/Lobby/UI/LobbyGui.xaml
# Content.Client/Lobby/UI/LobbyGui.xaml.cs
# Content.Client/Mech/MechSystem.cs
# Content.Client/Stealth/StealthSystem.cs
# Content.Client/Weapons/Ranged/Systems/GunSystem.cs
# Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
# Content.Server/Bed/BedSystem.cs
# Content.Server/Body/Systems/BodySystem.cs
# Content.Server/Body/Systems/RespiratorSystem.cs
# Content.Server/Cargo/Systems/CargoSystem.Orders.cs
# Content.Server/Communications/CommunicationsConsoleComponent.cs
# Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
# Content.Server/EntityEffects/Effects/MakeSentient.cs
# Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
# Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
# Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
# Content.Server/EntityEffects/Effects/PlantMutateGases.cs
# Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Nutrition/EntitySystems/FoodSystem.cs
# Content.Server/Power/EntitySystems/PowerNetSystem.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/RoundEnd/RoundEndSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Bed/Components/HealOnBuckleComponent.cs
# Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
# Content.Shared/EntityEffects/Effects/ExplosionReactionEffect.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Item/ItemToggle/Components/ComponentTogglerComponent.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Content.Shared/Wieldable/SharedWieldableSystem.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Locale/en-US/_strings/atmos/plaque-component.ftl
# Resources/Locale/en-US/_strings/chat/chat-channel.ftl
# Resources/Locale/en-US/_strings/components/screen-component.ftl
# Resources/Locale/en-US/_strings/inventory/components/slot-block-component.ftl
# Resources/Locale/en-US/_strings/mass-media/news-discord.ftl
# Resources/Locale/en-US/_strings/objectives/commands/stripall.ftl
# Resources/Locale/en-US/_strings/salvage/job-board.ftl
# Resources/Locale/en-US/_strings/ui/spray-painter-window.ftl
# Resources/Locale/en-US/_strings/ui/turret-controls.ftl
# Resources/Maps/_Sunrise/Station/box.yml
# Resources/Prototypes/Access/misc.yml
# Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
# Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/service.yml
# Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
# Resources/Prototypes/Entities/Clothing/Head/helmets.yml
# Resources/Prototypes/Entities/Clothing/Masks/masks.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/dragon.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
# Resources/Prototypes/Entities/Mobs/Species/moth.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/LootTables/suspicion_loot_table.yml
# Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Recipes/Lathes/Packs/science.yml
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/equipped-OUTERCLOTHING-reptilian.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/alien3.png
# Resources/Textures/Effects/speech.rsi/alienroyal3.png
# Resources/Textures/Effects/speech.rsi/default3.png
# Resources/Textures/Effects/speech.rsi/guardian3.png
# Resources/Textures/Effects/speech.rsi/holo3.png
# Resources/Textures/Effects/speech.rsi/lawyer3.png
# Resources/Textures/Effects/speech.rsi/lizard3.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/moth3.png
# Resources/Textures/Effects/speech.rsi/robot3.png
# Resources/Textures/Effects/speech.rsi/slime3.png
# Resources/Textures/Effects/speech.rsi/spider3.png
# Resources/Textures/Effects/speech.rsi/syndibot3.png
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
# Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_f.png
# Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_m.png
# Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_unlit.png
# Resources/Textures/Structures/Piping/disposal.rsi/meta.json
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/steel_dirty.png
# Resources/migration.yml
# runclient-Tools.bat
# runclient.bat
2025-05-27 03:41:41 +03:00
Tayrtahn
50fb48de2e
Cleanup all instances of IMapManager.GetMapEntityId ( #37814 )
...
* Cleanup all instances of IMapManager.GetMapEntityId
* Dependencies
* LocalizedEntityCommands
2025-05-25 19:09:47 +02:00
B_Kirill
c196538aaf
Cleanup warnings: CS0414 ( #36950 )
...
* Clean up
* Use #pragma
2025-05-07 20:00:12 -04:00
Vigers Ray
5d2cdd3f44
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.cs
# Content.Server/Roles/Jobs/JobSystem.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Mobs/Species/vox.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Entities/Objects/Tools/lighters.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Recipes/Lathes/categories.yml
# Resources/Prototypes/Recipes/Lathes/machine_boards.yml
# Resources/Prototypes/Species/vox.yml
2025-04-21 08:56:50 +03:00
Kyle Tyo
a711912cba
Unused dependency cleanup. ( #36760 )
...
* take 2! fight!!!
* final touches
* reeeeeee
2025-04-20 15:56:39 +02:00
SplikZerys
303c42ef70
maps system and maps corrections ( #1870 )
2025-04-19 16:11:41 +03: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
Leon Friedrich
e4f3d19094
Make MappingDataNode use string keys ( #36111 )
...
* MappingDataNode string keys
* a
* poke
2025-04-18 19:28:22 +10:00
Vigers Ray
8d8a908e8d
Ротация карт + мертики карт, эвентов и режимов.
2025-04-13 23:19:55 +03:00
Tayrtahn
86aa82f2b6
Cleanup: Remove redundant prototype name specifications ( #35793 )
...
* Remove redundant prototype name specifications
* These can stay
2025-03-19 19:30:31 +01:00
ElectroJr
b555a6049e
Even more engine changes
2024-12-24 21:00:53 +13:00
ElectroJr
a8cc0397c2
Moar engine changes
2024-12-24 18:57:52 +13:00
ElectroJr
6242567aff
Refactor map loading & saving
2024-12-23 02:42:17 +13:00
PursuitInAshes
c1aee02c74
Change Resave Permission Requirement to Host ( #31397 )
...
ChangePermissionFlagToHost
2024-08-25 11:55:31 +10:00
Plykiya
a87efd7d01
Replace xform.WorldPosition with xformSystem method for Setting/Getting ( #30029 )
...
* GET WORLD POSITON, ROTATION
* Missing parentheses
* ui system depndency
* the issue
* Unused
* Let the function do the transform
---------
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-08-06 21:02:01 +10:00
metalgearsloth
b0b76a1133
Replace StationRandomTransform ( #29149 )
...
* Revert "Rotate and Offset station CCVar nuke (#26175 )"
This reverts commit 44b20f60ff
2024-06-18 23:27:34 +10:00
Kara
993eef1e7c
Resolve 'EntitySystem.Get<T>()' is obsolete in content ( #27936 )
...
* PROJECT 0 WARNINGS: Resolve `'EntitySystem.Get<T>()' is obsolete` in content
* pass entman
* dog ass test
* webeditor
2024-05-12 20:34:52 -04:00
metalgearsloth
a9502be29e
Revert "Fix chat bubbles ( #25643 )" ( #25645 )
...
* Revert "Fix chat bubbles (#25643 )"
This reverts commit 23d2c4d924#25256 )"
This reverts commit f284b43ff6
2024-02-28 00:51:20 +11:00
TemporalOroboros
f284b43ff6
Fixes obsolete Transform warnings in Content. ( #25256 )
...
* Fix TransformComponent.MapPosition warnings in Content.Client
* Fix TransformComponent.MapPosition warnings in Content.IntegrationTests
* Fix TransformComponent.MapPosition warnings in Content.Shared
* Fix TransformComponent.MapPosition warnings in Content.Server
* Fix TransformComponent.WorldPosition warnings in Content.Shared
* Fix TransformComponent.WorldPosition warnings in Content.Client
Excepts ClickableComponent b/c that needs to be ECS'd entirely later
* Fix TransformComponent.WorldPosition warnings in Content.Server
* Fix TransformComponent.WorldRotation warnings in Content.*
* Fix TransformComponent.MapPosition warnings I missed
* Fix TransformComponent.WorldMatrix warnings in Content.*
* Fix TransformComponent.InvWorldMatrix warnings in Content.*
* Fix TransformComponent.GetWorldPositionRotationMatrixWithInv warnings in Content.*
* Fix TransformComponent.GetWorldPositionRotationMatrix warnings in Content.*
* Fix TransformComponent.GetWorldPositionRotation warnings in Content.*
* Fix TransformComponent.Anchored.set warnings in Content.*
* Fix TransformComponent.Coordinates.set warnings in Content.*
* Fix TransformComponent.LocalPosition.set warnings in Content.*
* Fix TransformComponent.AttachToGridOrMap warnings in Content.*
* Fix TransformComponent.AttachParent warnings in Content.*
* Preempt TransformComponent.LocalRotation.set warnings in Content.Shared
* Preempt TransformComponent.LocalRotation.set warnings in Content.Client
* Preempt TransformComponent.LocalRotation.set warnings in Content.IntegrationTests
* Preempt TransformComponent.LocalRotation.set warnings in Content.Server
* Fix/Preempt the remaining obsolete TransformComponent properties/methods in Content.*
* ECS ClickableComponent
* Fix obsolete SharedTransformSystem methods in Content.*
* Fix ExplosionOverlay `SharedTransformSystem` dependency
* Maybe fix null eye position breaking tests
* MGS requested changes
2024-02-27 12:06:20 +11:00
LordCarve
05a2e6b3a2
Obsolete refactor - ConnectedClient to Channel ( #24409 )
2024-01-23 09:14:13 +11:00
deltanedas
cce7aa777c
start of persistence support ( #20770 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-16 19:55:19 -08:00
Leon Friedrich
9a3342d972
Remove uses of TransformComponent.ChildEntities ( #22442 )
...
* Make output of ChildEnumerator non-nullable
* Remove uses of ChildEntities
* poke tests
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-12-17 03:09:50 +11:00
metalgearsloth
816ee2e1ab
Gateway destinations ( #21040 )
...
* Gateway generation
* Gateway stuff
* gatewehs
* mercenaries
* play area
* Range fixes and tweaks
* weh
* Gateway UI polish
* Lots of fixes
* Knock some items off
* Fix dungeon spawning
Realistically we should probably be using a salvage job.
* wahwah
* wehvs
* expression
* weh
* eee
* a
* a
* WEH
* frfr
* Gatwey
* Fix gateway windows
* Fix gateway windows
* a
* a
* Better layer masking
* a
* a
* Noise fixes
* a
* Fix fractal calculations
* a
* More fixes
* Fixes
* Add layers back in
* Fixes
* namespaces and ftl
* Other TODO
* Fix distance
* Cleanup
* Fix test
2023-11-14 19:23:40 -07:00
DrSmugleaf
2d58d19b07
Make all prototype types partial ( #21374 )
2023-11-01 19:56:23 -07:00
Leon Friedrich
e685cb626b
Un-revert IPlayerManager refactor ( #21244 )
2023-10-28 09:59:53 +11:00
metalgearsloth
a2bbda43cc
Revert "Update submodule to 172.0.0 ( #21222 )" ( #21225 )
2023-10-24 21:55:20 +11:00
Leon Friedrich
7ba0ea2926
IPlayerManager refactor ( #21215 )
2023-10-24 20:19:08 +11:00
metalgearsloth
46a3076ecb
Predict tile-prying ( #21167 )
2023-10-24 00:20:33 +11:00
metalgearsloth
5a0fc68be2
Content update for NetEntities ( #18935 )
2023-09-11 09:42:41 +10:00
metalgearsloth
4cfc578011
Revert "Remove most usages of obsolete TransformComponent methods (#1… ( #19714 )
2023-09-01 12:30:29 +10:00
Nemanja
4d677f0685
1v1 me first to 31 no powerups [Deathmatch Gamemode] ( #19467 )
...
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-08-30 18:06:15 -07:00
Visne
1416942bea
Remove most usages of obsolete TransformComponent methods ( #19571 )
2023-08-30 12:05:19 +10:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
Leon Friedrich
5ba1a41742
Trim migration.yml ( #19081 )
2023-08-14 01:44:34 -06:00
Vordenburg
1df650871d
Support weighted tile variantize ( #18940 )
...
* Support weighted tile variantize
* Remove unused using
* Use an array
2023-08-13 01:25:54 -06:00
Nemanja
27231420bc
Allow gamemodes to specify custom map pools ( #18429 )
...
* Allow game presets to require certain maps
* make preset maps ignore the game map pool
* make it use a map pool prototype
* Typo
---------
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-08-01 16:11:50 -05:00
Leon Friedrich
5172188a48
Migrate machine linking and resave all maps ( #18243 )
2023-07-24 10:35:09 +10:00
Ilya246
9261cef915
fire axe plating ( #18087 )
2023-07-17 01:47:20 -06:00
20kdc
69ff0ae2e6
Gravity "Inherent" property for planet maps ( #16695 )
2023-07-16 15:01:54 -04:00
metalgearsloth
68480af109
Update content vectors to numerics ( #17759 )
2023-07-08 14:08:32 +10:00
Leon Friedrich
126f5d6dae
Fix mime wall & turf/tile helper issues. ( #17844 )
2023-07-06 14:43:49 +10:00
Ben
c858c76341
Anchorable shared ( #17422 )
...
Co-authored-by: BenOwnby <ownbyb@appstate.edu>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-06-29 22:35:54 +10:00
