Erthilo b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm

2013-08-31 17:45:31 +01:00

..

DB ban

- Added a small bit to the SQL statement so I can update the database structure later on, without it breaking the ban system until it updates.

2013-01-11 13:54:11 +00:00

permissionverbs

Removed the infra_sensor define for noddie.

2012-11-15 20:35:37 +00:00

verbs

Merge pull request #3609 from Zuhayr/dev

2013-08-28 10:40:58 -07:00

admin_investigate.dm

…

admin_memo.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

admin_ranks.dm

Return of Moderator II

2013-01-04 03:02:08 +04:00

admin_report.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

admin_verbs.dm

Revert "Experimentally readding Delete Book verb."

2013-08-21 09:10:21 +01:00

admin.dm

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

2013-08-31 17:45:31 +01:00

banjob.dm

- Moved access definitions for jobs to the job datum. In addition, I added an extra access definition: minimal_access and access. Minimal access is intended for servers with large populations. All jobs have the bare minimum access they need to survive. access, on the other hand, is a far more generous list of accesses, intended for servers with lower populations, where players are expected to do more than just the job they were assigned. Also for servers which don't want to allow people to hide in their own ultra secure departments, where no one can get to them.

2013-01-06 16:38:45 +00:00

create_mob.dm

…

create_object.dm

…

create_turf.dm

…

holder2.dm

Fixes admins not spawning as aliens on roundstart.

2013-08-20 14:20:33 +01:00

IsBanned.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

NewBan.dm

…

newbanjob.dm

…

player_notes.dm

Return of Moderator II

2013-01-04 03:02:08 +04:00

player_panel.dm

Typo fix.

2013-08-13 15:18:45 -07:00

topic.dm

Renabled admin secrets, as they are are admin only.

2013-08-28 19:44:02 +01:00

ToRban.dm

…