LetterJay 3f24f033e5 Merge pull request #1106 from Citadel-Station-13/upstream-merge-27485 ...

[MIRROR] Prevents wizard from gaining infinite skeletons with a 3-use Necrostone

2017-05-22 17:26:09 -05:00

..

blob

Merge branch 'master' into upstream-merge-27160

2017-05-22 16:29:43 -05:00

changeling

[MIRROR] Adds some antag alerts (#926)

2017-05-18 11:27:52 -05:00

clock_cult

Merge branch 'master' into upstream-merge-27344

2017-05-20 23:26:28 -05:00

cult

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

2017-05-22 11:52:18 -05:00

devil

Two more types of Legion and makes environment_smash levels into defines

2017-05-21 02:52:23 -05:00

extended

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

gang

rej cleanup/commit

2017-05-22 16:59:39 -05:00

malfunction

Changes some << to to_chat

2017-04-28 06:14:47 -05:00

meteor

Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual

2017-05-18 16:38:09 -05:00

miniantags

Merge branch 'master' into upstream-merge-27160

2017-05-22 16:29:43 -05:00

nuclear

World.dm Refactor

2017-05-18 16:37:46 -05:00

revolution

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

sandbox

/tg/ 4/14 (#367)

2017-04-14 23:28:04 -05:00

traitor

[MIRROR] Adds some antag alerts (#926)

2017-05-18 11:27:52 -05:00

wizard

Merge pull request #1106 from Citadel-Station-13/upstream-merge-27485

2017-05-22 17:26:09 -05:00

antag_hud.dm

Changed alternate appearances to /datum/atom_hud s

2017-04-23 13:26:08 -05:00

antag_spawner_cit.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

antag_spawner.dm

[MIRROR] Fixes syndicate borg spawner (#1072)

2017-05-21 18:30:28 -07:00

events.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

factions.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

game_mode.dm

Merge pull request #807 from Citadel-Station-13/upstream-merge-26631

2017-05-16 17:13:30 -04:00

intercept_report.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

objective_items.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

objective.dm

Internal affairs upgrades [READY]

2017-05-06 10:16:24 -05:00