Commit Graph

15 Commits

Author SHA1 Message Date
Jordan Brown d0c648b702 Merge pull request #34897 from YPOQ/orbitfix
Fixes orbiting stopping when entering disposals
2018-01-26 03:00:16 -06:00
LetterJay f4a817be01 Merge pull request #5049 from Citadel-Station-13/upstream-merge-34820
[MIRROR] Fixes disposal initialization
2018-01-23 10:00:33 -06:00
AnturK f70c357111 Fixes disposal initialization (#34820) 2018-01-23 06:46:45 -06:00
AnturK eb7974df7d Simple rotation component. (#34476)
I'm going to port other rotations to it when i don't feel lazy.
Closes #34064
2018-01-23 02:09:16 -06:00
deathride58 aabbbb9dff aaaand the rest of the modules folder 2018-01-04 01:45:38 -05:00
LetterJay 408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
Emmett Gaines f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
vuonojenmustaturska fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
deathride58 1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
ACCount 0fa731cec0 Fixes two refactor-caused bugs in disposals (#32892) 2017-11-20 02:47:35 -06:00
deathride58 fb62491701 manual map syncs + manual missed pr mirrors 2017-11-17 21:34:49 -05:00
Jordie b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
ACCount 500307b034 Disposal pipes and pipe dispensers refactor 2017-11-12 00:31:00 -06:00