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

# Conflicts:
#	code/modules/mob/language/station_vr.dm

2016-12-18 00:56:03 -05: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

Fixed unmatched closing span tags.

2016-05-30 01:41:10 -04:00

verbs

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

2016-12-18 00:56:03 -05:00

view_variables

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

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

admin_attack_log.dm

…

admin_investigate.dm

…

admin_memo.dm

…

admin_ranks.dm

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

admin_report.dm

…

admin_secrets.dm

Organize and Beautify Admin Secrets Panel

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

admin_verbs.dm

Might fix Travis

2016-11-10 17:49:20 -06:00

admin.dm

Adds "Intercom Msg" admin verb

2016-11-01 19:56:31 -04:00

banjob.dm

…

ckey_vr.dm

Added Change CKey Admin Verb

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

create_mob.dm

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

create_object.dm

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

create_turf.dm

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

holder2.dm

September Polaris Sync (#545)

2016-09-11 19:52:40 -04:00

IsBanned.dm

…

map_capture.dm

…

NewBan.dm

…

newbanjob.dm

Polaris Sync October 9th (#633)

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

player_notes.dm

…

player_panel.dm

world time fix

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

topic.dm

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

ToRban.dm

…