LetterJay 290c1e0868 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916

2017-12-26 08:24:20 -06:00

..

blob

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

brother

a lot of shit synced in this one commit.

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

changeling

Merge branch 'master' into upstream-merge-33055

2017-12-25 04:10:34 -06:00

clock_cult

Merge pull request #4472 from Citadel-Station-13/upstream-merge-33634

2017-12-26 05:29:42 -06:00

cult

Merge branch 'master' into upstream-merge-33055

2017-12-25 04:10:34 -06:00

devil

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

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

extended

…

gang

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

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

malfunction

Merge pull request #33784 from octareenroon91/patch-56

2017-12-23 08:31:23 -06:00

meteor

Merge branch 'master' into upstream-merge-33246

2017-12-20 00:27:06 -06:00

miniantags

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

2017-12-26 08:24:20 -06:00

nuclear

a lot of shit synced in this one commit.

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

revolution

a lot of shit synced in this one commit.

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

sandbox

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

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

traitor

Update traitor.dm

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

wizard

a lot of shit synced in this one commit.

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

antag_hud.dm

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

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

antag_spawner_cit.dm

Undoes Borer HUDs

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

antag_spawner.dm

a lot of shit synced in this one commit.

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

antag_team.dm

antag team

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

cit_objectives.dm

…

events.dm

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05: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

…

objective_team.dm

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

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

objective.dm

Merge pull request #33801 from AutomaticFrenzy/patch/download

2017-12-24 15:02:57 -06:00