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

Changes the knockout checks to incap all.

Browse Source 
Also stops micro interactions while flying.
This commit is contained in:
Cameron Lennox
2017-10-29 11:30:43 -04:00
parent 28e75a89aa
commit c99e7b51da
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/vore/resizing/resize_vr.dm
View File

@@ -141,6 +141,8 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
now_pushing = 0
if(src.get_effective_size() > tmob.get_effective_size())
var/mob/living/carbon/human/H = src
if(H.wings_flying == 1)
return 1 //Silently pass without a message.
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
src << "You carefully slither around [tmob]."
tmob << "[src]'s huge tail slithers past beside you!"
@@ -166,6 +168,14 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
*/
/mob/living/proc/handle_micro_bump_other(var/mob/living/tmob)
ASSERT(istype(tmob)) // Baby don't hurt me
if(ishuman(src))
var/mob/living/carbon/human/P = src
if(P.wings_flying == 1) //If they're flying, don't do any special interactions.
return
if(ishuman(tmob))
var/mob/living/carbon/human/D = tmob
if(D.wings_flying == 1) //if the prey is flying, don't smush them.
return
if(src.a_intent == I_DISARM && src.canmove && !src.buckled)
// If bigger than them by at least 0.75, move onto them and print message.