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

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/datums/supplypacks/contraband.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme

2018-01-24 19:52:12 -05:00

..

adminhelp.dm

Polaris sync

2017-10-27 15:30:24 -04:00

adminjump.dm

Revert "Does more prep for the Event Manager role"

2017-10-04 18:33:34 -05:00

adminpm.dm

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

2017-10-29 18:14:56 -04:00

adminsay.dm

Actually gives Event Managers ESAY

2017-11-05 23:06:11 -06:00

antag-ooc.dm

Adds AOOC functionality for antags.

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

atmosdebug.dm

…

BrokenInhands.dm

…

buildmode.dm

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

check_customitem_activity.dm

…

cinematic.dm

…

custom_event.dm

…

deadsay.dm

…

debug_vr.dm

Adds an admin verb to toggle it easier

2018-01-21 21:45:36 -05:00

debug.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19

2018-01-19 17:52:25 -05:00

diagnostics.dm

Does work on the event manager role again

2017-10-18 20:00:01 -05:00

dice.dm

…

getlogs.dm

…

grief_fixers.dm

…

map_template_loadverb.dm

Port's TG's Maploader

2017-09-08 12:49:26 -04:00

mapping.dm

Pol Sync

2017-10-08 17:44:25 -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

…

possess.dm

…

pray.dm

Macro Replacements. (#3574)

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

randomverbs.dm

Planes Framework (#4545)

2018-01-17 13:45:54 -06: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