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

..

air.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

airflow.dm

Use define constants for subsystem init order and priority.

2018-04-20 13:18:55 -04:00

atoms.dm

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00

bellies_vr.dm

VS: Rewrites basically all of how bellies work

2018-02-27 13:29:45 -05:00

creation.dm

Adds Submap (PoI) Seeding Procedure

2017-11-21 19:21:39 -05:00

garbage.dm

Use define constants for subsystem init order and priority.

2018-04-20 13:18:55 -04:00

holomaps_vr.dm

Reorganzied Holo Minimaps into SSholomaps subsystem.

2018-03-04 21:54:20 -05:00

lighting.dm

Ports https://github.com/tgstation/tgstation/pull/30184

2017-12-27 19:10:15 -05:00

machines.dm

Split and clarify global lists of processing vs non-processing machinery. (#5307)

2018-05-28 15:57:02 -04:00

mapping_vr.dm

Ground work for Player picked engines.

2018-06-26 02:18:42 -04:00

mapping_yw.dm

More fixes for initializing Atmos Machines by the engine loader.

2018-07-12 17:37:55 -04:00

mobs.dm

Oversight with low_priorty mob setup

2018-02-18 23:38:12 -05:00

orbits.dm

Use define constants for subsystem init order and priority.

2018-04-20 13:18:55 -04:00

overlays.dm

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

2018-03-15 22:41:14 -04:00

persist_vr.dm

Adds cap on PTO

2018-02-02 18:37:50 -05:00

planets.dm

Fixes Indoor Weather

2018-07-18 15:21:12 -04:00

shuttles.dm

Use define constants for subsystem init order and priority.

2018-04-20 13:18:55 -04:00

transcore_vr.dm

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

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

xenoarch.dm

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00