cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 22:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '179a607a90ad7ec62bdaff4e6fe72af60ee56442' of https://github.com/tgstation/tgstation into upstream-24-10b

Browse Source
This commit is contained in:
Majkl-J
2024-10-23 23:27:16 -07:00
parent c90e3e69b9 179a607a90
commit e59d8ba64b
4642 changed files with 25352 additions and 14167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/riding/riding_mob.dm
+6 -3
View File
@@ -13,7 +13,9 @@
var/can_use_abilities = FALSE
/// shall we require riders to go through the riding minigame if they arent in our friends list
var/require_minigame = FALSE
/// list of blacklisted abilities that cant be shared
/// unsharable abilities that we will force to be shared anyway
var/list/override_unsharable_abilities = list()
/// abilities that are always blacklisted from sharing
var/list/blacklist_abilities = list()
/datum/component/riding/creature/Initialize(mob/living/riding_mob, force = FALSE, ride_check_flags = NONE, potion_boost = FALSE)
@@ -174,6 +176,8 @@
for(var/datum/action/action as anything in ridden_creature.actions)
if(is_type_in_list(action, blacklist_abilities))
continue
if(!action.can_be_shared && !is_type_in_list(action, override_unsharable_abilities))
continue
action.GiveAction(rider)
/// Takes away the riding parent's abilities from the rider
@@ -412,7 +416,7 @@
if(human_user && is_clown_job(human_user.mind?.assigned_role))
// there's a new sheriff in town
playsound(movable_parent, 'sound/creatures/pony/clown_gallup.ogg', 50)
playsound(movable_parent, 'sound/mobs/non-humanoids/pony/clown_gallup.ogg', 50)
COOLDOWN_START(src, pony_trot_cooldown, 500 MILLISECONDS)
/datum/component/riding/creature/bear/handle_specials()
@@ -531,7 +535,6 @@
/datum/component/riding/creature/leaper
can_force_unbuckle = FALSE
can_use_abilities = TRUE
blacklist_abilities = list(/datum/action/cooldown/toggle_seethrough)
ride_check_flags = JUST_FRIEND_RIDERS
/datum/component/riding/creature/leaper/handle_specials()
code/datums/components/riding/riding_vehicle.dm
+4 -4
View File
@@ -15,19 +15,19 @@
if(!keycheck(rider))
if(z_move_flags & ZMOVE_FEEDBACK)
to_chat(rider, "<span class='warning'>[movable_parent] has no key inserted!</span>")
to_chat(rider, span_warning("[movable_parent] has no key inserted!"))
return COMPONENT_RIDDEN_STOP_Z_MOVE
if(HAS_TRAIT(rider, TRAIT_INCAPACITATED))
if(z_move_flags & ZMOVE_FEEDBACK)
to_chat(rider, "<span class='warning'>You cannot operate [movable_parent] right now!</span>")
to_chat(rider, span_warning("You cannot operate [movable_parent] right now!"))
return COMPONENT_RIDDEN_STOP_Z_MOVE
if(ride_check_flags & RIDER_NEEDS_LEGS && HAS_TRAIT(rider, TRAIT_FLOORED))
if(z_move_flags & ZMOVE_FEEDBACK)
to_chat(rider, "<span class='warning'>You can't seem to manage that while unable to stand up enough to move [movable_parent]...</span>")
to_chat(rider, span_warning("You can't seem to manage that while unable to stand up enough to move [movable_parent]..."))
return COMPONENT_RIDDEN_STOP_Z_MOVE
if(ride_check_flags & RIDER_NEEDS_ARMS && HAS_TRAIT(rider, TRAIT_HANDS_BLOCKED))
if(z_move_flags & ZMOVE_FEEDBACK)
to_chat(rider, "<span class='warning'>You can't seem to hold onto [movable_parent] to move it...</span>")
to_chat(rider, span_warning("You can't seem to hold onto [movable_parent] to move it..."))
return COMPONENT_RIDDEN_STOP_Z_MOVE
return COMPONENT_RIDDEN_ALLOW_Z_MOVE