Commit Graph

6 Commits

Author SHA1 Message Date
Alberyk
d2a228a91d Merge branch 'master' into fuck_rd_once_more 2020-03-30 20:21:03 -03:00
Geeves
2a8564e7d4 RnD Rearrangement (#8494) 2020-03-28 09:30:46 +01:00
Alberyk
ac6080c8dd Robotics changes. 2020-03-27 20:09:49 -03:00
Matt Atlas
82437acd43 Materials subsystem, material defines instead of strings, structure materials. (#8447)
The shitcode crusade begins.
2020-03-18 20:19:11 +01:00
Mykhailo Bykhovtsev
8c1e92edcd Fixing Mechs more. The fight between armor and armour (#7723)
The armour and armor again strikes:

    Apparently original Mech port PR has overridden borg's armor definition and was using it. This fixes it by making mech's armor a child of borg's armor instead.

    renames borg's armour to armor references.

    Mech's melee damage has been increased. It depends on manipulator type. Light: 15, Regular: 20, Combat 30, Heavy: 50. Fixes #7665

    Adds missed check in mech's destroy proc
2019-12-19 21:41:23 +02:00
Geeves
7f65c50ba6 Robotics Mechfab Update (#7359) 2019-11-13 21:45:27 +01:00