Arthur 2587c1c71c Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml		2022-04-17 04:50:19 +03:00
..
Commands	Fixes Holoparasites killing their hosts when suiciding. (#7465)	2022-04-07 23:37:39 -05:00
Managers	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-04-17 04:50:19 +03:00
ChatSystem.cs	Another chat system sanitization fix (#7384)	2022-04-02 14:09:54 +11:00