PsiOmega 151c5204ee Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/modules/projectiles/gun.dm
	html/changelogs/RavingManiac-master.yml

2015-05-05 08:11:28 +02:00

..

DB ban

sanitize() refactor: third pass (misc)

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

permissionverbs

…

verbs

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

2015-05-05 08:11:28 +02: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

Admins can now toggle LOOC separately from OOC.

2015-04-30 09:52:29 +02:00

admin.dm

Admins can now toggle LOOC separately from OOC.

2015-04-30 09:52:29 +02:00

banjob.dm

…

create_mob.dm

…

create_object.dm

…

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

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

player_panel.dm

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

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

topic.dm

Merge pull request #8972 from DeeUnderscore/paper-functionality

2015-04-29 02:46:21 +09:30

ToRban.dm

…