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

# Conflicts:
#	code/game/gamemodes/blob/overmind.dm

2018-01-02 14:58:09 -06:00

..

abductor.dm

a lot of shit synced in this one commit.

2017-12-20 02:53:51 -06:00

antag_datum.dm

a lot of shit synced in this one commit.

2017-12-20 02:53:51 -06:00

blob.dm

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

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

brother.dm

a lot of shit synced in this one commit.

2017-12-20 02:53:51 -06:00

changeling.dm

save point - a lot of shit to fix

2017-12-27 07:03:40 -06:00

clockcult.dm

a lot of shit synced in this one commit.

2017-12-20 02:53:51 -06:00

cult.dm

Replace explicit z-level checks with defines

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

datum_iaa.dm

another huge sync

2017-06-21 18:00:00 -05:00

datum_traitor.dm

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

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

devil.dm

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

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

internal_affairs.dm

Cleans up datum traitor minimally. (#31978)

2017-10-22 17:44:55 -05:00

monkey.dm

Monkeymode fixes (#33796)

2017-12-29 10:08:17 -06:00

ninja.dm

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

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

nukeop.dm

Replace explicit z-level checks with defines

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

pirate.dm

a lot of shit synced in this one commit.

2017-12-20 02:53:51 -06:00

revolution.dm

a lot of shit synced in this one commit.

2017-12-20 02:53:51 -06:00

wizard.dm

a lot of shit synced in this one commit.

2017-12-20 02:53:51 -06:00