cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-12 08:27:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13909 from silicons/twitch_plays

Browse Source 
Twitch Plays: Clown Car
This commit is contained in:
DeltaFire
2021-01-01 04:14:26 +01:00
committed by Archie
parent 8c60d61428
commit 2b79e974eb
9 changed files with 3448 additions and 3303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/riding.dm
+2 -2
View File
@@ -130,7 +130,7 @@
//KEYS
/datum/component/riding/proc/keycheck(mob/user)
return !keytype || user.is_holding_item_of_type(keytype)
return !keytype || user?.is_holding_item_of_type(keytype)
//BUCKLE HOOKS
/datum/component/riding/proc/restore_position(mob/living/buckled_mob)
@@ -150,7 +150,7 @@
/datum/component/riding/proc/handle_ride(mob/user, direction)
var/atom/movable/AM = parent
if(user.incapacitated())
if(user && user.incapacitated())
Unbuckle(user)
return