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

# Conflicts:
#	code/game/objects/items/weapons/tools.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt
#	vorestation.dme

2017-10-17 08:49:37 -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

…

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-10-17 08:49:37 -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

…

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

Splits the robot_modules file. Continues work on gravekeeper drone.

2017-09-29 01:02:53 -05:00

ai_laws.dm

…

api.dm

…

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

…

ghost_query.dm

Adds the thing that spawns the gravekeeper drone

2017-09-30 02:00:10 -05:00

hierarchy.dm

…

mind.dm

work

2017-09-04 21:52:47 -04: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