Kelshark b0d5dba835 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	config/custom_items.txt

2017-11-25 11:49:28 -05:00

..

callproc

…

DB ban

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

permissionverbs

Replaces more macros. (#3647)

2017-07-27 21:12:21 -05:00

secrets

Polaris sync

2017-09-15 21:17:34 -04:00

verbs

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-11-25 11:35:10 -05:00

view_variables

Merge pull request #3438 from Neerti/5/9/2017_reopening_the_salt_mines

2017-09-26 19:09:12 -05:00

admin_attack_log.dm

…

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

Does work on the event manager role again

2017-10-18 20:00:01 -05:00

admin_report.dm

…

admin_secrets.dm

Cleans up some Event Manager code

2017-11-03 16:24:36 -05:00

admin_verbs.dm

Polaris sync

2017-11-17 19:27:03 -05:00

admin.dm

Polaris Sync

2017-11-10 11:37:41 -05:00

banjob.dm

…

ckey_vr.dm

…

create_mob.dm

…

create_object.dm

Fixes typo for dune buggy in code and adds fluff boxes to the quick create menu.

2017-03-27 01:58:49 -07:00

create_turf.dm

…

holder2.dm

…

IsBanned.dm

Replaces more macros. (#3647)

2017-07-27 21:12:21 -05:00

map_capture.dm

…

NewBan.dm

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

newbanjob.dm

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

news.dm

…

player_notes.dm

Replaces more macros. (#3647)

2017-07-27 21:12:21 -05:00

player_panel.dm

Cleans up some Event Manager code

2017-11-03 16:24:36 -05:00

topic.dm

Does work on the event manager role again

2017-10-18 20:00:01 -05:00

ToRban.dm

…