PsiOmega 66c56926d0 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/gamemodes/cult/runes.dm

2015-04-08 10:40:38 +02:00

..

DB ban

…

permissionverbs

…

verbs

Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file

2015-03-29 01:52:26 -04:00

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

…

admin_report.dm

…

admin_verbs.dm

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

2015-04-08 10:40:38 +02:00

admin.dm

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

2015-02-27 09:06:48 +01:00

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

…

NewBan.dm

…

newbanjob.dm

…

player_notes.dm

…

player_panel.dm

…

topic.dm

Merged with dev.

2015-02-24 17:03:39 +10:30

ToRban.dm

…