cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes people on skateboards unable to pull things (#26191)

Browse Source 
* Makes people on skateboards unable to pull things

* Removes duplicate definition

* Contra review
This commit is contained in:
DGamerL
2024-08-04 09:07:03 +00:00
committed by GitHub
parent 7e09585464
commit 2f591a301c
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_globalvars/traits.dm
+2 -1
View File
@@ -98,7 +98,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_ABSTRACT_HANDS" = TRAIT_ABSTRACT_HANDS,
"TRAIT_LANGUAGE_LOCKED" = TRAIT_LANGUAGE_LOCKED,
"TRAIT_HAS_IV_BAG" = TRAIT_HAS_IV_BAG,
"TRAIT_NON_INFECTIOUS_ZOMBIE" = TRAIT_NON_INFECTIOUS_ZOMBIE
"TRAIT_NON_INFECTIOUS_ZOMBIE" = TRAIT_NON_INFECTIOUS_ZOMBIE,
"TRAIT_CANNOT_PULL" = TRAIT_CANNOT_PULL
),
/datum/mind = list(
code/datums/components/riding/riding.dm
+3 -5
View File
@@ -100,13 +100,11 @@
rider.stop_pulling()
RegisterSignal(rider, COMSIG_LIVING_TRY_PULL, PROC_REF(on_rider_try_pull))
/// This proc is called when the rider attempts to grab the thing they're riding, preventing them from doing so.
/// This proc is called when the rider attempts to grab something, preventing them from doing so.
/datum/component/riding/proc/on_rider_try_pull(mob/living/rider_pulling, atom/movable/target, force)
SIGNAL_HANDLER // COMSIG_LIVING_TRY_PULL
if(target == parent)
var/mob/living/ridden = parent
to_chat(ridden, "<span class='warning'>You can't pull [target]!</span>")
return COMSIG_LIVING_CANCEL_PULL
to_chat(rider_pulling, "<span class='warning'>You can't pull [target]!</span>")
return COMSIG_LIVING_CANCEL_PULL
/// Some ridable atoms may want to only show on top of the rider in certain directions, like wheelchairs
/datum/component/riding/proc/handle_vehicle_layer(dir)
code/modules/mob/living/living.dm
+1
View File
@@ -1002,6 +1002,7 @@
return
if(SEND_SIGNAL(src, COMSIG_LIVING_TRY_PULL, AM, force) & COMSIG_LIVING_CANCEL_PULL)
return FALSE
// If we're pulling something then drop what we're currently pulling and pull this instead.
AM.add_fingerprint(src)
if(pulling)
code/modules/vehicle/tg_vehicles/tg_vehicles.dm
-1
View File
@@ -227,7 +227,6 @@
/obj/tgvehicle/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE)
if(!force && occupant_amount() >= max_occupants)
return FALSE
return ..()
/obj/tgvehicle/zap_act(power, zap_flags)