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

..

autolathe

Updates map, updates ammo.

2017-08-06 20:36:37 -04:00

helper_datums

Polaris sync

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

locations

…

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-08-18 08:14:12 -04:00

underwear

Adding missing shirts to Undershirt, minor cleanup

2017-05-05 05:05:56 -05:00

uplink

Fixes typo.

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

vending

…

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

…

category.dm

…

computerfiles.dm

…

datacore.dm

Brain type is shown on all records

2017-04-22 18:18:31 -07:00

EPv2.dm

…

hierarchy.dm

…

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

…

sun.dm

…

weakref.dm

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

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