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

# Conflicts:
#	code/datums/supplypacks/engineering.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	code/modules/vore/appearance/spider_taur_powers_vr.dm
#	code/modules/vore/resizing/resize_vr.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi

2017-08-18 08:14:12 -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

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 large polaris changes

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

verbs

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

2017-08-18 08:14:12 -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

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

Gives admins with R_ADMIN their quicknif verb

2017-08-09 17:43:54 -04:00

admin.dm

Does some things

2017-08-06 19:10:50 -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

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

Ports Byond 510 preperations from Bay

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

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

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

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

world time fix

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

topic.dm

Replaces more macros. (#3647)

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

ToRban.dm

…