Merge pull request #13063 from silicons/supermatter

Ports /tg/ supermatter - no more infinite stunlock death on charge inertia delaminations
2025-12-09 16:07:40 +00:00 · 2020-08-17 03:13:14 -07:00
parent d285e9f005 fd9e3f5079
commit 23b4ba3714
80 changed files with 781 additions and 313 deletions
--- a/sound/machines/sm/accent/delam/1.ogg
+++ b/sound/machines/sm/accent/delam/1.ogg
--- a/sound/machines/sm/accent/delam/10.ogg
+++ b/sound/machines/sm/accent/delam/10.ogg
--- a/sound/machines/sm/accent/delam/11.ogg
+++ b/sound/machines/sm/accent/delam/11.ogg
--- a/sound/machines/sm/accent/delam/12.ogg
+++ b/sound/machines/sm/accent/delam/12.ogg
--- a/sound/machines/sm/accent/delam/13.ogg
+++ b/sound/machines/sm/accent/delam/13.ogg
--- a/sound/machines/sm/accent/delam/14.ogg
+++ b/sound/machines/sm/accent/delam/14.ogg
--- a/sound/machines/sm/accent/delam/15.ogg
+++ b/sound/machines/sm/accent/delam/15.ogg
--- a/sound/machines/sm/accent/delam/16.ogg
+++ b/sound/machines/sm/accent/delam/16.ogg
--- a/sound/machines/sm/accent/delam/17.ogg
+++ b/sound/machines/sm/accent/delam/17.ogg
--- a/sound/machines/sm/accent/delam/18.ogg
+++ b/sound/machines/sm/accent/delam/18.ogg
--- a/sound/machines/sm/accent/delam/19.ogg
+++ b/sound/machines/sm/accent/delam/19.ogg
--- a/sound/machines/sm/accent/delam/2.ogg
+++ b/sound/machines/sm/accent/delam/2.ogg
--- a/sound/machines/sm/accent/delam/20.ogg
+++ b/sound/machines/sm/accent/delam/20.ogg
--- a/sound/machines/sm/accent/delam/21.ogg
+++ b/sound/machines/sm/accent/delam/21.ogg
--- a/sound/machines/sm/accent/delam/22.ogg
+++ b/sound/machines/sm/accent/delam/22.ogg
--- a/sound/machines/sm/accent/delam/23.ogg
+++ b/sound/machines/sm/accent/delam/23.ogg
--- a/sound/machines/sm/accent/delam/24.ogg
+++ b/sound/machines/sm/accent/delam/24.ogg
--- a/sound/machines/sm/accent/delam/25.ogg
+++ b/sound/machines/sm/accent/delam/25.ogg
--- a/sound/machines/sm/accent/delam/26.ogg
+++ b/sound/machines/sm/accent/delam/26.ogg
--- a/sound/machines/sm/accent/delam/27.ogg
+++ b/sound/machines/sm/accent/delam/27.ogg
--- a/sound/machines/sm/accent/delam/28.ogg
+++ b/sound/machines/sm/accent/delam/28.ogg
--- a/sound/machines/sm/accent/delam/29.ogg
+++ b/sound/machines/sm/accent/delam/29.ogg
--- a/sound/machines/sm/accent/delam/3.ogg
+++ b/sound/machines/sm/accent/delam/3.ogg
--- a/sound/machines/sm/accent/delam/30.ogg
+++ b/sound/machines/sm/accent/delam/30.ogg
--- a/sound/machines/sm/accent/delam/31.ogg
+++ b/sound/machines/sm/accent/delam/31.ogg
--- a/sound/machines/sm/accent/delam/32.ogg
+++ b/sound/machines/sm/accent/delam/32.ogg
--- a/sound/machines/sm/accent/delam/33.ogg
+++ b/sound/machines/sm/accent/delam/33.ogg
--- a/sound/machines/sm/accent/delam/4.ogg
+++ b/sound/machines/sm/accent/delam/4.ogg
--- a/sound/machines/sm/accent/delam/5.ogg
+++ b/sound/machines/sm/accent/delam/5.ogg
--- a/sound/machines/sm/accent/delam/6.ogg
+++ b/sound/machines/sm/accent/delam/6.ogg
--- a/sound/machines/sm/accent/delam/7.ogg
+++ b/sound/machines/sm/accent/delam/7.ogg
--- a/sound/machines/sm/accent/delam/8.ogg
+++ b/sound/machines/sm/accent/delam/8.ogg
--- a/sound/machines/sm/accent/delam/9.ogg
+++ b/sound/machines/sm/accent/delam/9.ogg
--- a/sound/machines/sm/accent/normal/1.ogg
+++ b/sound/machines/sm/accent/normal/1.ogg
--- a/sound/machines/sm/accent/normal/10.ogg
+++ b/sound/machines/sm/accent/normal/10.ogg
--- a/sound/machines/sm/accent/normal/11.ogg
+++ b/sound/machines/sm/accent/normal/11.ogg
--- a/sound/machines/sm/accent/normal/12.ogg
+++ b/sound/machines/sm/accent/normal/12.ogg
--- a/sound/machines/sm/accent/normal/13.ogg
+++ b/sound/machines/sm/accent/normal/13.ogg
--- a/sound/machines/sm/accent/normal/14.ogg
+++ b/sound/machines/sm/accent/normal/14.ogg
--- a/sound/machines/sm/accent/normal/15.ogg
+++ b/sound/machines/sm/accent/normal/15.ogg
--- a/sound/machines/sm/accent/normal/16.ogg
+++ b/sound/machines/sm/accent/normal/16.ogg
--- a/sound/machines/sm/accent/normal/17.ogg
+++ b/sound/machines/sm/accent/normal/17.ogg
--- a/sound/machines/sm/accent/normal/18.ogg
+++ b/sound/machines/sm/accent/normal/18.ogg
--- a/sound/machines/sm/accent/normal/19.ogg
+++ b/sound/machines/sm/accent/normal/19.ogg
--- a/sound/machines/sm/accent/normal/2.ogg
+++ b/sound/machines/sm/accent/normal/2.ogg
--- a/sound/machines/sm/accent/normal/20.ogg
+++ b/sound/machines/sm/accent/normal/20.ogg
--- a/sound/machines/sm/accent/normal/21.ogg
+++ b/sound/machines/sm/accent/normal/21.ogg
--- a/sound/machines/sm/accent/normal/22.ogg
+++ b/sound/machines/sm/accent/normal/22.ogg
--- a/sound/machines/sm/accent/normal/23.ogg
+++ b/sound/machines/sm/accent/normal/23.ogg
--- a/sound/machines/sm/accent/normal/24.ogg
+++ b/sound/machines/sm/accent/normal/24.ogg
--- a/sound/machines/sm/accent/normal/25.ogg
+++ b/sound/machines/sm/accent/normal/25.ogg
--- a/sound/machines/sm/accent/normal/26.ogg
+++ b/sound/machines/sm/accent/normal/26.ogg
--- a/sound/machines/sm/accent/normal/27.ogg
+++ b/sound/machines/sm/accent/normal/27.ogg
--- a/sound/machines/sm/accent/normal/28.ogg
+++ b/sound/machines/sm/accent/normal/28.ogg
--- a/sound/machines/sm/accent/normal/29.ogg
+++ b/sound/machines/sm/accent/normal/29.ogg
--- a/sound/machines/sm/accent/normal/3.ogg
+++ b/sound/machines/sm/accent/normal/3.ogg
--- a/sound/machines/sm/accent/normal/30.ogg
+++ b/sound/machines/sm/accent/normal/30.ogg
--- a/sound/machines/sm/accent/normal/31.ogg
+++ b/sound/machines/sm/accent/normal/31.ogg
--- a/sound/machines/sm/accent/normal/32.ogg
+++ b/sound/machines/sm/accent/normal/32.ogg
--- a/sound/machines/sm/accent/normal/33.ogg
+++ b/sound/machines/sm/accent/normal/33.ogg
--- a/sound/machines/sm/accent/normal/4.ogg
+++ b/sound/machines/sm/accent/normal/4.ogg
--- a/sound/machines/sm/accent/normal/5.ogg
+++ b/sound/machines/sm/accent/normal/5.ogg
--- a/sound/machines/sm/accent/normal/6.ogg
+++ b/sound/machines/sm/accent/normal/6.ogg
--- a/sound/machines/sm/accent/normal/7.ogg
+++ b/sound/machines/sm/accent/normal/7.ogg
--- a/sound/machines/sm/accent/normal/8.ogg
+++ b/sound/machines/sm/accent/normal/8.ogg
--- a/sound/machines/sm/accent/normal/9.ogg
+++ b/sound/machines/sm/accent/normal/9.ogg
--- a/sound/machines/sm/loops/calm.ogg
+++ b/sound/machines/sm/loops/calm.ogg
--- a/sound/machines/sm/loops/delamming.ogg
+++ b/sound/machines/sm/loops/delamming.ogg
--- a/sound/machines/sm/supermatter1.ogg
+++ b/sound/machines/sm/supermatter1.ogg
--- a/sound/machines/sm/supermatter2.ogg
+++ b/sound/machines/sm/supermatter2.ogg
--- a/sound/machines/sm/supermatter3.ogg
+++ b/sound/machines/sm/supermatter3.ogg