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

# Conflicts:
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	code/modules/resleeving/infocore_records.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/widerobot_vr.dmi
#	vorestation.dme

2017-06-18 15:35:35 -04:00

..

callproc

Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade"

2016-08-15 12:58:00 -04:00

DB ban

…

permissionverbs

…

secrets

Merge large polaris changes

2017-03-02 22:44:17 -05:00

verbs

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

2017-06-18 15:35:35 -04:00

view_variables

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

2017-06-10 22:41:51 -04:00

admin_attack_log.dm

…

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

…

admin_report.dm

…

admin_secrets.dm

Organize and Beautify Admin Secrets Panel

2016-05-27 16:32:46 -04:00

admin_verbs.dm

Minor NIF and Soulcatcher Tweaks

2017-06-09 10:16:45 -04:00

admin.dm

Merge remote-tracking branch 'polaris/stonedmc-update' into stonedmc-update

2017-06-11 15:35:42 -04:00

banjob.dm

…

ckey_vr.dm

Added Change CKey Admin Verb

2016-05-20 20:43:36 -04:00

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

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

IsBanned.dm

…

map_capture.dm

…

NewBan.dm

…

newbanjob.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

news.dm

Improves Lobby News

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

player_notes.dm

…

player_panel.dm

world time fix

2016-07-30 03:19:47 -04:00

topic.dm

Adds a fix

2017-02-04 21:11:23 -06:00

ToRban.dm

…