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

# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.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
#	code/modules/power/lighting.dm

2018-06-02 18:33:44 -04:00

..

beekeeping

…

spreading

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

trays

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

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

_hydro_setup.dm

…

grown_inedible.dm

Hatchets - > Machete subtype.

2018-01-12 21:21:18 -08:00

grown_predefined.dm

…

grown.dm

Hatchets - > Machete subtype.

2018-01-12 21:21:18 -08:00

seed_controller.dm

for(var/bad_code in world)

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

seed_datums_vr.dm

Update seed_datums_vr.dm

2018-04-15 14:21:52 -04:00

seed_datums_yw.dm

Add files via upload

2018-04-15 14:14:19 -04:00

seed_datums.dm

Merge pull request #5309 from Heroman3003/melon-fix

2018-05-29 14:35:57 -04:00

seed_gene_mut.dm

…

seed_machines.dm

…

seed_mobs.dm

…

seed_packets_vr.dm

Update seed_packets_vr.dm

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

seed_packets_yw.dm

Add files via upload

2018-04-15 14:14:19 -04:00

seed_packets.dm

for(var/bad_code in world)

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

seed_storage_vr.dm

Merge pull request #101 from ProbablyCarl/master

2018-04-16 20:48:37 -04:00

seed_storage.dm

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

2018-05-27 19:26:12 -04:00

seed.dm

…