LetterJay b57a4aa6b4 Merge branch 'master' into upstream-merge-26386

2017-05-01 15:27:25 -05:00

..

uplink_item_cit.dm

April sync (#360)

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

uplink_item.dm

Changes the naming of an ammo to make it more distinct

2017-04-27 09:17:40 -05:00

uplink.dm

New() goes in the trash, we've gotta Initialize()

2017-04-26 17:15:48 -05:00