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

Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/modules/projectiles/guns/projectile/launchers.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	code/modules/research/designs/weapon_designs.dm
	icons/obj/gun.dmi

2015-01-15 21:56:23 -08:00

..

DB ban

Removes extra sql sanitize procs in favor of sanitizeSQL()

2014-10-29 04:12:07 -07: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 nosenseofrightandwrongiguess

2015-01-15 21:56:23 -08:00

admin_investigate.dm

Adds atmos investigate_log

2015-01-01 21:37:32 -03:00

admin_memo.dm

fix

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

admin_ranks.dm

Improves Permission Panel security, take 2

2014-12-28 18:10:07 -03:00

admin_verbs.dm

Merge pull request #6808 from Boggart/readminbugfix

2015-01-10 01:29:01 -03:00

admin.dm

Fixes malf AI lockdown affecting doors on z levels other than station and mining.

2015-01-11 15:39:32 +01:00

banappearance.dm

Removes extra sql sanitize procs in favor of sanitizeSQL()

2014-10-29 04:12:07 -07:00

banjob.dm

Fixes some erros in the database system

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

create_mob.dm

…

create_object.dm

…

create_turf.dm

…

holder2.dm

Merge pull request #6808 from Boggart/readminbugfix

2015-01-10 01:29:01 -03:00

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

Adds cfg option to let players see their own notes

2014-12-19 22:42:18 -03:00

player_panel.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

topic.dm

Merge pull request #6966 from Steelpoint/ERTv2

2015-01-15 23:41:20 -06:00