LetterJay dae3c3efb5 Merge branch 'master' into upstream-merge-33621

2017-12-30 13:23:39 -06:00

..

area

Made atoms not smooth with shuttles (#33807)

2017-12-29 00:29:04 -06:00

gamemodes

Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705

2017-12-30 13:19:00 -06:00

machinery

Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705

2017-12-30 13:19:00 -06:00

mecha

turns the baseturf var into a part time list (#33705)

2017-12-25 19:11:06 -06:00

objects

Merge branch 'master' into upstream-merge-33621

2017-12-30 13:23:39 -06:00

turfs

Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705

2017-12-30 13:19:00 -06:00

alternate_appearance.dm

Fixed empty HUD_List breaking alternate_appearances (#33742)

2017-12-23 01:46:50 -06:00

atoms_movable.dm

Merge pull request #33306 from coiax/replace-clean-flag-with-component

2017-12-23 08:36:37 -06:00

atoms.dm

[READY]Refactors reagent container types

2017-12-18 22:54:51 -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

[Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209)

2017-12-18 20:29:37 -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

Gun sounds (#33615)

2017-12-18 15:15:25 -06:00

world.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783

2017-12-29 01:34:17 -06:00