Merge branch 'master' into upstream-merge-31045

2017-10-01 01:17:52 -04:00
parent 6d59f3b06f 45c79ffbbe
commit f55c86edfb
260 changed files with 7134 additions and 5672 deletions
@@ -14,6 +14,7 @@
 #define HIGH_TURF_LAYER 2.03
 #define ABOVE_OPEN_TURF_LAYER 2.04
 #define CLOSED_TURF_LAYER 2.05
+#define BULLET_HOLE_LAYER 2.06
 #define ABOVE_NORMAL_TURF_LAYER 2.08
 #define LATTICE_LAYER 2.2
 #define DISPOSAL_PIPE_LAYER 2.3