From bb51095b003bd6d1fcb24521687f55223ee70d30 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 20 Jan 2018 15:09:41 -0500 Subject: [PATCH] Merge pull request #34656 from ShizCalev/makeslippery Fixes missing MakeSlippery() args --- code/game/objects/items/extinguisher.dm | 2 +- code/game/objects/structures/watercloset.dm | 2 +- code/game/turfs/open.dm | 2 +- code/modules/mob/living/simple_animal/bot/cleanbot.dm | 2 +- code/modules/reagents/chemistry/reagents/blob_reagents.dm | 4 ++-- code/modules/reagents/chemistry/reagents/food_reagents.dm | 4 ++-- code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index 009bc211b4..b450e6750a 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -188,6 +188,6 @@ var/turf/T = get_turf(loc) if(isopenturf(T)) var/turf/open/theturf = T - theturf.MakeSlippery(min_wet_time = 10, wet_time_to_add = 5) + theturf.MakeSlippery(TURF_WET_WATER, min_wet_time = 10, wet_time_to_add = 5) user.visible_message("[user] empties out \the [src] onto the floor using the release valve.", "You quietly empty out \the [src] using its release valve.") diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index c7595f3981..ea051ab16c 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -236,7 +236,7 @@ soundloop.stop() if(isopenturf(loc)) var/turf/open/tile = loc - tile.MakeSlippery(min_wet_time = 5, wet_time_to_add = 1) + tile.MakeSlippery(TURF_WET_WATER, min_wet_time = 5, wet_time_to_add = 1) /obj/machinery/shower/attackby(obj/item/I, mob/user, params) diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index b8d46977be..12b37d0e01 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -168,7 +168,7 @@ return 1 /turf/open/proc/water_vapor_gas_act() - MakeSlippery(min_wet_time = 10, wet_time_to_add = 5) + MakeSlippery(TURF_WET_WATER, min_wet_time = 10, wet_time_to_add = 5) for(var/mob/living/simple_animal/slime/M in src) M.apply_water() diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index b9276116d5..6ed80afbb7 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -247,7 +247,7 @@ if(prob(75)) var/turf/open/T = loc if(istype(T)) - T.MakeSlippery(min_wet_time = 20, wet_time_to_add = 15) + T.MakeSlippery(TURF_WET_WATER, min_wet_time = 20, wet_time_to_add = 15) else visible_message("[src] whirs and bubbles violently, before releasing a plume of froth!") new /obj/effect/particle_effect/foam(loc) diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm index de96631bc9..cd5f4aa7c7 100644 --- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm @@ -459,7 +459,7 @@ reac_volume = ..() var/turf/open/T = get_turf(M) if(istype(T) && prob(reac_volume)) - T.MakeSlippery(min_wet_time = 10, wet_time_to_add = 5) + T.MakeSlippery(TURF_WET_WATER, min_wet_time = 10, wet_time_to_add = 5) M.adjust_fire_stacks(-(reac_volume / 10)) M.ExtinguishMob() M.apply_damage(0.4*reac_volume, BRUTE) @@ -481,7 +481,7 @@ /datum/reagent/blob/pressurized_slime/proc/extinguisharea(obj/structure/blob/B, probchance) for(var/turf/open/T in range(1, B)) if(prob(probchance)) - T.MakeSlippery(min_wet_time = 10, wet_time_to_add = 5) + T.MakeSlippery(TURF_WET_WATER, min_wet_time = 10, wet_time_to_add = 5) for(var/obj/O in T) O.extinguish() for(var/mob/living/L in T) diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 835bcaaad7..0fc27fe512 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -124,7 +124,7 @@ if(!istype(T)) return if(reac_volume >= 5) - T.MakeSlippery(min_wet_time = 10, wet_time_to_add = reac_volume * 1.5) + T.MakeSlippery(TURF_WET_LUBE, min_wet_time = 10, wet_time_to_add = reac_volume * 1.5) T.name = "deep-fried [initial(T.name)]" T.add_atom_colour(color, TEMPORARY_COLOUR_PRIORITY) @@ -430,7 +430,7 @@ /datum/reagent/consumable/cornoil/reaction_turf(turf/open/T, reac_volume) if (!istype(T)) return - T.MakeSlippery(min_wet_time = 10, wet_time_to_add = reac_volume*2) + T.MakeSlippery(TURF_WET_LUBE, min_wet_time = 10, wet_time_to_add = reac_volume*2) var/obj/effect/hotspot/hotspot = (locate(/obj/effect/hotspot) in T) if(hotspot) var/datum/gas_mixture/lowertemp = T.remove_air(T.air.total_moles()) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index dd740b0c68..8778e657f2 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -130,7 +130,7 @@ var/CT = cooling_temperature if(reac_volume >= 5) - T.MakeSlippery(min_wet_time = 10, wet_time_to_add = min(reac_volume*1.5, 60)) + T.MakeSlippery(TURF_WET_WATER, min_wet_time = 10, wet_time_to_add = min(reac_volume*1.5, 60)) for(var/mob/living/simple_animal/slime/M in T) M.apply_water()