Merge branch 'master' into digileg-runtime

2018-03-19 21:33:50 -05:00
parent 5d2ec7dd88 dad2d44ea2
commit 8cbdf9fcb4
1329 changed files with 2726 additions and 1986 deletions
@@ -188,9 +188,9 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache)
 //Wet floor type flags. Stronger ones should be higher in number.
 #define TURF_DRY		0
 #define TURF_WET_WATER	1
-#define TURF_WET_LUBE	2
+#define TURF_WET_PERMAFROST	2
 #define TURF_WET_ICE 4
-#define TURF_WET_PERMAFROST	8
+#define TURF_WET_LUBE	8

 #define IS_WET_OPEN_TURF(O) O.GetComponent(/datum/component/wet_floor)