From efd87b13c470296c8b42660e20a50e81a02dbdae Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 31 Jan 2021 04:46:53 +0100 Subject: [PATCH] [MIRROR] makes movement reset tolerance less harsh on jousting component, adds keycheck to mob riding (#2966) * makes movement reset tolerance less harsh on jousting component, adds keycheck to mob riding (#56497) the current tolerance on jousting is 2 deciseconds not enough to do fun stuff with any of the mobs you can ride on station like cows or goliaths, this is now 3 mob riding never had a keycheck so u could ride goliaths without a lasso and stuff like that * makes movement reset tolerance less harsh on jousting component, adds keycheck to mob riding Co-authored-by: Fikou --- code/datums/components/jousting.dm | 2 +- code/datums/components/riding/riding_mob.dm | 6 +++++- code/modules/mob/living/simple_animal/simple_animal.dm | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/code/datums/components/jousting.dm b/code/datums/components/jousting.dm index fcecf89f1d0..8710c5d58e1 100644 --- a/code/datums/components/jousting.dm +++ b/code/datums/components/jousting.dm @@ -3,7 +3,7 @@ var/max_tile_charge = 5 var/min_tile_charge = 2 //tiles before this code gets into effect. var/current_tile_charge = 0 - var/movement_reset_tolerance = 2 //deciseconds + var/movement_reset_tolerance = 3 //deciseconds var/unmounted_damage_boost_per_tile = 0 var/unmounted_knockdown_chance_per_tile = 0 var/unmounted_knockdown_time = 0 diff --git a/code/datums/components/riding/riding_mob.dm b/code/datums/components/riding/riding_mob.dm index e0df18cfda0..5ebbf21cb04 100644 --- a/code/datums/components/riding/riding_mob.dm +++ b/code/datums/components/riding/riding_mob.dm @@ -78,7 +78,11 @@ /datum/component/riding/creature/driver_move(atom/movable/movable_parent, mob/living/user, direction) if(!COOLDOWN_FINISHED(src, vehicle_move_cooldown)) return COMPONENT_DRIVER_BLOCK_MOVE - + if(!keycheck(user)) + if(ispath(keytype, /obj/item)) + var/obj/item/key = keytype + to_chat(user, "You need a [initial(key.name)] to ride [movable_parent]!") + return COMPONENT_DRIVER_BLOCK_MOVE var/mob/living/living_parent = parent var/turf/next = get_step(living_parent, direction) step(living_parent, direction) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index f0e85f32871..8ce159fc66a 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -232,7 +232,9 @@ /mob/living/simple_animal/attackby(obj/item/O, mob/user, params) if(!is_type_in_list(O, food_type)) return ..() - + if(stat == DEAD) + to_chat(user, "[capitalize(src)] is dead!") + return user.visible_message("[user] hand-feeds [O] to [src].", "You hand-feed [O] to [src].") qdel(O) if(tame)