Merge branch 'master' into synctesting

2018-04-09 21:43:26 +00:00
parent d3ba1085bb dab96582bd
commit e0d7630c19
43 changed files with 411 additions and 90 deletions
@@ -383,6 +383,9 @@

 	if(throwing)
 		return 1
+	
+	if(!isturf(loc))
+		return 1

 	if(locate(/obj/structure/lattice) in range(1, get_turf(src))) //Not realistic but makes pushing things in space easier
 		return 1
@@ -21,7 +21,7 @@
 	GET_COMPONENT(chasm_component, /datum/component/chasm)
 	chasm_component.drop(AM)

-/turf/open/chasm/MakeSlippery()
+/turf/open/chasm/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
 	return

 /turf/open/chasm/MakeDry()
@@ -129,7 +129,7 @@
 	burnt_states = list("noslip-scorched1","noslip-scorched2")
 	slowdown = -0.3

-/turf/open/floor/noslip/MakeSlippery()
+/turf/open/floor/noslip/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
 	return

 /turf/open/floor/oldshuttle
@@ -33,7 +33,7 @@
 /turf/open/floor/plating/asteroid/burn_tile()
 	return

-/turf/open/floor/plating/asteroid/MakeSlippery()
+/turf/open/floor/plating/asteroid/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
 	return

 /turf/open/floor/plating/asteroid/MakeDry()
@@ -14,7 +14,7 @@
 /turf/open/lava/ex_act(severity, target)
 	contents_explosion(severity, target)

-/turf/open/lava/MakeSlippery()
+/turf/open/lava/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
 	return

 /turf/open/lava/acid_act(acidpwr, acid_volume)
@@ -164,7 +164,7 @@
 		A.newtonian_move(A.inertia_dir)


-/turf/open/space/MakeSlippery()
+/turf/open/space/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
 	return

 /turf/open/space/singularity_act()