Repede ba3584c965 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self ...

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt

2018-08-17 19:13:15 -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

Merge pull request #5304 from VOREStation/vplk-reverse-all_atoms

2018-05-28 15:55:55 -04:00

verbs

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

2018-08-17 19:13:15 -04:00

view_variables

Merge pull request #5304 from VOREStation/vplk-reverse-all_atoms

2018-05-28 15:55:55 -04:00

admin_attack_log.dm

POLARIS: Revamp logging to be consistent

2018-03-13 18:20:58 -04:00

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

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

2018-04-20 09:03:58 -04:00

admin_report.dm

…

admin_secrets.dm

Fix various syntactic problems

2018-05-16 21:43:18 -07:00

admin_verbs.dm

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

2018-06-23 17:53:13 -04:00

admin.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -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

Grant remote profile access to R_DEBUG holders

2018-03-29 13:52:53 -04:00

IsBanned.dm

POLARIS: Revamp logging to be consistent

2018-03-13 18:20:58 -04: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

Improves Lobby News

2017-01-26 00:37:38 -05:00

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

Adds 'Smite' verb and pray response button

2018-05-23 13:47:48 -04:00

ToRban.dm

…