Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Removes goliath rider reacharound #2832

Merged
merged 1 commit into from
Apr 11, 2024
+5 −2
Merged

[MIRROR] Removes goliath rider reacharound #2832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions code/datums/components/riding/riding.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down Expand Up @@ -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)

Expand All @@ -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)
Expand Down
1 change: 1 addition & 0 deletions code/datums/components/riding/riding_mob.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading