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

# Conflicts:
#	code/game/objects/items/weapons/tools.dm
#	code/modules/mob/dead/observer/say.dm
#	config/custom_items.txt
#	vorestation.dme

2017-04-13 19:43:56 -04:00

..

autolathe

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

2017-04-13 19:43:56 -04:00

helper_datums

WIP Event ship and smaller shuttle

2017-03-08 17:57:29 -05:00

locations

Late September Sync (#579)

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

observation

Adds Multi-Z Test Map

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

repositories

…

supplypacks

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

2017-04-13 19:43:56 -04:00

underwear

Fixes the longjohn shirt sprite

2017-01-16 21:20:49 -06:00

uplink

Merge pull request #2955 from Anewbe/heart_damage

2017-03-28 20:02:24 -05:00

vending

Vending machines now correctly throw products

2016-12-17 03:30:14 -05:00

wires

Make jukebox controllable by its wires

2017-03-20 19:01:33 -04:00

ai_law_sets.dm

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

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

ai_laws.dm

…

api.dm

Proof of concept shipping API

2017-02-12 00:29:57 -05:00

browser.dm

…

category.dm

…

computerfiles.dm

…

datacore.dm

Polaris Sync October 9th (#633)

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

EPv2.dm

Adds Telecomms Logging to EPv2

2017-01-07 13:21:03 -05:00

hierarchy.dm

Rehauls some autolathe code

2016-07-24 22:02:58 +01:00

mind.dm

…

mixed.dm

…

modules.dm

…

organs.dm

…

progressbar.dm

…

recipe.dm

…

sun.dm

…

weakref.dm

Polaris Sync October 9th (#633)

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