Fixes for gripper interaction with frame parts and mecha equipment (#5025)

* possible fix

* truly a fix

* return of the lost comment

* and lost slash too

* stray not-my comment deleted

* added proper changelog

* replaced << with to_chat()
This commit is contained in:
Heroman3003
2018-03-19 11:50:05 -07:00
committed by Atermonera
parent 85e377f017
commit c8326c290c
4 changed files with 46 additions and 13 deletions
@@ -199,6 +199,21 @@
wrapped = null
//update_icon()
/obj/item/weapon/gripper/proc/drop_item_nm()
if(!wrapped)
for(var/obj/item/thing in src.contents)
thing.loc = get_turf(src)
return
if(wrapped.loc != src)
wrapped = null
return
wrapped.loc = get_turf(src)
wrapped = null
//update_icon()
/obj/item/weapon/gripper/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
if(wrapped) //The force of the wrapped obj gets set to zero during the attack() and afterattack().
force_holder = wrapped.force
@@ -1104,4 +1104,10 @@
return
/mob/living/silicon/robot/is_sentient()
return braintype != "Drone"
return braintype != "Drone"
/mob/living/silicon/robot/drop_item()
if(module_active && istype(module_active,/obj/item/weapon/gripper))
var/obj/item/weapon/gripper/G = module_active
G.drop_item_nm()