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
Princess Cheeseballs
e85bc1bb8c
Stunnable New Status and Cleanup ( #38618 )
...
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2025-07-21 19:22:11 +02: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
slarticodefast
38232d2255
Predict healing and bloodstream ( #38690 )
...
* initial commit
* reapply 38126
* fix rootable
* someone missed an important minus sign here
* try this
* fix
* fix
* reenable crit hits
* cleanup
* fix status time dirtying
* fix
* camelCase
2025-07-02 19:20:31 -04: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
10888fd269
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/GameTicking/Managers/ClientGameTicker.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Cargo/Systems/CargoSystem.Orders.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Power/EntitySystems/PowerNetSystem.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Server/StationEvents/Components/PowerGridCheckRuleComponent.cs
# Content.Server/StationEvents/Events/PowerGridCheckRule.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Shared/CCVar/CCVars.Game.cs
# Content.Shared/GameTicking/SharedGameTicker.cs
# Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-wizard.ftl
# Resources/Locale/en-US/_strings/guidebook/cooking.ftl
# Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
# Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
# Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/GameRules/midround.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Guidebook/antagonist.yml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
# Resources/migration.yml
2025-02-26 22:01:48 +03:00
Winkarst
fa73217b52
Cleanup: Use `SoundSpecifier instead of string literals in VomitSystem` ( #35426 )
...
* Cleanup
* Update
* Update
2025-02-23 22:53:04 +01:00
haiwwkes
99851de785
ayo ( #545 )
2024-10-30 10:42:02 +03:00
Cojoke
ef1fadf275
Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem ( #30084 )
...
* Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem
* guap
* More fixes
* Wait you can do that?
---------
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2024-09-02 13:26:04 +02:00
SlamBamActionman
07174d0aaf
Better DNA forensics & ReagentData ( #26699 )
...
* Added the ability for blood to track DNA using ReagentData; Forensic Scanner now accounts for solution DNA, non-DNA holders have "Unknown DNA"
* Removes touch DNA for puddles, adds DNA to vomit
* DNA now leaves traces in containers and those marked without don't show DNA on scan (except for puddles), gibbed parts have DNA
* Fix stupid metamorphic glass bug grrr
* Removed SpillableComponent since DnaSubstanceTraceComponent is used instead
* Removes data field from maps, adds DNA tracking for some missed items
* Give default value, fix missing values.
* Fixes recipe bug
* Review changes
* Make the Data list into a nullable type
* Revert map changes
* Move gibbed unknown DNA to forensicssystem
2024-08-09 09:27:27 +10:00
Mervill
1ef4f26a44
Remove obsolete code from VomitSystem ( #30544 )
2024-07-31 19:30:14 -07:00
TemporalOroboros
d23c8d5c19
Revert 'Revert 'Solution Entities'' ( #23168 )
2023-12-29 08:47:43 -04:00
Emisse
938d6d9945
Revert "Solution Entities" ( #23160 )
...
Revert "Solution Entities (#21916 )"
This reverts commit d75e743dd7
2023-12-28 20:45:42 -07:00
TemporalOroboros
d75e743dd7
Solution Entities ( #21916 )
...
* Creates Content.Shared.Chemistry.Solutions
Copies Solution class to new namespace
Obsoletes old Solution class
* Switches over to the Solutions.Solution Solution
* Creates Content.Shared.Chemistry.Containers
Copies relevant components/systems to the new namespace
Obsoletes old versions
* Switches over to the Containers.XYZ namespace
* Creates SolutionSystem and obsoletes old SolutionContainerSystem methods
* Start using SolutionSystem for Solution manipulation
* EnumerateSolutions
* Move TryGetMixableSolution
* Move EnsureSolution to Server
* Create Solution Entities
* Stop using obsolete solution system methods
* Fix prototype component tests
* Add using ..Audio.Systems; back
* Wrap solution container slots in ContainerSlots
* Actually add the slot to the solution container map
* Dirty SolutionContainerComponent when ensuring solutions
* Revert namespace changes
* Remerge SolutionSystem and SolutionContainerSystem
* SolutionContainerManagerComponent refactor
* Avoid wrapping necessary code in DebugTools.Assert as it is removed when compiling for release
* Readd examine reagent sorting
* Fix errors
* Poke tests
* Fix solution names not being applied
* Fix WoolyComponent including statement
* Fix merge skew
* Fix compile errors
* Make reactions use solntities
* Reindent solution class namespace
* Field attribute changes
* AutoGenerateComponentState for SolutionContainerComponent
* SolutionContainerComponent -> ContainedSolutionComponent
* ref ReactionAttemptEvent
* Denetwork preinit solutions
* Misc 1
* Nullable TryGetSolution out vars
* Cache associated solutions
* Fix merge skew
* Use explicit regions in SharedSolutionContainerSystem.Capabilities
* Add debug assert
* Use explicit regions in SharedSolutionContainerSystem.Relay + ref SolutionContainerChangedEvent
* ContainedSolutionComponent.Name -> ContainedSolutionComponent.ContainerName
* SolutionComponent doc comments
* Implicit DataField names and property purge
* ReagentEffect DataField names
* Local variables for readability
* Sort using statements + Entity<T> event handlers
* Fix compile erros
* Fix compile errors
---------
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2023-12-28 17:58:14 -08:00
themias
9cc4a50692
Add more DNA interactions ( #21989 )
...
* Add more DNA interactions
* remove unused import
* update based on feedback
* Add event for chemistrysystem.injector
* move event to shared; transfer dna to implanter
* doafter and interaction event fixes
* add BreakOnHandChange
* doh
* use events instead of updating component directly
* Add DataFields to ForensicScannerComponent fields
* Convert most events to system api call
2023-12-15 02:52:55 -07:00
metalgearsloth
269c93245d
Unrevert audio ( #21330 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-11-27 22:12:34 +11:00
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
TemporalOroboros
0775ab6a14
Moves SolutionContainerManagerComponent to Shared. ( #20944 )
2023-10-15 03:45:28 +11:00
Slava0135
c4f3f5177a
Fix thirst ( #20472 )
...
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-09-24 12:50:41 -07:00
PrPleGoo
1a13884961
Task/food hud ( #19312 )
...
* security HUD now shows a job icon on entities with a body
* thirst goggles
* set starting hud gear
* fix build
* remove from starting gear
* remove
* replace
* fix thirst and hunger icons
* update icons
* space
* space
* ]
* ]
* fix build
* fix comments
* fix
* spacing
* field
* move more namespaces
* use AutoGenerateComponentState
* comments
* fix build
* not all fields
* comments
* unpaused
* fix Dirty warning
---------
Co-authored-by: Slava0135 <super.novalskiy_0135@inbox.ru>
2023-09-23 16:14:06 +03:00
Visne
ee4809a222
Revert "Hunger and thirst HUDs" ( #18125 )
2023-07-18 17:28:28 +02:00
PrPleGoo
67e4b626c1
Hunger and thirst HUDs ( #18066 )
...
* security HUD now shows a job icon on entities with a body
* thirst goggles
* set starting hud gear
2023-07-18 00:01:22 -06:00
Arendian
7c26480b5f
Turns 90% of vomit into actual vomit ( #17697 )
...
* Changes vomit reagent composition
* Formatting
2023-06-27 20:08:57 -06:00
metalgearsloth
35ef9787e5
Fix vomit puddles ( #16449 )
2023-05-16 13:26:12 +10:00
metalgearsloth
317a4013eb
Puddles & spreader refactor ( #15191 )
2023-04-10 15:37:03 +10:00
Nemanja
0f0b534239
Hunger ECS ( #14939 )
2023-04-03 12:42:30 +10:00
faint
8b6996cbae
DNA basics ( #14724 )
...
* DNA component
* Commit numba 2
* Added DNA into Station Records Computer
* commit numba 3
* commit numba 4
* Vomit also contain DNA component now
* fixed DNA field not clearing after scanning another item
* commit numba 10
Drinking leaves DNA on an object. Breaking glasses, bottles and beakers leave DNA and leave fingerprints/fibers with 40% chance on glass shards. + lotta fixes
* 11
* 12
* 14
* Added DNA guide entry
* FIX
2023-03-30 22:49:25 -06:00
Visne
c6d3e4f3bd
Fix warnings and code cleanup/fixes ( #13570 )
2023-01-19 13:56:45 +11:00
Leon Friedrich
881a2b2ece
PopupSystem public methods rejig ( #12830 )
2022-12-19 08:41:47 +11:00
T-Stalker
43b529f647
replaces the puking sound with just splat ( #12433 )
2022-11-08 14:33:06 -06:00
DrSmugleaf
f323fb7644
ECS and cleanup body system, merge body templates and presets into body prototypes ( #11991 )
...
Co-authored-by: Jezithyr <Jezithyr@gmail.com>
2022-10-22 15:46:28 -07:00
Leon Friedrich
e17c89eac4
Identity popup fixes ( #9743 )
2022-07-15 01:10:52 -07:00
keronshb
f7b1bda3e5
Reorders Sound Systems signatures to match Popup Systems. ( #8728 )
2022-06-13 09:45:47 +10:00
Rane
b210df0d03
Port vomit from Nyano ( #8349 )
2022-05-23 16:03:27 -07:00
