mwerezak 348c9d19f7 Merge remote-tracking branch 'upstream/dev' into faxmachine ...

Conflicts:
	code/WorkInProgress/kilakk/fax.dm
	code/modules/paperwork/faxmachine.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paper_bundle.dm
	code/modules/paperwork/photocopier.dm
	maps/tgstation2.dmm

2014-11-20 14:57:35 -05:00

..

directives

Fixes #6613 and #6492

2014-10-08 23:10:12 +10:30

auth_key.dm

…

directive.dm

Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel.

2014-06-03 21:26:34 -05:00

emergency_authentication_device.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

key_pinpointer.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

mutiny_admin.dm

Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel.

2014-06-03 21:26:34 -05:00

mutiny_fluff.dm

Adds photocopier based faxmachine, removes redundant photocopier vars

2014-10-15 21:07:57 -04:00

mutiny_hooks.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

mutiny.dm

PDA newscaster

2014-10-28 17:10:35 +01:00