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

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/vore/weight/fitness_machines_vr.dm
#	config/custom_items.txt

2018-02-02 19:25:51 -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

2018-02-02 19:25:51 -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

Make ghosts invisible again.

2018-01-30 23:36:57 -05:00

admin.dm

Polaris sync

2017-12-21 04:01:07 -05:00

banjob.dm

…

ckey_vr.dm

…

create_mob.dm

…

create_object.dm

…

create_turf.dm

…

holder2.dm

…

IsBanned.dm

Replaces more macros. (#3647)

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

map_capture.dm

…

NewBan.dm

Grammar time, again. (#4402)

2017-12-05 14:34:45 -06: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

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

ToRban.dm

…