From e607cd3c7d4a32cce49ac892dd3274b03b964ff8 Mon Sep 17 00:00:00 2001 From: Fermi Date: Sun, 2 Jun 2019 19:11:34 +0100 Subject: [PATCH] Fixes para's abilities to use other vehicles. --- code/datums/traits/negative.dm | 2 +- code/modules/vehicles/ridden.dm | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index a1a7c16098..aba9404d9a 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -245,7 +245,7 @@ /datum/quirk/prosthetic_limb/on_spawn() var/mob/living/carbon/human/H = quirk_holder var/limb_slot - if(H.has_trait("TRAIT_PARA"))//Prevent paraplegic legs being replaced + if(H.has_trait(TRAIT_PARA))//Prevent paraplegic legs being replaced limb_slot = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM) else limb_slot = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) diff --git a/code/modules/vehicles/ridden.dm b/code/modules/vehicles/ridden.dm index 72881e314f..8fe7322579 100644 --- a/code/modules/vehicles/ridden.dm +++ b/code/modules/vehicles/ridden.dm @@ -4,7 +4,7 @@ max_buckled_mobs = 1 buckle_lying = FALSE default_driver_move = FALSE - var/legs_required = 2 + var/legs_required = 1 var/arms_required = 0 //why not? /obj/vehicle/ridden/Initialize() @@ -31,6 +31,9 @@ /obj/vehicle/ridden/post_buckle_mob(mob/living/M) add_occupant(M) + if(M.get_num_legs() < legs_required) + to_chat(M, "You don't have enough legs to operate the pedals!") + unbuckle_mob(M) return ..() /obj/vehicle/ridden/attackby(obj/item/I, mob/user, params) @@ -60,11 +63,6 @@ if(key_type && !is_key(inserted_key)) to_chat(user, "[src] has no key inserted!") return FALSE - if(canmove && (user.get_num_legs() < legs_required)) - to_chat(user, "You don't have enough legs to operate the pedals!") - canmove = FALSE - addtimer(VARSET_CALLBACK(src, canmove, TRUE), 20) - return FALSE var/datum/component/riding/R = GetComponent(/datum/component/riding) R.handle_ride(user, direction) return ..()