Mloc-Hibernia a2dc7b827b Merge remote-tracking branch 'upstream/pr/5689' into dev ...

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

Conflicts:
	code/game/machinery/computer/crew.dm

2014-07-26 14:25:24 +00:00

..

DB ban

…

permissionverbs

…

verbs

Merge resolution with PDA nanoui.

2014-07-25 22:57:53 +09:30

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

…

admin_report.dm

…

admin_verbs.dm

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

2014-07-23 21:58:13 +01:00

admin.dm

Mentors will no longer see highlighed names in ahelps / msay for players with special roles (Antags, etc.).

2014-07-07 21:37:28 -05:00

banjob.dm

…

create_mob.dm

…

create_object.dm

…

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

long_jump() now uses an arrive_time var instead of sleeping the whole time.

2014-06-30 15:14:20 -04:00

topic.dm

Slime update

2014-07-13 17:37:30 +04:00

ToRban.dm

…