mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-23 20:17:15 +01:00
Updates scooping to work way better, tweaks
This commit is contained in:
@@ -125,7 +125,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
|
||||
* 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(var/mob/living/M)
|
||||
/mob/living/proc/attempt_to_scoop(var/mob/living/M, var/mob/living/G) //second one is for the Grabber, only exists for animals to self-grab
|
||||
var/size_diff = M.get_effective_size() - get_effective_size()
|
||||
if(!holder_default && holder_type)
|
||||
holder_default = holder_type
|
||||
@@ -140,7 +140,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
|
||||
return 0
|
||||
if(size_diff >= 0.50)
|
||||
holder_type = /obj/item/weapon/holder/micro
|
||||
var/obj/item/weapon/holder/m_holder = get_scooped(M)
|
||||
var/obj/item/weapon/holder/m_holder = get_scooped(M, G)
|
||||
holder_type = holder_default
|
||||
if (m_holder)
|
||||
return 1
|
||||
|
||||
Reference in New Issue
Block a user