Jordan Brown cb3506f319 Merge pull request #34160 from ShizCalev/cult-blade-drop ...

Fixes non-cultist hulks being able to hold cult bbs

2018-01-10 03:13:02 -06:00

..

blob

Merge branch 'master' into mapsyncs43293845982

2018-01-08 06:18:11 +00:00

brother

Merge pull request #34060 from AnturK/brotherfix

2018-01-04 15:17:56 -06:00

changeling

initial commit - game folder + maps + dme

2018-01-03 22:52:38 -05:00

clock_cult

Merge pull request #4717 from Citadel-Station-13/upstream-merge-33768

2018-01-08 20:04:08 +00:00

cult

Merge pull request #34160 from ShizCalev/cult-blade-drop

2018-01-10 03:13:02 -06:00

devil

Merge branch 'master' into upstream-merge-34105

2018-01-08 20:03:41 +00:00

extended

[MIRROR] Refactors roundstart centcom threat report. (#2739)

2017-09-13 22:50:01 -05:00

gang

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

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

malfunction

initial commit - game folder + maps + dme

2018-01-03 22:52:38 -05:00

meteor

initial commit - game folder + maps + dme

2018-01-03 22:52:38 -05:00

miniantags

initial commit - game folder + maps + dme

2018-01-03 22:52:38 -05:00

nuclear

Merge branch 'master' into mapsyncs43293845982

2018-01-05 02:44:52 +00:00

revolution

Replace explicit z-level checks with defines

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

sandbox

initial commit - game folder + maps + dme

2018-01-03 22:52:38 -05:00

traitor

Update traitor.dm

2017-12-19 15:35:45 -06:00

wizard

Merge branch 'master' into mapsyncs43293845982

2018-01-08 06:18:11 +00:00

antag_hud.dm

initial commit - game folder + maps + dme

2018-01-03 22:52:38 -05:00

antag_spawner_cit.dm

Undoes Borer HUDs

2017-10-26 21:19:34 +02:00

antag_spawner.dm

initial commit - game folder + maps + dme

2018-01-03 22:52:38 -05:00

antag_team.dm

antag team

2017-12-20 13:24:06 -06:00

cit_objectives.dm

…

events.dm

Replace explicit z-level checks with defines

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

game_mode.dm

a lot of shit synced in this one commit.

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

intercept_report.dm

…

objective_items.dm

Minor refactor of how gas IDs are handled

2017-10-12 00:30:09 -05:00

objective_team.dm

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

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

objective.dm

initial commit - game folder + maps + dme

2018-01-03 22:52:38 -05:00