Mloc-Argent dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm

2014-06-20 22:02:40 +01:00

..

DB ban

…

permissionverbs

…

verbs

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

2014-06-20 22:02:40 +01:00

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

Adds Mentors.

2014-05-04 23:12:06 -05:00

admin_report.dm

…

admin_verbs.dm

Mentor permissions fixes and such.

2014-06-10 19:48:41 -05:00

admin.dm

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

2014-06-12 18:56:26 +01:00

banjob.dm

*NIX Log files part 2.

2014-03-26 18:51:37 -05:00

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

*NIX Log files part 2.

2014-03-26 18:51:37 -05:00

NewBan.dm

…

newbanjob.dm

…

player_notes.dm

You can now request player notes through IRC bots.

2014-05-02 08:16:47 -05:00

player_panel.dm

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

2014-06-12 18:56:26 +01:00

topic.dm

Merged master to dev, manually fixed merge issues in map, may be some left.

2014-06-11 18:11:41 +09:30

ToRban.dm

*NIX Log files part 2.

2014-03-26 18:51:37 -05:00