PsiOmegaDelta d293b9ea25 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/ZAS/Controller.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/stripping.dm
	code/modules/mob/living/carbon/human/update_icons.dm

2015-08-27 08:53:22 +02:00

..

DB ban

Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze.

2015-07-14 05:19:01 +09:30

permissionverbs

…

verbs

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

2015-08-27 08:53:22 +02:00

admin_attack_log.dm

Moves admin attack log helpers to admin module, makes admin_attack_log more resilient against null arguments

2015-06-06 11:53:12 -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 branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2015-08-22 03:11:53 +09:30

admin.dm

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

2015-07-28 09:03:49 +02:00

banjob.dm

…

create_mob.dm

…

create_object.dm

Larger job and preferences windows but still lesser than 764. More choices in "Quick Create Object" menu.

2014-05-04 18:11:11 +04:00

create_turf.dm

…

holder2.dm

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

2015-04-24 17:13:37 +02:00

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

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

2015-07-29 11:57:17 +02:00

player_panel.dm

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

2015-07-28 07:59:49 +02:00

topic.dm

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

2015-08-18 18:05:16 +02:00

ToRban.dm

Updates ToR list URL

2015-07-25 03:27:46 +03:00