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

..

adminhelp.dm

Polaris sync

2017-08-06 19:07:17 -04:00

adminjump.dm

…

adminpm.dm

Revert "Removes unused and unnecessary spam prevention"

2017-01-02 00:43:37 -05:00

adminsay.dm

…

antag-ooc.dm

Adds AOOC functionality for antags.

2017-06-24 12:31:18 -04:00

atmosdebug.dm

…

BrokenInhands.dm

…

buildmode.dm

Adds Multi-Z Test Map

2017-03-03 09:40:34 -05:00

check_customitem_activity.dm

…

cinematic.dm

…

custom_event.dm

Introduces max record length for record, converts uses of max book length to max paper length barring books

2016-06-27 16:26:31 +01:00

deadsay.dm

Revert "Removes unused and unnecessary spam prevention"

2017-01-02 00:43:37 -05:00

debug_vr.dm

Changes QUICK_NIF required perms

2017-07-26 19:00:36 -04:00

debug.dm

Polaris sync

2017-08-06 19:07:17 -04:00

diagnostics.dm

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

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

dice.dm

…

getlogs.dm

…

grief_fixers.dm

Adds full atmospherics reset admin verb

2016-04-10 17:23:43 +01:00

mapping.dm

Polaris sync

2017-08-06 19:07:17 -04:00

massmodvar.dm

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

modifyvariables.dm

Tweaks Statpanel and System Initialization

2017-06-01 21:42:08 -04:00

panicbunker.dm

Quick & Dirty Panic Bunker Port

2017-04-11 00:13:43 -04:00

playsound.dm

guns and other things

2016-12-17 14:09:44 -05:00

possess.dm

…

pray.dm

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

randomverbs.dm

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

SDQL_2_parser.dm

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

SDQL_2.dm

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

SDQL.dm

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

striketeam.dm

…

ticklag.dm

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

tripAI.dm

Replaces more macros. (#3647)

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