Merge pull request #5570 from xxalpha/noslipfloor

High-traction Floor

code/datums/supplypacks.dm

@@ -1054,6 +1054,13 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 	cost = 10
 	containername = "replacement lights"
 
+/datum/supply_packs/misc/noslipfloor
+	name = "High-traction floor tiles"
+	contains = list(/obj/item/stack/tile/noslip)
+	amount = 20
+	cost = 20
+	containername = "high-traction floor tiles"
+
 
 ///////////// Costumes
 

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

@@ -21,7 +21,7 @@
 /obj/item/stack/tile/grass
 	name = "grass tile"
 	singular_name = "grass floor tile"
-	desc = "A patch of grass like they often use on golf courses"
+	desc = "A patch of grass like they often use on golf courses."
 	icon_state = "tile_grass"
 	w_class = 3.0
 	force = 1.0
@@ -38,7 +38,7 @@
 /obj/item/stack/tile/wood
 	name = "wood floor tile"
 	singular_name = "wood floor tile"
-	desc = "an easy to fit wood floor tile"
+	desc = "an easy to fit wood floor tile."
 	icon_state = "tile-wood"
 	w_class = 3.0
 	force = 1.0
@@ -55,7 +55,7 @@
 /obj/item/stack/tile/carpet
 	name = "carpet"
 	singular_name = "carpet"
-	desc = "A piece of carpet. It is the same size as a floor tile"
+	desc = "A piece of carpet. It is the same size as a floor tile."
 	icon_state = "tile-carpet"
 	w_class = 3.0
 	force = 1.0
@@ -64,3 +64,20 @@
 	throw_range = 7
 	max_amount = 60
 	turf_type = /turf/simulated/floor/carpet
+
+/*
+ * 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"
+	w_class = 3.0
+	force = 1.0
+	throwforce = 1.0
+	throw_speed = 3
+	throw_range = 7
+	max_amount = 60
+	turf_type = /turf/simulated/floor/noslip
+	origin_tech = "material=3"

code/game/turfs/simulated/floor/misc_floor.dm

@@ -10,6 +10,7 @@
  * Ocean
  * Iron Sand
  * Snow
+ * High-traction
  */
 
 /turf/simulated/floor/goonplaque
@@ -91,3 +92,13 @@
 
 /turf/simulated/floor/plating/snow/ex_act(severity)
 	return
+
+/turf/simulated/floor/noslip
+	name = "high-traction floor"
+	icon_state = "noslip"
+	floor_tile = /obj/item/stack/tile/noslip
+	broken_states = list("noslip-damaged1","noslip-damaged2","noslip-damaged3")
+	burnt_states = list("noslip-scorched1","noslip-scorched2")
+
+/turf/simulated/floor/noslip/MakeSlippery()
+	return