Commit Graph

8 Commits

Author SHA1 Message Date
DeltaFire 4ccf40f775 Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
This reverts commit 27a099c6bf.
2020-10-11 00:53:18 +02:00
DeltaFire 27a099c6bf Revert "Merge branch 'master' into robotic-limbs-PT2"
This reverts commit 73b5267425, reversing
changes made to 2e780bfff2.
2020-10-11 00:51:39 +02:00
timothyteakettle 203246ece7 FUCK 2020-10-01 23:40:57 +01:00
silicons 06f5ce6401 buffs shoving (#12925)
* ^w^

* ok

* ok
2020-08-02 18:30:09 +02:00
kevinz000 e4eb49050c Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-24 15:03:06 -07:00
Ghom 95249a4d79 Fixing some issues with floating movetype & co. (#12262) 2020-05-18 04:44:19 -07:00
kevinz000 532aba9157 fixes 2020-05-07 08:36:15 -07:00
Ghommie 63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00