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

..

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

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

cult

Update talisman.dm

2017-12-30 13:32:02 -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

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -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-33829

2018-01-02 05:16:13 -06:00

nuclear

Replace explicit z-level checks with defines

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

revolution

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -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

Undoes Borer HUDs

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

antag_spawner.dm

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06: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

Replace explicit z-level checks with defines

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