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

..

DB ban

…

permissionverbs

…

verbs

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

2014-11-19 23:17:48 +10:30

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

small sanity check.

2014-11-17 02:28:20 -08:00

admin_report.dm

…

admin_verbs.dm

Admin event panel taking shape.

2014-11-05 17:19:04 +01:00

admin.dm

Merge resolution, compile fixes with outdated glass paths/map.

2014-11-19 23:17:25 +10:30

banjob.dm

…

create_mob.dm

…

create_object.dm

Larger job and preferences windows but still lesser than 764. More choices in "Quick Create Object" menu.

2014-05-04 18:11:11 +04:00

create_turf.dm

…

holder2.dm

…

IsBanned.dm

modularize ban system

2014-07-18 21:08:01 +00:00

NewBan.dm

…

newbanjob.dm

…

player_notes.dm

…

player_panel.dm

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

topic.dm

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

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

ToRban.dm

…