First effort fix of the slimes integration with taur riding.

This commit is contained in:
Leshana
2018-04-22 15:24:48 -04:00
parent a8c684a99f
commit 2a4182cc8e
3 changed files with 17 additions and 11 deletions

View File

@@ -1060,16 +1060,18 @@ default behaviour is:
if(lying != lying_prev)
lying_prev = lying
update_transform()
//VOREStation Add
if(lying && LAZYLEN(buckled_mobs))
for(var/rider in buckled_mobs)
var/mob/living/L = rider
if(riding_datum)
riding_datum.force_dismount(L)
else
unbuckle_mob(L)
L.Stun(5)
//VOREStation Add End
//VOREStation Add
if(lying && LAZYLEN(buckled_mobs))
for(var/rider in buckled_mobs)
var/mob/living/L = rider
if(buckled_mobs[rider] != "riding")
continue // Only boot off riders
if(riding_datum)
riding_datum.force_dismount(L)
else
unbuckle_mob(L)
L.Stun(5)
//VOREStation Add End
return canmove
// Adds overlays for specific modifiers.

View File

@@ -36,7 +36,7 @@
targets |= hash
//Grab any viruses they have
if(LAZYLEN(target.virus2.len))
if(iscarbon(target) && LAZYLEN(target.virus2.len))
LAZYINITLIST(viruses)
var/datum/disease2/disease/virus = pick(target.virus2.len)
viruses[hash] = virus.getcopy()

View File

@@ -49,6 +49,8 @@
riding_datum = new /datum/riding/taur(src)
/mob/living/carbon/human/buckle_mob(mob/living/M, forced = FALSE, check_loc = TRUE)
if(forced)
return ..() // Skip our checks
if(!isTaurTail(tail_style))
return FALSE
if(lying)
@@ -66,6 +68,8 @@
return FALSE
. = ..()
if(.)
buckled_mobs[M] = "riding"
/mob/living/carbon/human/MouseDrop_T(mob/living/M, mob/living/user)
if(can_buckle && istype(M))