From 38ec5563dc751c5a6947559336d59f8ca56e8e6d Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Mon, 19 Jun 2017 14:57:25 -0400 Subject: [PATCH] Fixes slips --- .../game/objects/effects/effect_system/effects_foam.dm | 2 +- code/game/objects/items/devices/PDA/PDA_types.dm | 2 +- code/game/objects/items/weapons/clown_items.dm | 2 +- code/game/objects/structures/watercloset.dm | 2 +- code/game/turfs/turf.dm | 10 +++++----- code/modules/hydroponics/grown/banana.dm | 2 +- code/modules/hydroponics/plant_genes.dm | 4 ++-- code/modules/surgery/organs/vocal_cords.dm | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index 18f7022ecae..a4bb54dfb24 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -95,7 +95,7 @@ /obj/effect/particle_effect/foam/Crossed(atom/movable/AM) if(istype(AM, /mob/living/carbon)) var/mob/living/carbon/M = AM - M.slip(5, src) + M.slip(100, src) /obj/effect/particle_effect/foam/metal/Crossed(atom/movable/AM) return diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm index 546a80d9ac3..573e6196496 100644 --- a/code/game/objects/items/devices/PDA/PDA_types.dm +++ b/code/game/objects/items/devices/PDA/PDA_types.dm @@ -10,7 +10,7 @@ /obj/item/device/pda/clown/Crossed(AM as mob|obj) if (istype(AM, /mob/living/carbon)) var/mob/living/carbon/M = AM - if(M.slip(6, src, NO_SLIP_WHEN_WALKING)) + if(M.slip(120, src, NO_SLIP_WHEN_WALKING)) if (ishuman(M) && (M.real_name != src.owner)) if (istype(src.cartridge, /obj/item/weapon/cartridge/virus/clown)) var/obj/item/weapon/cartridge/virus/cart = src.cartridge diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 91f8872bcca..d2e1bd1a5cb 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -50,7 +50,7 @@ /obj/item/weapon/soap/Crossed(AM as mob|obj) if (istype(AM, /mob/living/carbon)) var/mob/living/carbon/M = AM - M.slip(4, src) + M.slip(80, src) /obj/item/weapon/soap/afterattack(atom/target, mob/user, proximity) if(!proximity || !check_allowed_items(target)) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index b4516f6e6a5..60d6df6fe9f 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -281,7 +281,7 @@ var/mob/living/L = O if(wash_mob(L)) //it's a carbon mob. var/mob/living/carbon/C = L - C.slip(4,null,NO_SLIP_WHEN_WALKING) + C.slip(80,null,NO_SLIP_WHEN_WALKING) else wash_obj(O) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 8f2c0c8f676..8a9fb55b419 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -168,17 +168,17 @@ return switch(wet) if(TURF_WET_WATER) - if(!M.slip(3, null, NO_SLIP_WHEN_WALKING)) + if(!M.slip(60, null, NO_SLIP_WHEN_WALKING)) M.inertia_dir = 0 if(TURF_WET_LUBE) - if(M.slip(4, null, (SLIDE|GALOSHES_DONT_HELP))) + if(M.slip(80, null, (SLIDE|GALOSHES_DONT_HELP))) M.confused = max(M.confused, 8) if(TURF_WET_ICE) - M.slip(6, null, (SLIDE|GALOSHES_DONT_HELP)) + M.slip(120, null, (SLIDE|GALOSHES_DONT_HELP)) if(TURF_WET_PERMAFROST) - M.slip(6, null, (SLIDE_ICE|GALOSHES_DONT_HELP)) + M.slip(120, null, (SLIDE_ICE|GALOSHES_DONT_HELP)) if(TURF_WET_SLIDE) - M.slip(4, null, (SLIDE|GALOSHES_DONT_HELP)) + M.slip(80, null, (SLIDE|GALOSHES_DONT_HELP)) //melting if(isobj(AM) && air && air.temperature > T0C) var/obj/O = AM diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index 3cf9c99b6fd..91b096bc389 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -117,5 +117,5 @@ /obj/item/weapon/grown/bananapeel/specialpeel/Crossed(AM) if(iscarbon(AM)) var/mob/living/carbon/carbon = AM - if(carbon.slip(2, src, FALSE)) + if(carbon.slip(40, src, FALSE)) qdel(src) diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 4e22e42ab96..3f6e30e02d0 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -214,9 +214,9 @@ return if(!istype(G, /obj/item/weapon/grown/bananapeel) && (!G.reagents || !G.reagents.has_reagent("lube"))) - stun_len /= 3 + stun_len /= 1.5 - var/knockdown = min(stun_len, 7) + var/knockdown = min(stun_len, 14) if(M.slip(knockdown, G)) for(var/datum/plant_gene/trait/T in seed.genes) diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index 09e3d4e48f0..1293b569d32 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -555,7 +555,7 @@ addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, get_turf(user), 'sound/items/bikehorn.ogg', 300, 1), 25) if(user.mind && user.mind.assigned_role == "Clown") for(var/mob/living/carbon/C in listeners) - C.slip(0,7 * power_multiplier) + C.slip(140 * power_multiplier) cooldown = COOLDOWN_MEME //RIGHT ROUND