cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 12:35:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52002 from ShizCalev/riding-component-fix

Browse Source 
fixes riding component check
This commit is contained in:
skoglol
2020-07-06 22:59:50 +02:00
committed by GitHub
parent def0d871e9 c2ab10d346
commit d32b69e83e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/riding.dm
+5 -1
View File
@@ -18,6 +18,7 @@
var/ride_check_rider_incapacitated = FALSE
var/ride_check_rider_restrained = FALSE
var/ride_check_ridden_incapacitated = FALSE
var/ride_check_ridden_restrained = FALSE
var/del_on_unbuckle_all = FALSE
@@ -64,7 +65,10 @@
/datum/component/riding/proc/ride_check(mob/living/M)
var/atom/movable/AM = parent
var/mob/AMM = AM
if((ride_check_rider_restrained && M.restrained(TRUE)) || (ride_check_rider_incapacitated && M.incapacitated(FALSE, TRUE)) || (ride_check_ridden_incapacitated && istype(AMM) && AMM.incapacitated(FALSE, TRUE)))
var/kick_us_off
if((ride_check_rider_restrained && M.restrained(TRUE)) || (ride_check_rider_incapacitated && M.incapacitated(TRUE, TRUE)))
kick_us_off = TRUE
if(kick_us_off || (istype(AMM) && ((ride_check_ridden_restrained && AMM.restrained(TRUE)) || (ride_check_ridden_incapacitated && AMM.incapacitated(TRUE, TRUE)))))
M.visible_message("<span class='warning'>[M] falls off of [AM]!</span>", \
"<span class='warning'>You fall off of [AM]!</span>")
AM.unbuckle_mob(M)