SoundScopes 4090f46636 Merge branch 'master' into development ...

Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/supermatter/supermatter.dm

2014-11-06 01:25:13 +00:00

..

DB ban

Initial Commit

2014-03-11 09:03:52 +02:00

permissionverbs

Initial Commit

2014-03-11 09:03:52 +02:00

verbs

Bay Merge 05NOV2014

2014-11-05 23:58:05 +02:00

admin_investigate.dm

Initial Commit

2014-03-11 09:03:52 +02:00

admin_memo.dm

Initial Commit

2014-03-11 09:03:52 +02:00

admin_ranks.dm

Baystation Update Merge 01

2014-04-16 23:54:43 +03:00

admin_report.dm

Initial Commit

2014-03-11 09:03:52 +02:00

admin_verbs.dm

Muting staff

2014-10-31 17:12:38 +00:00

admin.dm

Muting staff

2014-10-31 17:12:38 +00:00

banjob.dm

Baystation Update Merge 01

2014-04-16 23:54:43 +03:00

create_mob.dm

Initial Commit

2014-03-11 09:03:52 +02:00

create_object.dm

Bay Update 02

2014-06-04 18:20:49 +03:00

create_turf.dm

Initial Commit

2014-03-11 09:03:52 +02:00

holder2.dm

Initial Commit

2014-03-11 09:03:52 +02:00

IsBanned.dm

Actually

2014-11-04 19:19:04 +00:00

NewBan.dm

Initial Commit

2014-03-11 09:03:52 +02:00

newbanjob.dm

Initial Commit

2014-03-11 09:03:52 +02:00

player_notes.dm

Bay Update 02

2014-06-04 18:20:49 +03:00

player_panel.dm

Merge branch 'master' into development

2014-11-06 01:25:13 +00:00

topic.dm

Merge branch 'master' into development

2014-11-06 01:25:13 +00:00

ToRban.dm

Baystation Update Merge 01

2014-04-16 23:54:43 +03:00