Commit graph

5 commits

Author SHA1 Message Date
Vigers Ray
6020a6fd5b Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
#	Content.Server/Weapons/Ranged/Systems/GunSystem.cs
#	Content.Server/Zombies/ZombieSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Zombies/SharedZombieSystem.cs
#	Content.Shared/Zombies/ZombieComponent.cs
#	Resources/Locale/en-US/_strings/research/technologies.ftl
#	Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
#	Resources/Prototypes/Polymorphs/polymorph.yml
#	Resources/Prototypes/Recipes/Lathes/security.yml
#	Resources/Prototypes/Research/arsenal.yml
#	Resources/Prototypes/Research/experimental.yml
2025-04-17 00:07:59 +03:00
UpAndLeaves
1c7e6592e9
Zombification resistance rework (#36485)
* initial commit

* Commit cuz beck said so 👍

* Implement balance changes, and revert some stuff

* fix yaml test real

* Added full stop, ensured display of infection chance, buffed biosuit speed

* Maint reviews, I commit

* Review completed, winter coats nerfed, CMO bio suit removed for future PR

* Final-final commit-REAL (2)-COPY
2025-04-16 14:21:45 -04:00
Vigers Ray
842f1e677a
Бафф зомби (#249) 2024-07-27 13:20:14 +03:00
Tayrtahn
89a9f07c3a
Add a system for modifying entity names without causing conflicts (#27863) 2024-06-16 15:38:53 -04:00
Nemanja
47f312e90f
fix zombie mispredicts (#11043) 2022-09-07 11:59:27 +10:00