GinjaNinja32 c4788ad6f5 Merge remote-tracking branch 'upstream/dev' into viro ...

Conflicts:
	code/modules/virus2/disease2.dm

2015-02-03 15:33:37 +00:00

..

DB ban

…

permissionverbs

…

verbs

Merge remote-tracking branch 'upstream/master' into TheGreatPurge

2015-02-03 14:16:14 +01:00

admin_investigate.dm

…

admin_memo.dm

…

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' into viro

2015-02-03 15:33:37 +00:00

admin.dm

Finished renaming nuclear mode to mercenary

2015-01-27 13:42:27 +13:00

banjob.dm

…

create_mob.dm

…

create_object.dm

…

create_turf.dm

…

holder2.dm

…

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

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

topic.dm

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

ToRban.dm

…