deathride58 57d8457108 Merge pull request #4705 from Citadel-Station-13/upstream-merge-33645 ...

[MIRROR] Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog

2018-01-08 04:15:47 +00:00

..

area

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

gamemodes

Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog (#33645)

2018-01-07 20:18:28 -06:00

machinery

Merge pull request #4705 from Citadel-Station-13/upstream-merge-33645

2018-01-08 04:15:47 +00:00

mecha

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

2018-01-01 14:09:07 -06:00

objects

Merge pull request #4704 from Citadel-Station-13/upstream-merge-34128

2018-01-08 04:15:12 +00:00

turfs

Merge pull request #4601 from Citadel-Station-13/upstream-merge-33919

2018-01-02 18:13:42 -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 branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-01 14:09:07 -06:00

atoms.dm

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

2018-01-01 14:09:07 -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