fish-station/Content.Shared/Damage
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
..
Components Wizard Staff of Animation (#34649) 2025-02-12 23:46:02 -05:00
Events Added Pain Numbness Trait (#34538) 2025-01-27 11:34:20 +01:00
ForceSay Added Pain Numbness Trait (#34538) 2025-01-27 11:34:20 +01:00
Prototypes Fix prototypes so they pass analyzer checks (#35435) 2025-02-24 15:21:59 +11:00
Systems Merge remote-tracking branch 'space-wizards/master' 2025-02-19 13:16:37 +03:00
DamageModifierSet.cs fix cauterization (#23264) 2024-01-01 00:08:25 -08:00
DamageSpecifier.cs Хирургия (#607) 2024-11-13 04:05:51 +03:00
DamageSpecifierDictionarySerializer.cs Add SaveLoadSavePrototype test (#18859) 2023-08-08 17:27:16 +10:00
DamageVisualizerKeys.cs Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00