Carps now go much faster when ridden without gravity (#4055)

* Carps now go much faster when ridden without gravity

* fix comment lol

Author: Absolucy

code/datums/components/riding/riding.dm

@@ -251,7 +251,7 @@
 /datum/component/riding/proc/driver_move(atom/movable/movable_parent, mob/living/user, direction)
 	SIGNAL_HANDLER
 	SHOULD_CALL_PARENT(TRUE)
-	movable_parent.set_glide_size(DELAY_TO_GLIDE_SIZE(vehicle_move_delay))
+	movable_parent.set_glide_size(DELAY_TO_GLIDE_SIZE(move_delay())) // monkestation edit: use move_delay() proc instead of raw vehicle_move_delay var
 
 /// So we can check all occupants when we bump a door to see if anyone has access
 /datum/component/riding/proc/vehicle_bump(atom/movable/movable_parent, obj/machinery/door/possible_bumped_door)

code/datums/components/riding/riding_mob.dm

@@ -103,7 +103,7 @@
 	var/turf/next = get_step(living_parent, direction)
 	step(living_parent, direction)
 	last_move_diagonal = ((direction & (direction - 1)) && (living_parent.loc == next))
-	COOLDOWN_START(src, vehicle_move_cooldown, (last_move_diagonal? 2 : 1) * vehicle_move_delay)
+	COOLDOWN_START(src, vehicle_move_cooldown, (last_move_diagonal ? 2 : 1) * move_delay()) // monkestation edit: use move_delay() proc instead of raw vehicle_move_delay var
 	return ..()
 
 /datum/component/riding/creature/keycheck(mob/user)

code/datums/components/riding/riding_structure.dm

@@ -28,7 +28,7 @@
 
 	step(movable_parent, direction)
 	last_move_diagonal = ((direction & (direction - 1)) && (movable_parent.loc == next))
-	COOLDOWN_START(src, vehicle_move_cooldown, (last_move_diagonal? 2 : 1) * vehicle_move_delay)
+	COOLDOWN_START(src, vehicle_move_cooldown, (last_move_diagonal? 2 : 1) * move_delay()) // monkestation edit: use move_delay() proc instead of raw vehicle_move_delay var
 
 	if(QDELETED(src))
 		return

code/datums/components/riding/riding_vehicle.dm

@@ -98,7 +98,7 @@
 
 	step(movable_parent, direction)
 	last_move_diagonal = ((direction & (direction - 1)) && (movable_parent.loc == next))
-	COOLDOWN_START(src, vehicle_move_cooldown, (last_move_diagonal? 2 : 1) * vehicle_move_delay)
+	COOLDOWN_START(src, vehicle_move_cooldown, (last_move_diagonal ? 2 : 1) * move_delay()) // monkestation edit: use move_delay() proc instead of raw vehicle_move_delay var
 
 	if(QDELETED(src))
 		return
@@ -214,7 +214,7 @@
 			COOLDOWN_START(src, message_cooldown, 0.75 SECONDS)
 		return COMPONENT_DRIVER_BLOCK_MOVE
 	return ..()
-	
+
 /datum/component/riding/vehicle/speedbike
 	vehicle_move_delay = 0
 	override_allow_spacemove = TRUE

monkestation/code/datums/components/riding/riding_mob.dm

@@ -0,0 +1,6 @@
+// Carps move 4x faster when ridden in space
+/datum/component/riding/creature/carp/move_delay()
+	. = ..()
+	var/mob/living/living_parent = parent
+	if(!living_parent.has_gravity())
+		. *= 0.25

monkestation/code/datums/components/riding/riding_vehicle.dm

@@ -0,0 +1,3 @@
+/// Returns the move delay of this vehicle.
+/datum/component/riding/proc/move_delay()
+	return vehicle_move_delay

monkestation/code/modules/mob/living/basic/space_fauna/carp/carp.dm

@@ -0,0 +1,3 @@
+/mob/living/basic/carp/on_tamed(mob/tamer, feedback = TRUE)
+	. = ..()
+	ai_controller?.change_ai_movement_type(/datum/ai_movement/jps)

tgstation.dme

@@ -5865,6 +5865,8 @@
 #include "monkestation\code\datums\components\turf_healing.dm"
 #include "monkestation\code\datums\components\uplink.dm"
 #include "monkestation\code\datums\components\wound_converter.dm"
+#include "monkestation\code\datums\components\riding\riding_mob.dm"
+#include "monkestation\code\datums\components\riding\riding_vehicle.dm"
 #include "monkestation\code\datums\diseases\advance\symptoms\clockwork.dm"
 #include "monkestation\code\datums\elements\area_locked.dm"
 #include "monkestation\code\datums\elements\basic_eating.dm"
@@ -7398,6 +7400,7 @@
 #include "monkestation\code\modules\mob\living\basic\pets\snake.dm"
 #include "monkestation\code\modules\mob\living\basic\pets\parrot\_parrot.dm"
 #include "monkestation\code\modules\mob\living\basic\pets\parrot\parrot_ai\parroting_action.dm"
+#include "monkestation\code\modules\mob\living\basic\space_fauna\carp\carp.dm"
 #include "monkestation\code\modules\mob\living\basic\space_fauna\slugcat\slugcat.dm"
 #include "monkestation\code\modules\mob\living\basic\trooper\syndicate.dm"
 #include "monkestation\code\modules\mob\living\basic\vermin\frog.dm"