[MIRROR] Removes goliath rider reacharound (#1913)

* Removes goliath rider reacharound (#82550)

## About The Pull Request

Fixes tgstation/tgstation#82544 
Goliaths can't grab themselves with their tentacles and shouldn't grab
their riders either.
Now if you're riding a Goliath you simply can't be grabbed by tentacles,
they'd grab your mount instead (who is immune).

I didn't make this a carte blanche "your tame goliath will never
friendly fire you" because I want them to be able to do that when you
are not riding them.

## Changelog

:cl:
fix: Goliaths can't grab their own riders with tentacles
/:cl:

* Removes goliath rider reacharound

---------

Co-authored-by: Jacquerel <[email protected]>

code/datums/components/riding/riding.dm

@@ -30,6 +30,8 @@
 	var/list/allowed_turf_typecache
 	/// allow typecache for only certain turfs, forbid to allow all but those. allow only certain turfs will take precedence.
 	var/list/forbid_turf_typecache
+	/// additional traits to add to anyone riding this vehicle
+	var/list/rider_traits = list(TRAIT_NO_FLOATING_ANIM)
 	/// We don't need roads where we're going if this is TRUE, allow normal movement in space tiles
 	var/override_allow_spacemove = FALSE
 	/// can anyone other than the rider unbuckle the rider?
@@ -96,7 +98,7 @@
 	for (var/trait in GLOB.movement_type_trait_to_flag)
 		if (HAS_TRAIT(parent, trait))
 			REMOVE_TRAIT(rider, trait, REF(src))
-	REMOVE_TRAIT(rider, TRAIT_NO_FLOATING_ANIM, REF(src))
+	rider.remove_traits(rider_traits, REF(src))
 	if(!movable_parent.has_buckled_mobs())
 		qdel(src)
 
@@ -115,7 +117,7 @@
 	for (var/trait in GLOB.movement_type_trait_to_flag)
 		if (HAS_TRAIT(parent, trait))
 			ADD_TRAIT(rider, trait, REF(src))
-	ADD_TRAIT(rider, TRAIT_NO_FLOATING_ANIM, REF(src))
+	rider.add_traits(rider_traits, REF(src))
 
 /// This proc is called when the rider attempts to grab the thing they're riding, preventing them from doing so.
 /datum/component/riding/proc/on_rider_try_pull(mob/living/rider_pulling, atom/movable/target, force)

code/datums/components/riding/riding_mob.dm

@@ -458,6 +458,7 @@
 /datum/component/riding/creature/goliath
 	keytype = /obj/item/key/lasso
 	vehicle_move_delay = 4
+	rider_traits = list(TRAIT_NO_FLOATING_ANIM, TRAIT_TENTACLE_IMMUNE)
 
 /datum/component/riding/creature/goliath/deathmatch
 	keytype = null