From 63d3ebf7bddff58d68489dddb3ee43519cdd6124 Mon Sep 17 00:00:00 2001 From: Chap Date: Fri, 1 Nov 2024 16:06:14 +0100 Subject: [PATCH] [s] Fixes a thing (#27254) * Fixes flight * This slightly annoys me --------- Co-authored-by: adrermail@gmail.com --- code/modules/clothing/shoes/magboots.dm | 3 ++- code/modules/clothing/shoes/misc_shoes.dm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index b4df1a7be77..3fdcf020870 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -341,11 +341,12 @@ return var/atom/target = get_edge_target_turf(user, user.dir) //gets the user's direction + ADD_TRAIT(user, TRAIT_FLYING, "gravity_boots") if(user.throw_at(target, jumpdistance, jumpspeed, spin = FALSE, diagonals_first = TRUE, callback = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(callback_remove_trait), user, TRAIT_FLYING, "gravity_boots"))) - ADD_TRAIT(user, TRAIT_FLYING, "gravity_boots") playsound(src, 'sound/effects/stealthoff.ogg', 50, TRUE, 1) user.visible_message("[usr] dashes forward into the air!") recharging_time = world.time + recharging_rate cell.use(dash_cost) else + REMOVE_TRAIT(user, TRAIT_FLYING, "gravity_boots") to_chat(user, "Something prevents you from dashing forward!") diff --git a/code/modules/clothing/shoes/misc_shoes.dm b/code/modules/clothing/shoes/misc_shoes.dm index eb4cb5436ab..5ce6c2dff66 100644 --- a/code/modules/clothing/shoes/misc_shoes.dm +++ b/code/modules/clothing/shoes/misc_shoes.dm @@ -472,12 +472,13 @@ return var/atom/target = get_edge_target_turf(user, user.dir) //gets the user's direction + ADD_TRAIT(user, TRAIT_FLYING, "bhop_shoes") if(user.throw_at(target, jumpdistance, jumpspeed, spin = FALSE, diagonals_first = TRUE, callback = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(callback_remove_trait), user, TRAIT_FLYING, "bhop_shoes"))) - ADD_TRAIT(user, TRAIT_FLYING, "bhop_shoes") playsound(src, 'sound/effects/stealthoff.ogg', 50, TRUE, 1) user.visible_message("[usr] dashes forward into the air!") recharging_time = world.time + recharging_rate else + REMOVE_TRAIT(user, TRAIT_FLYING, "bhop_shoes") to_chat(user, "Something prevents you from dashing forward!") /obj/item/clothing/shoes/ducky