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

..

autolathe

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

helper_datums

Refactor Digestion

2018-01-10 02:06:13 -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

outfits

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

repositories

Fix GC issue on radiation sources.

2018-01-21 00:43:43 -05:00

supplypacks

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

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

underwear

Adds a tiedye shirt.

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

uplink

9mm pistol updates (#4480)

2018-01-14 14:45:15 -06:00

vending

Vending machines now correctly throw products

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

wires

Implements the Tesla engine and supporting features (#4539)

2018-01-19 14:56:08 -06:00

ai_law_sets.dm

Fixes gravekeeper module wood synth, fixes typo in gravekeeper lawset (#4506)

2018-01-06 20:20:01 -06:00

ai_laws.dm

Fixes #10488.

2015-08-11 19:36:02 +02:00

api.dm

Proof of concept shipping API

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

beam.dm

Ports the Paradise rewrite of TG rewrite of the Beam() proc

2018-01-13 18:34:33 -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

datum.dm

Transformed the machinery processor into an StonedMC subsystem

2017-12-29 15:31:59 -05:00

EPv2.dm

Adds Telecomms Logging to EPv2

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

ghost_query.dm

Works on New Blob

2017-11-29 22:35:01 -05:00

hierarchy.dm

Rehauls some autolathe code

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

mind.dm

Adds a Trait system (#4048)

2017-10-13 01:17:39 -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

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

mutable_appearance.dm

Works on New Blob

2017-11-29 22:35:01 -05:00

orbit.dm

Implements the Tesla engine and supporting features (#4539)

2018-01-19 14:56:08 -06:00

organs.dm

…

progressbar.dm

Can now toggle the progress bar visibility.

2016-03-30 00:13:41 +01:00

recipe.dm

Removes circuit boards from relevant checks for microwaves, cooking.

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

riding.dm

Adds Boats, Ports /TG/ Buckling (#4527)

2018-01-14 14:58:15 -06:00

sun.dm

finishes work on adapting the goon process scheduler for BS12.

2015-03-04 05:14:36 -05:00

weakref.dm

Unify datum var definitions

2017-12-29 14:23:13 -05:00