kevinz000 335b6cde56 Merge branch 'master' into upstream-merge-26813

2017-05-07 22:31:16 -07:00

..

effects

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813

2017-05-07 22:28:00 -07:00

items

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813

2017-05-07 22:28:00 -07:00

structures

Merge branch 'master' into upstream-merge-26813

2017-05-07 22:31:16 -07:00

buckling.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

empulse.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

explosion.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

items.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

obj_defense.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

objs.dm

Initialize Refactor

2017-04-26 16:03:17 -05:00

radiation.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

structures.dm

/tg/ 4/14 (#367)

2017-04-14 23:28:04 -05:00

weapons.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00