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

Conflicts:
	icons/obj/closet.dmi

2015-04-28 22:31:11 +10: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 pull request #9115 from AnturK/abduction_udpate_dos

2015-04-26 15:38:19 +01:00

admin_investigate.dm

Experimentor Invesigate Take 1

2015-02-20 15:09:59 -06:00

admin_memo.dm

fix

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

admin_ranks.dm

Changing/adding an admins rank now updates the player's table

2015-04-09 03:19:55 -07:00

admin_verbs.dm

Adds the "set round end sound" fun button so admins can override the generic sounds to play something else if want be.

2015-04-18 15:34:03 -04:00

admin.dm

Adds some sanity checks to admin ghost drag.

2015-04-15 02:58:54 -07: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

Removed commented out regenerate_icons()

2015-03-19 21:35:24 -07:00

create_object.dm

Added /obj/effect and /obj/item/weapon/gun path to Quick Create Object.

2015-04-12 18:26:24 +01:00

create_turf.dm

…

holder2.dm

Merge pull request #6808 from Boggart/readminbugfix

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

IsBanned.dm

Removes admin notices on failed logins in isbanned

2015-04-15 10:11:37 -07:00

NewBan.dm

changed note check to temp

2015-01-25 02:22:28 +11:00

newbanjob.dm

…

player_notes.dm

View Own Notes Readabily Fix

2015-01-25 10:46:27 +01:00

player_panel.dm

Any roundtype can now take advantage of continuous/non-continuous settings as well as the mulligan antag system. (as a reminder at this point the mulligan system only creates lings and/or traitors)

2015-04-24 15:40:42 -04:00

topic.dm

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

2015-04-28 22:31:11 +10:00