xxalpha f9ebb2cff7 Merge remote-tracking branch 'upstream/master' into traymesons ...

Conflicts:
	code/modules/research/designs.dm
	icons/mob/eyes.dmi
	icons/obj/clothing/glasses.dmi

2015-02-27 21:15:01 +00: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 remote-tracking branch 'upstream/master' into traymesons

2015-02-27 21:15:01 +00: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

Improves Permission Panel security, take 2

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

admin_verbs.dm

Panic bunker + new player notification configs

2015-02-25 23:27:03 -08:00

admin.dm

Added a "Send back to Lobby" option in Player Panel.

2015-01-28 18:45:26 +01:00

banappearance.dm

Removes extra sql sanitize procs in favor of sanitizeSQL()

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

banjob.dm

…

create_mob.dm

some updates

2015-01-23 21:00:09 -08:00

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 guests being allowed to connect while panic bunker is active

2015-02-26 16:48:43 -08: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

SubSystem rewrite

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

topic.dm

Stamina on adminmoreinfo and vv; ahelp and pray CA replaced by TP

2015-02-24 20:02:43 +11:00