From 5f6a2a999a8a6d6d5729ffbae31efb9997cb5300 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 1 Jul 2017 23:21:24 -0500 Subject: [PATCH] Chasms, asteroid turfs, basalt, and lava can no longer be made wet (#1847) --- code/game/turfs/simulated/chasm.dm | 6 ++++++ code/game/turfs/simulated/floor/plating/asteroid.dm | 6 ++++++ code/game/turfs/simulated/floor/plating/lava.dm | 8 +++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/code/game/turfs/simulated/chasm.dm b/code/game/turfs/simulated/chasm.dm index 55dfffdb74..de0dbea8f6 100644 --- a/code/game/turfs/simulated/chasm.dm +++ b/code/game/turfs/simulated/chasm.dm @@ -14,6 +14,12 @@ var/drop_y = 1 var/drop_z = 1 +/turf/open/chasm/MakeSlippery(wet_setting = TURF_WET_WATER, min_wet_time = 0, wet_time_to_add = 0) + return + +/turf/open/chasm/MakeDry(wet_setting = TURF_WET_WATER) + return + /turf/open/chasm/Entered(atom/movable/AM) START_PROCESSING(SSobj, src) drop_stuff(AM) diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm index 4d3e7e566b..5e7a0acf54 100644 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm +++ b/code/game/turfs/simulated/floor/plating/asteroid.dm @@ -25,6 +25,12 @@ /turf/open/floor/plating/asteroid/burn_tile() return +/turf/open/floor/plating/asteroid/MakeSlippery(wet_setting = TURF_WET_WATER, min_wet_time = 0, wet_time_to_add = 0) + return + +/turf/open/floor/plating/asteroid/MakeDry(wet_setting = TURF_WET_WATER) + return + /turf/open/floor/plating/asteroid/ex_act(severity, target) contents_explosion(severity, target) switch(severity) diff --git a/code/game/turfs/simulated/floor/plating/lava.dm b/code/game/turfs/simulated/floor/plating/lava.dm index a9c46a0e70..978bedac3b 100644 --- a/code/game/turfs/simulated/floor/plating/lava.dm +++ b/code/game/turfs/simulated/floor/plating/lava.dm @@ -11,7 +11,13 @@ light_power = 0.75 light_color = LIGHT_COLOR_LAVA -/turf/open/floor/plating/lava/ex_act() +/turf/open/floor/plating/lava/ex_act(severity, target) + contents_explosion(severity, target) + +/turf/open/floor/plating/lava/MakeSlippery(wet_setting = TURF_WET_WATER, min_wet_time = 0, wet_time_to_add = 0) + return + +/turf/open/floor/plating/lava/MakeDry(wet_setting = TURF_WET_WATER) return /turf/open/floor/plating/lava/airless