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

# Conflicts:
#	config/custom_items.txt

2017-09-21 18:37:11 -04: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-09-21 18:37:11 -04:00

view_variables

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again

2017-09-05 00:58:27 -04:00

admin_attack_log.dm

…

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

…

admin_report.dm

…

admin_secrets.dm

…

admin_verbs.dm

Polaris sync

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

admin.dm

Polaris sync

2017-09-15 21:17:34 -04: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

…

topic.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again

2017-09-05 00:58:27 -04:00

ToRban.dm

…