cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

First effort fix of the slimes integration with taur riding.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

22
code/modules/mob/living/living.dm
View File

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

2
code/modules/reagents/reagent_containers/syringes_vr.dm
View File

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

4
code/modules/vore/appearance/sprite_accessories_taur_vr.dm
View File

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