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

# Conflicts:
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	config/custom_items.txt
#	maps/tether/tether-03-station.dmm
#	vorestation.dme

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

..

autolathe

Polaris Sync

2017-08-28 20:52:11 -04:00

helper_datums

Polaris sync

2017-08-06 19:07:17 -04: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

Fix runtimes in radiation controller

2017-06-11 20:50:13 -04:00

supplypacks

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

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

underwear

Adds a tiedye shirt.

2017-08-23 03:38:48 -04:00

uplink

Fixes typo.

2017-08-05 15:28:42 -07:00

vending

Vending machines now correctly throw products

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

wires

Changes path of alien tools, adds hacking sounds, and makes the fireaxe cabinet use toolspeed.

2017-08-04 08:35:16 -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

Allow disabling styling of fake nanoui windows

2016-05-26 18:07:38 +01:00

category.dm

Underwear Datums (#1794)

2016-05-29 17:29:36 +01:00

computerfiles.dm

…

datacore.dm

Brain type is shown on all records

2017-04-22 18:18:31 -07: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

Replaces more macros. (#3647)

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

mixed.dm

Fixes players not being removed from the manifest immediately when cryoing.

2017-06-15 17:19:52 -04:00

modules.dm

…

organs.dm

…

progressbar.dm

…

recipe.dm

Removes circuit boards from relevant checks for microwaves, cooking.

2016-05-05 01:24:38 -04:00

sun.dm

…

weakref.dm

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

2017-06-10 22:41:51 -04:00