cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 21:49:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dogborg-end

Browse Source
This commit is contained in:
Heroman3003
2023-08-07 20:05:05 +10:00
committed by GitHub
parent 9a53b3ab6a 8ef4ccf3be
commit 93082debc0
121 changed files with 67810 additions and 10116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/resizing/resize_vr.dm
+2 -2
View File
@@ -171,7 +171,7 @@
* Attempt to scoop up this mob up into H's hands, if the size difference is large enough.
* @return false if normal code should continue, 1 to prevent normal code.
*/
/mob/living/proc/attempt_to_scoop(mob/living/M, mob/living/G) //second one is for the Grabber, only exists for animals to self-grab
/mob/living/proc/attempt_to_scoop(mob/living/M, mob/living/G, ignore_size = FALSE) //second one is for the Grabber, only exists for animals to self-grab
if(!(pickup_pref && M.pickup_pref && M.pickup_active))
return 0
if(!(M.a_intent == I_HELP))
@@ -185,7 +185,7 @@
var/mob/living/simple_mob/SA = M
if(!SA.has_hands)
return 0
if(size_diff >= 0.50 || mob_size < MOB_SMALL || size_diff >= get_effective_size())
if(size_diff >= 0.50 || mob_size < MOB_SMALL || size_diff >= get_effective_size() || ignore_size)
if(buckled)
to_chat(usr,"<span class='notice'>You have to unbuckle \the [src] before you pick them up.</span>")
return 0