LetterJay 057350d7dc Merge pull request #7220 from Citadel-Station-13/upstream-merge-38093 ...

[MIRROR] Fixes and adds blast cannons to traitor science uplink items

2018-06-24 15:32:49 -05:00

..

effects

Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders

2018-06-16 15:50:27 -05:00

items

Merge pull request #7220 from Citadel-Station-13/upstream-merge-38093

2018-06-24 15:32:49 -05:00

structures

Merge pull request #7162 from Citadel-Station-13/upstream-merge-38539

2018-06-18 21:58:42 -05:00

buckling.dm

Merge pull request #37312 from DaxDupont/tendril

2018-04-20 10:47:28 -05:00

empulse.dm

…

items.dm

Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448

2018-05-24 11:58:57 -05:00

obj_defense.dm

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

objs.dm

Fixes AI's being unable to call shuttle using comm console. (#38534)

2018-06-20 19:39:17 -05:00

structures.dm

things with stuff (#6233)

2018-04-07 23:07:09 -04:00