From d1a2d1d0bdf0b86e266f4fb164dfe42db35606a6 Mon Sep 17 00:00:00 2001 From: Robustin Date: Tue, 10 May 2016 23:52:05 -0400 Subject: [PATCH] SLIP-SANITY (#17096) * Chemo * CHEMO * Chemo * Update growninedible.dm * Corrected math * decimals needs 0's * NOW EVERYBODIES HAPPY YAYYY * Updated Botany nerf * Conflict correction & tweaks --- code/game/objects/items/devices/PDA/PDA_types.dm | 4 ++-- code/game/turfs/turf.dm | 7 +++++-- code/modules/hydroponics/plant_genes.dm | 8 ++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm index 3ee33acd12f..b3c9fa46254 100644 --- a/code/game/objects/items/devices/PDA/PDA_types.dm +++ b/code/game/objects/items/devices/PDA/PDA_types.dm @@ -9,7 +9,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(8, 5, src, NO_SLIP_WHEN_WALKING)) + if(M.slip(0, 6, src, NO_SLIP_WHEN_WALKING)) if (ishuman(M) && (M.real_name != src.owner)) if (istype(src.cartridge, /obj/item/weapon/cartridge/clown)) var/obj/item/weapon/cartridge/clown/cart = src.cartridge @@ -197,4 +197,4 @@ /obj/item/device/pda/geneticist name = "geneticist PDA" default_cartridge = /obj/item/weapon/cartridge/medical - icon_state = "pda-genetics" \ No newline at end of file + icon_state = "pda-genetics" diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index ea8622dd70b..06b7a07c466 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -101,10 +101,13 @@ var/mob/living/carbon/M = AM switch(wet) if(TURF_WET_WATER) - if(!M.slip(3, 1, null, NO_SLIP_WHEN_WALKING)) + if(!M.slip(0, 3, null, NO_SLIP_WHEN_WALKING)) M.inertia_dir = 0 if(TURF_WET_LUBE) - M.slip(0, 7, null, (SLIDE|GALOSHES_DONT_HELP)) + M.slip(0, 4, null, (SLIDE|GALOSHES_DONT_HELP)) + M.confused += 8 + if(TURF_WET_ICE) + M.slip(0, 6, null, (SLIDE|GALOSHES_DONT_HELP)) if(TURF_WET_ICE || TURF_WET_PERMAFROST) M.slip(0, 4, null, (SLIDE|NO_SLIP_WHEN_WALKING)) diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 40f012af0d3..4f120caf00e 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -188,15 +188,15 @@ var/obj/item/seeds/seed = G.seed var/mob/living/carbon/M = target - var/stun_len = seed.potency * rate + var/stun_len = seed.potency * rate * 0.8 if(istype(G) && ispath(G.trash, /obj/item/weapon/grown)) return if(!istype(G, /obj/item/weapon/grown/bananapeel) && (!G.reagents || !G.reagents.has_reagent("lube"))) stun_len /= 3 - var/stun = max(stun_len * 2, 1) - var/weaken = max(stun_len, 0.5) + var/stun = min(stun_len, 7) + var/weaken = min(stun_len, 7) if(M.slip(stun, weaken, G)) for(var/datum/plant_gene/trait/T in seed.genes) @@ -309,4 +309,4 @@ /datum/plant_gene/trait/maxchem/on_new(obj/item/weapon/reagent_containers/food/snacks/grown/G, newloc) ..() - G.reagents.maximum_volume *= rate \ No newline at end of file + G.reagents.maximum_volume *= rate