Merge pull request #555 from ArchieBeepBoop/mobholderefactor

Mob Holder fixes + Micro Grab Fix
This commit is contained in:
Dahlular
2020-10-05 21:50:56 -06:00
committed by GitHub
6 changed files with 32 additions and 16 deletions
@@ -46,7 +46,7 @@
for(var/datum/mutation/human/HM in dna.mutations)
HM.on_move(src, NewLoc)
if(shoes)
if(shoes && shoes.type != /obj/item/clothing/head/mob_holder/micro)
if(!lying && !buckled)
if(loc == NewLoc)
if(!has_gravity(loc))
@@ -86,12 +86,10 @@
if(resting)
icon_state = "[chassis]_rest"
to_chat(src, "<span class='boldnotice'>You switch your holochassis projection composite to [chassis]</span>")
current_mob_holder?.Detach(src)
current_mob_holder = null
if(possible_chassis[chassis])
current_mob_holder = AddElement(/datum/element/mob_holder, chassis, 'icons/mob/pai_item_head.dmi', 'icons/mob/pai_item_rh.dmi', 'icons/mob/pai_item_lh.dmi', SLOT_HEAD)
else
current_mob_holder?.Detach(src)
current_mob_holder = null
return
/mob/living/silicon/pai/lay_down()
..()