LetterJay 3973b368de Merge branch 'master' into upstream-merge-33470

2017-12-21 03:24:03 -06:00

..

ballistic

Merge pull request #33664 from optimumtact/darkgenerallordhassnowflakeears

2017-12-20 00:14:28 -06:00

energy

[READY]Refactors reagent container types

2017-12-18 22:54:51 -06:00

magic

Defines math, take 2

2017-12-17 10:02:43 -06:00

misc

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

ballistic.dm

Merge pull request #33664 from optimumtact/darkgenerallordhassnowflakeears

2017-12-20 00:14:28 -06:00

beam_rifle.dm

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

energy.dm

Merge pull request #33664 from optimumtact/darkgenerallordhassnowflakeears

2017-12-20 00:14:28 -06:00

grenade_launcher.dm

Replaces a bunch of loc assignments with forcemoves and moves to nullspace

2017-12-13 13:56:57 -06:00

magic.dm

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

medbeam.dm

JSON feedback

2017-11-17 01:44:12 -06:00

mounted.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

syringe_gun.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00