PsiOmega f25e8a7a67 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm

2015-06-26 20:28:47 +02: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-06-26 20:28:47 +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 remote-tracking branch 'upstream/dev-freeze' into dev

2015-06-16 10:52:33 +02:00

admin.dm

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

banjob.dm

*NIX Log files part 2.

2014-03-26 18:51:37 -05:00

create_mob.dm

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +00:00

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

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +00:00

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-06-11 12:06:40 +02:00

player_panel.dm

Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465.

2015-06-21 18:08:26 +09:30

topic.dm

Merge with dev-freeze.

2015-06-21 20:45:47 +09:30

ToRban.dm

*NIX Log files part 2.

2014-03-26 18:51:37 -05:00