PsiOmegaDelta 9057655da6 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/clothing/spacesuits/void/void.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/silicon/ai/ai.dm

2015-08-24 10:31:30 +02:00

..

alien

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

mutiny

code/game, excluding code/game/machinery and code/game/objects

2015-05-29 21:51:27 +01:00

outsider

Merge pull request #9891 from Zuhayr/dev

2015-08-21 14:23:57 -04:00

station

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-24 10:23:12 +02:00

_antagonist_setup.dm

Removed the last few references to MODE, fixed some oversights with player_is_antag().

2015-07-14 05:19:00 +09:30

antagonist_add.dm

Fixes #10414

2015-08-03 12:03:08 -04:00

antagonist_create.dm

Makes it possible for syndicate borgs to copy access from other ids.

2015-08-20 13:49:53 +02:00

antagonist_equip.dm

Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465.

2015-06-21 18:08:26 +09:30

antagonist_helpers.dm

Fixes antag datum not respecting restricted_jobs depending on config

2015-08-17 21:00:22 -04:00

antagonist_objectives.dm

Fixes roundend failing to scroll, fixes teams not getting shared global objectives.

2015-08-14 00:18:41 +09:30

antagonist_panel.dm

Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465.

2015-06-21 18:08:26 +09:30

antagonist_place.dm

Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465.

2015-06-21 18:08:26 +09:30

antagonist_print.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-14 08:34:42 +02:00

antagonist_update.dm

Makes it possible for syndicate borgs to copy access from other ids.

2015-08-20 13:49:53 +02:00

antagonist.dm

Removes unncessary shuffle

2015-08-23 14:49:30 -04:00