izac112 933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update ...

# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved

2020-01-31 18:23:50 +01:00

..

computers

Preset (mapped-in) modular computers now have printers by default. (#6639)

2020-01-23 23:55:51 -05:00

file_system

TSS Changes+Update

2019-11-23 00:19:38 -06:00

hardware

Merge pull request #6476 from Hawk-v3/master

2019-10-08 04:22:16 -04:00

NTNet

…

_description.dm

…

laptop_vendor.dm

…