fish-station/Content.Shared/Damage
Vigers Ray 99a2aa9c4d Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
#	Resources/Prototypes/ai_factions.yml
#	Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/meta.json
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
2025-02-14 00:55:00 +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 Added localization of groups and types: damage, metabolism (#27368) 2024-04-28 14:48:19 +10:00
Systems Merge remote-tracking branch 'space-wizards/master' 2025-02-14 00:55:00 +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