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

..

combat

Merge remote-tracking branch 'upstream/master'

2019-11-07 19:54:10 +00:00

equipment

Micro Mech Slot Fix

2020-01-15 17:21:58 -07:00

medical

Merge pull request #6506 from Heroman3003/mech-runtime-roundstart-fix

2019-10-30 21:00:21 -04:00

micro

Smol grammar fix

2020-01-20 18:24:56 -07:00

space

Merge pull request #6506 from Heroman3003/mech-runtime-roundstart-fix

2019-10-30 21:00:21 -04:00

working

Fixes mech projectile armor thinking test projectiles are dangerous

2019-12-21 23:58:07 -05:00

mech_bay.dm

POLARIS: Fixes #2601 (VS) - Allows mechs to continue charging after battery swap w/o moving

2018-03-25 17:05:06 -04:00

mech_fabricator.dm

Merge pull request #6095 from Heroman3003/unduping-synths

2019-04-17 02:36:46 -04:00

mech_prosthetics.dm

Merge pull request #6095 from Heroman3003/unduping-synths

2019-04-17 02:36:46 -04:00

mech_sensor.dm

Rewrites Atmospherics

2019-03-28 19:25:11 -04:00

mecha_construction_paths.dm

Earlyport mech fixes, Fix Polecat armor issues

2020-01-20 18:22:05 -07:00

mecha_control_console.dm

Moar descriptions for things

2020-01-20 22:50:39 -05:00

mecha_parts.dm

Serenity (#6208)

2019-06-21 00:14:05 -04:00

mecha_wreckage.dm

Multi-Tile Objects, Multi-Tile Hovershuttle

2019-07-01 20:43:53 -04:00

mecha.dm

Micro Mech Slot Fix

2020-01-15 17:21:58 -07:00