Fixes a ton of shit with riding_datums

This commit is contained in:
Cyberboss
2017-02-27 12:10:29 -05:00
parent 72a93bae7d
commit ef7879545b
10 changed files with 28 additions and 15 deletions

View File

@@ -911,8 +911,7 @@
M.visible_message("<span class='warning'>[M] really can't seem to mount [src]...</span>")
return
if(!riding_datum)
riding_datum = new /datum/riding/human
riding_datum.ridden = src
riding_datum = new /datum/riding/human(src)
if(buckled_mobs && ((M in buckled_mobs) || (buckled_mobs.len >= max_buckled_mobs)))
return
if(buckled) //NO INFINITE STACKING!!

View File

@@ -55,6 +55,9 @@
//End bloody footprints
S.step_action()
/mob/living/carbon/human/Moved()
. = ..()
if(buckled_mobs && buckled_mobs.len && riding_datum)
riding_datum.on_vehicle_move()

View File

@@ -31,6 +31,7 @@
ranged_ability.remove_ranged_ability(src)
if(buckled)
buckled.unbuckle_mob(src,force=1)
QDEL_NULL(riding_datum)
for(var/mob/living/simple_animal/drone/D in player_list)
for(var/image/I in staticOverlays)
@@ -915,3 +916,8 @@
"[C] topples over [src]!", \
"[C] leaps out of [src]'s way!")]</span>")
C.Weaken(2)
/mob/living/post_buckle_mob(mob/living/M)
if(riding_datum)
riding_datum.handle_vehicle_offsets()
riding_datum.handle_vehicle_layer()

View File

@@ -75,3 +75,5 @@
var/list/implants = null
var/tesla_ignore = FALSE
var/datum/riding/riding_datum

View File

@@ -1010,8 +1010,7 @@
M.visible_message("<span class='warning'>[M] really can't seem to mount the [src]...</span>")
return
if(!riding_datum)
riding_datum = new /datum/riding/cyborg
riding_datum.ridden = src
riding_datum = new /datum/riding/cyborg(src)
if(buckled_mobs)
if(buckled_mobs.len >= max_buckled_mobs)
return

View File

@@ -540,11 +540,10 @@
if(tame && riding_datum)
riding_datum.handle_ride(user, direction)
/mob/living/simple_animal/Move(NewLoc,Dir=0,step_x=0,step_y=0)
/mob/living/simple_animal/Moved()
. = ..()
if(riding_datum)
riding_datum.handle_vehicle_layer()
riding_datum.handle_vehicle_offsets()
riding_datum.on_vehicle_move()
/mob/living/simple_animal/buckle_mob(mob/living/buckled_mob, force = 0, check_loc = 1)