cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-29 16:19:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-07-19 20:26:42 -04:00
committed by GitHub
parent 2ad683220b
commit 0c8f80b5e1
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/resizing/resize_vr.dm
+1 -6
View File
@@ -278,13 +278,8 @@
// We need to be above a certain size ratio in order to do anything to the prey.
// For DISARM and HURT intent, this is >=0.75, for GRAB it is >=0.5
<<<<<<< HEAD
var/size_ratio = get_effective_size() - tmob.get_effective_size()
if((a_intent == I_GRAB || a_intent == I_DISARM) && size_ratio < 0.5) //CHOMPEDIT - more step changes
=======
var/size_ratio = get_effective_size(FALSE) - tmob.get_effective_size(TRUE)
if(a_intent == I_GRAB && size_ratio < 0.5)
>>>>>>> dfffdf986a... Merge pull request #13321 from Heroman3003/frame-traits
if((a_intent == I_GRAB || a_intent == I_DISARM) && size_ratio < 0.5) //CHOMPEDIT - more step changes
return FALSE
if(a_intent == I_HURT && size_ratio < 0.75)
return FALSE