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
imatsoup
8784a3e5c7
Change default Rat King order from 'Loose' to 'Follow' ( #41680 )
...
Update RatKingComponent.cs
2025-12-03 03:25:03 +00:00
Vigers Ray
e67f4a6672
Merge remote-tracking branch 'space-wizards/master'
2025-09-27 03:54:27 +03:00
Jessica M
b2d09ba457
Rat King Refactor Part 0: Separate Rummaging from RatKingComponent. ( #40530 )
...
* separate rummager into its own component/system
* thing
* address review and entitytables
* reviews
* review
* warnings
* Update Content.Shared/RatKing/Systems/RummagerSystem.cs
---------
Co-authored-by: Jessica M <jessica@maybe.sh>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-09-25 03:50:24 +02:00
Copilot
bc55df1fe3
Улучшения Крысиного Короля: увеличен лимит армии, добавлены гвардейцы ( #2923 )
...
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: KaiserMaus <kaiser.ratte@gmail.com>
Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-08-24 01:47:46 +03: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
TryPank
fdc2795d4d
Бафф короля крыс ( #2032 )
...
Co-authored-by: tajikartem@yandex.ru <tajik@artem@yandex.ru>
2025-05-04 19:22:46 +03:00
pacable
c250f52a46
maxcap ( #819 )
...
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-12-10 02:34:54 +03:00
nikthechampiongr
362d56981f
Simplify DoAfterArgs behavior for movement and distance checks ( #25226 )
...
* Merge BreakOnWeightlessMove and BreakOnMove. Provide different theshold for weightless movement.
* Adjust WeightlessMovementThresholds. Put a thing I forgot to put in the doafterargs.
* Make DoAfterArgs only use OnMove to determine whether to check for
movement and MoveThreshold to determine the threshold regardless of
weightlessness. Gave DistanceThreshold a default value which will always
be checked now.
* Fix issue introduced by merge.
* Use interaction system for determining whether a distance is within range
* Fix incorrect doafter args introduced by previous merge.
Forgor to commit these.
* Exorcise ghost.
The execution system should have been deleted when I merged previously.
For a reason I cannot comprehend it came back, but only the execution
system.
* Exorcise ghost Pt. 2
* Allow for movement check to be overriden in zero g and adjust doafter args where needed.
You can now override checking for movement in zero g with the BreakOnWeightlessMove bool. By default it will check.
The following doafters were made to ignore the movement check in zero g:
- Healing yourself with healing items,
- Removing embedded projectiles,
- Using tools like welders and crowbars
* Adjust distance for cuffing/uncuffing to work. Make injections not break on weightless movement.
* Fix evil incorrect and uneeded comments
2024-03-19 21:09:00 +11:00
Kara
ad97580727
Rename Miasma to Ammonia ( #22791 )
...
* Rename Miasma to Ammonia
* Namespace changes
* Map change????? why
2023-12-20 21:19:50 -07:00
Whisper
8fa47b87fb
Rat king fixes + buffs ( #22247 )
...
* fix minor typo
* add doafter range
* increase miasma release
2023-12-08 12:46:28 -06:00
metalgearsloth
269c93245d
Unrevert audio ( #21330 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-11-27 22:12:34 +11:00
metalgearsloth
5b8f3c48c4
Revert "Update submodule to 175.0.0 ( #21318 )" ( #21319 )
2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed
Content audio ( #20862 )
2023-10-29 14:58:23 +11:00
metalgearsloth
8f068561c3
Fix rat king rummage audio ( #21130 )
2023-10-21 09:58:00 +11:00
Kara
9b55fbd0be
fix build ( #20427 )
2023-09-23 03:09:07 -07:00
Nemanja
f16ff3a2d9
Rat King Milsim + Buffs ( #20190 )
...
* rat king update
* rummaging
* buuuuunnnnncccchhh of shit
* the last of it
* make rat servants not ghost roles
* pissma buff and cooldown
2023-09-22 15:01:05 -05:00
DrSmugleaf
c71f97e3a2
Refactor actions to be entities with components ( #19900 )
2023-09-08 18:16:05 -07:00
