phil235 dd7a3b7fbc Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix ...

Conflicts:
	code/modules/admin/admin_verbs.dm

2014-10-05 13:48:11 +02:00

..

DB ban

Merge pull request #4900 from MrStonedOne/erroageinjudgement

2014-09-26 23:41:37 +01:00

permissionverbs

Removed database specifications since this is handled by connecting to a database context.

2014-09-21 05:26:58 -07:00

verbs

Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix

2014-10-05 13:48:11 +02:00

admin_investigate.dm

Added admin logging for the gravity generator.

2014-03-25 10:12:33 +00:00

admin_memo.dm

fix

2014-09-26 22:48:23 -06:00

admin_ranks.dm

Fixes some erros in the database system

2014-09-19 13:37:58 -07:00

admin_verbs.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix

2014-10-05 13:48:11 +02:00

admin.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix

2014-10-05 13:48:11 +02:00

banappearance.dm

Fixes some erros in the database system

2014-09-19 13:37:58 -07:00

banjob.dm

Fixes some erros in the database system

2014-09-19 13:37:58 -07:00

create_mob.dm

Spawned humans have DNA, strip panel is better

2014-07-05 22:47:50 -04:00

create_object.dm

Fixes issue #2489

2014-05-01 06:01:14 -03:00

create_turf.dm

…

holder2.dm

…

IsBanned.dm

Fixes some erros in the database system

2014-09-19 13:37:58 -07:00

NewBan.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

newbanjob.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

player_notes.dm

…

player_panel.dm

Resolved conflicts and added my yml changelog file

2014-09-19 09:30:59 -06:00

topic.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix

2014-10-05 13:48:11 +02:00