PsiOmega 709840f848 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/admin/DB ban/functions.dm

2015-09-26 08:48:37 +02:00

..

alien

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2015-09-07 11:03:41 +09:30

mutiny

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

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

outsider

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

2015-09-26 08:48:37 +02:00

station

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

2015-09-26 08:48:37 +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

Adds missing </font>

2015-09-07 08:18:53 +02: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_factions.dm

Antag system cleanup/fixes.

2015-09-04 18:28:05 +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

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-17 13:05:58 +02:00

antagonist_panel.dm

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

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

antagonist_place.dm

Antag system cleanup/fixes.

2015-09-04 18:28:05 +09:30

antagonist_print.dm

Correctly intends a world-message.

2015-09-10 08:05:35 +02:00

antagonist_update.dm

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev

2015-09-07 11:31:19 +09:30

antagonist.dm

Refactored the antagHUD to work better with the new antagonist system.

2015-09-05 18:51:17 +09:30