Merge remote-tracking branch 'upstream/master' into lighttiles

Conflicts:
	code/game/objects/items/stacks/tiles/tile_types.dm

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -3,6 +3,11 @@
  *		Grass
  *		Wood
  *		Carpet
+ *		Plasteel
+ *		Light
+ *		Fakespace
+ *		High-traction
+ \\ If you don't update the contains list, I'm going to shank you
  */
 /obj/item/stack/tile
 	name = "broken tile"
@@ -84,4 +89,30 @@
 	force = 3
 	throwforce = 5
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
-	turf_type = /turf/simulated/floor/light
+	turf_type = /turf/simulated/floor/light
+
+/*
+ * Fakespace
+ */
+/obj/item/stack/tile/fakespace
+	name = "astral carpet"
+	singular_name = "astral carpet"
+	desc = "A piece of carpet with a convincing star pattern."
+	icon_state = "tile_space"
+	turf_type = /turf/simulated/floor/fakespace
+
+/obj/item/stack/tile/fakespace/loaded
+	amount = 30
+
+//High-traction
+/obj/item/stack/tile/noslip
+	name = "high-traction floor tile"
+	singular_name = "high-traction floor tile"
+	desc = "A high-traction floor tile. It feels rubbery in your hand."
+	icon_state = "tile_noslip"
+	turf_type = /turf/simulated/floor/noslip
+	origin_tech = "materials=3"
+
+/obj/item/stack/tile/noslip/loaded
+	amount = 20
+

code/game/objects/items/weapons/gift_wrappaper.dm

@@ -116,6 +116,7 @@
 		/obj/item/clothing/under/syndicate/tacticool,
 		/obj/item/weapon/storage/box/fakesyndiesuit,
 		/obj/item/toy/crossbow/tommygun,
+		/obj/item/stack/tile/fakespace/loaded,
 		)
 
 	if(!ispath(gift_type,/obj/item))	return

code/game/objects/structures/janicart.dm

@@ -80,7 +80,7 @@
 		handle_rotation()
 		if(istype(src.loc, /turf/simulated))
 			var/turf/simulated/T = src.loc
-			if(T.wet == 2)	//Lube! Fall off!
+			if(T.wet == TURF_WET_LUBE)	//Lube! Fall off!
 				playsound(src, 'sound/misc/slip.ogg', 50, 1, -3)
 				buckled_mob.Stun(7)
 				buckled_mob.Weaken(7)