From e68f52b60995af32fa9a1b4831238b3eaf379b2d Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Wed, 7 Sep 2016 18:02:55 -0700 Subject: [PATCH] LOGGING CODE IS GARBAGE (SPEEDMERGE) ~~FIXES FREON LAG~~ (#20378) * LOGGING CODE IS GARBAGE (SPEEDMERGE) ~~FIXES FREON LAG~~ disables logging for freon ice slips, good thing we got profiling and witness testimonies * Update carbon_movement.dm --- code/game/turfs/open.dm | 1 - code/modules/mob/living/carbon/carbon_movement.dm | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 67016f82ca5..af9698bc99d 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -118,7 +118,6 @@ return 0 if(!(lube&SLIDE_ICE)) C << "You slipped[ O ? " on the [O.name]" : ""]!" - if(!C.slipping) C.attack_log += "\[[time_stamp()]\] Slipped[O ? " on the [O.name]" : ""][(lube&SLIDE)? " (LUBE)" : ""]!" if(!(lube&SLIDE_ICE)) playsound(C.loc, 'sound/misc/slip.ogg', 50, 1, -3) diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm index 0d0c8cb3ce4..479e9459c5c 100644 --- a/code/modules/mob/living/carbon/carbon_movement.dm +++ b/code/modules/mob/living/carbon/carbon_movement.dm @@ -11,7 +11,8 @@ var/const/GALOSHES_DONT_HELP = 4 var/const/SLIDE_ICE = 8 /mob/living/carbon/slip(s_amount, w_amount, obj/O, lube) - add_logs(src,, "slipped",, "on [O ? O.name : "floor"]") + if(!(lube&SLIDE_ICE)) + add_logs(src,, "slipped",, "on [O ? O.name : "floor"]") return loc.handle_slip(src, s_amount, w_amount, O, lube)