partially enable micro holding

This commit is contained in:
Dip
2020-10-02 14:40:10 -03:00
parent 0c9bc3e9d7
commit 4d39d175c4
4 changed files with 14 additions and 2 deletions
@@ -33,6 +33,7 @@
if(rh_icon)
righthand_file = rh_icon
/* This has no need to exist as default assimilate already got it all covered
/obj/item/clothing/head/mob_holder/micro/proc/assimilate(mob/living/M)
switch(M.mob_size)
if(MOB_SIZE_TINY)
@@ -43,6 +44,7 @@
w_class = WEIGHT_CLASS_BULKY
if(MOB_SIZE_LARGE)
w_class = WEIGHT_CLASS_HUGE
*/
/obj/item/clothing/head/mob_holder/micro/Destroy()
@@ -73,6 +75,8 @@
visible_message("<span class='warning'>[src] escapes [L]!")
release()
//The following code has been disabled, hopefully temporarily. - HS13 elements update
/*
/mob/living/proc/mob_pickup_micro(mob/living/L)
var/obj/item/clothing/head/mob_holder/micro/holder = generate_mob_holder()
if(!holder)
@@ -124,6 +128,8 @@
if(mob_try_pickup_micro(user))
return TRUE
*/
/obj/item/clothing/head/mob_holder/micro/assume_air(datum/gas_mixture/env)
var/atom/location = loc
if(!loc)
+1 -1
View File
@@ -162,7 +162,7 @@ mob/living/get_effective_size()
else
if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle")
tmob.visible_message("<span class='danger'>[src] snatches up [tmob] underneath their tail!</span>", "<span class='userdanger'>[src]'s tail winds around you and snatches you in its coils!</span>")
//tmob.mob_pickup_micro_feet(H)
//tmob.mob_pickup_micro_feet(H) //These two procs have been disabled. Hopefully temporarily.
else
tmob.visible_message("<span class='danger'>[src] stomps down on [tmob], curling their toes and picking them up!</span>", "<span class='userdanger'>[src]'s toes pin you down and curl around you, picking you up!</span>")
//tmob.mob_pickup_micro_feet(H)