LetterJay 97a321bc82 Merge pull request #4414 from Citadel-Station-13/upstream-merge-33553 ...

[MIRROR] Rebalances Marauder shields

2017-12-18 15:21:07 -06:00

..

area

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

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

gamemodes

Merge pull request #4414 from Citadel-Station-13/upstream-merge-33553

2017-12-18 15:21:07 -06:00

machinery

Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519

2017-12-17 20:28:07 -06:00

mecha

Merge pull request #4399 from Citadel-Station-13/upstream-merge-33542

2017-12-18 15:19:13 -06:00

objects

Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181

2017-12-17 21:26:08 -06:00

turfs

Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519

2017-12-17 20:28:07 -06:00

alternate_appearance.dm

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

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

atoms_movable.dm

Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519

2017-12-17 20:28:07 -06:00

atoms.dm

Removes bad comment. Makes check saner (#33270)

2017-12-05 15:50:08 -06:00

communications.dm

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

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

data_huds.dm

Added bot path data huds

2017-11-28 06:28:40 -06:00

say.dm

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

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

shuttle_engines.dm

…

skincmd.dm

…

sound.dm

Adds new gun dry firing sounds (#33503)

2017-12-14 06:15:11 -06:00

world.dm

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

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