mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 03:02:54 +00:00
First effort fix of the slimes integration with taur riding.
This commit is contained in:
@@ -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.
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user