More Borg Gripper Bugfixes (#12197)

This commit is contained in:
Doxxmedearly
2021-07-17 12:05:56 -03:00
committed by GitHub
parent 0b081a8911
commit 28ff524ccc
5 changed files with 20 additions and 8 deletions
@@ -269,12 +269,13 @@
uneq_active()
/mob/living/silicon/robot/drop_from_inventory(var/obj/item/W, var/atom/target = null)
var/do_feedback = target ? FALSE : TRUE //Do not do feedback messages if dropping to a target, to avoid duplicate "You release X" messages.
if(W)
if(!target)
target = loc
if (istype(W.loc, /obj/item/gripper))
var/obj/item/gripper/G = W.loc
G.drop(target)
G.drop(target, do_feedback)
return TRUE
return FALSE
@@ -272,7 +272,8 @@
/obj/item/reagent_containers/food/drinks/sillycup,
/obj/item/reagent_containers/food/drinks/medcup,
/obj/item/smallDelivery,
/obj/item/gift
/obj/item/gift,
/obj/item/reagent_containers/chem_disp_cartridge
)
/obj/item/gripper/service //Used to handle food, drinks, and seeds.
@@ -292,7 +293,8 @@
/obj/item/smallDelivery,
/obj/item/gift,
/obj/item/stack/packageWrap,
/obj/item/stack/wrapping_paper
/obj/item/stack/wrapping_paper,
/obj/item/reagent_containers/chem_disp_cartridge //Drink cartridges
)
/obj/item/gripper/no_use //Used when you want to hold and put items in other things, but not able to 'use' the item
@@ -343,7 +343,7 @@
if(!right_flash)
to_chat(user, FONT_SMALL(SPAN_WARNING("It is lacking its right flash.")))
/obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob)
/obj/item/robot_parts/head/attackby(obj/item/W, mob/user)
..()
if(W.ismultitool())
if(law_manager)
@@ -354,9 +354,9 @@
law_manager = TRUE
if(istype(W, /obj/item/device/flash))
if(istype(user, /mob/living/silicon/robot))
var/current_module = user.get_active_hand()
if(current_module == W)
if(isrobot(user))
var/mob/living/silicon/robot/R = user
if(istype(R.module_active, /obj/item/device/flash))
to_chat(user, SPAN_WARNING("You cannot detach your own flash and install it into \the [src]."))
return
else