Repede ba3584c965 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self ...

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt

2018-08-17 19:13:15 -04:00

..

autolathe

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16

2018-02-17 00:35:29 -05:00

helper_datums

Adds Quantum Pads

2018-04-19 18:13:30 -04:00

locations

…

observation

Merge pull request #5431 from Neerti/rcd_space_fix

2018-07-23 11:08:46 -04:00

outfits

Update:

2018-06-24 17:44:44 +01:00

repositories

(SQ-Merge) Makes rads not kill people in stomachs (#3342)

2018-03-25 15:32:32 -04:00

supplypacks

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

2018-06-23 17:53:13 -04:00

underwear

U_I Phase 1.0: First consolidation pass

2018-03-08 19:31:43 -05:00

uplink

9mm pistol updates (#4480)

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

vending

…

wires

Defines

2018-05-22 20:59:26 -07: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

…

api.dm

…

beam.dm

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

2018-01-13 18:34:33 -05:00

browser.dm

…

callback.dm

Ports callback datum from TG

2018-02-05 15:50:14 -05:00

category.dm

…

computerfiles.dm

…

datacore.dm

Hides syndi-synths from the manifest (#5411)

2018-07-15 13:27:47 -04:00

datum.dm

Implemented basic GLOB and TGS3's DMAPI

2018-02-27 18:31:13 -05:00

datumvars.dm

Implemented basic GLOB and TGS3's DMAPI

2018-02-27 18:31:13 -05:00

EPv2.dm

POLARIS: Fix several Destroy()s

2018-02-20 10:00:23 -05:00

ghost_query.dm

Adds a cursed sword (and other haunted things) (#4931)

2018-03-19 11:49:33 -07:00

hierarchy.dm

…

mind.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

mixed.dm

POLARIS: Fix several Destroy()s

2018-02-20 10:00:23 -05:00

modules.dm

…

mutable_appearance.dm

POLARIS: Tweak weird MA override

2018-02-24 13:13:10 -05:00

orbit.dm

Implements the Tesla engine and supporting features (#4539)

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

organs.dm

…

progressbar.dm

POLARIS: Fix several Destroy()s

2018-02-20 10:00:23 -05:00

recipe.dm

…

riding.dm

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

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

sun.dm

…

weakref.dm

Unify datum var definitions

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