mwerezak 9ad533a094 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/carbon/monkey/update_icons.dm
	code/modules/mob/mob_helpers.dm
	code/modules/spells/spellbook.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2015-03-31 00:16:56 -04:00

..

DB ban

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

permissionverbs

…

verbs

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-03-31 00:16:56 -04:00

admin_investigate.dm

…

admin_memo.dm

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00

admin_ranks.dm

small sanity check.

2014-11-17 02:28:20 -08:00

admin_report.dm

…

admin_verbs.dm

Merge pull request #8380 from volas/sanitize_procs

2015-03-29 00:57:33 +10:30

admin.dm

Merge pull request #8380 from volas/sanitize_procs

2015-03-29 00:57:33 +10:30

banjob.dm

…

create_mob.dm

…

create_object.dm

…

create_turf.dm

…

holder2.dm

Master into dev-freeze.

2015-03-07 11:33:39 +10:30

IsBanned.dm

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

NewBan.dm

…

newbanjob.dm

…

player_notes.dm

…

player_panel.dm

Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.

2015-03-26 12:45:12 +10:30

topic.dm

Merge pull request #8380 from volas/sanitize_procs

2015-03-29 00:57:33 +10:30

ToRban.dm

…