LetterJay 943388d8f4 Merge pull request #4367 from Citadel-Station-13/upstream-merge-33463 ...

[MIRROR] Adds blob roundend report.

2018-01-02 14:56:12 -06:00

..

blob

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

2018-01-01 04:36:29 -06:00

brother

a lot of shit synced in this one commit.

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

changeling

Last resort now requires a confirmation. (#33947)

2017-12-31 02:24:53 -06:00

clock_cult

Merge pull request #33580 from Xhuis/defenses_balancing

2017-12-30 16:59:07 -06:00

cult

save point - a lot of shit to fix

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

devil

[READY]Component Forensics and Item Blood OverlayS!

2017-12-27 15:19:14 -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

Update borer_event.dm

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

[READY]Component Forensics and Item Blood OverlayS!

2017-12-27 15:19:14 -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

…

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

…

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