Merge remote-tracking branch 'upstream/master' into the-p-o-o-l

2020-01-12 15:16:17 -06:00
parent c88efe84de ca848e547f
commit f6c5f81a83
60 changed files with 2186 additions and 4136 deletions
@@ -159,6 +159,7 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 #define EXPLODE_DEVASTATE 1
 #define EXPLODE_HEAVY 2
 #define EXPLODE_LIGHT 3
+#define EXPLODE_GIB_THRESHOLD 50

 #define EMP_HEAVY 1
 #define EMP_LIGHT 2
@@ -110,4 +110,7 @@
 #define RCD_DECONSTRUCT 3
 #define RCD_WINDOWGRILLE 4
 #define RCD_MACHINE 8
-#define RCD_COMPUTER 16
+#define RCD_COMPUTER 16
+
+#define RCD_UPGRADE_FRAMES 1
+#define RCD_UPGRADE_SIMPLE_CIRCUITS 2