Various Tweaks and Changes (#9222)

This commit is contained in:
Geeves
2020-06-30 18:19:54 +02:00
committed by GitHub
parent 734ad579a2
commit 972c0ae9db
6 changed files with 97 additions and 16 deletions
@@ -59,6 +59,8 @@
to_chat(user, SPAN_NOTICE("You collect \the [I]."))
I.forceMove(src)
wrapped = I
wrapped.pixel_x = 0
wrapped.pixel_y = 0
update_icon()
return TRUE
if(feedback)
@@ -90,6 +92,12 @@
update_icon()
return ..()
/obj/item/gripper/CtrlClick(mob/user)
if(wrapped)
drop(get_turf(src))
return
to_chat(user, SPAN_WARNING("\The [src] isn't gripping anything!"))
/obj/item/gripper/verb/drop_item()
set name = "Drop Item"
set desc = "Release an item from your magnetic gripper."
@@ -98,8 +106,13 @@
drop(get_turf(src))
/obj/item/gripper/proc/drop(var/atom/target)
if(wrapped?.loc == src)
wrapped.forceMove(target)
if(wrapped)
if(wrapped.loc == src)
if(force_holder)
wrapped.force = force_holder
wrapped.forceMove(target)
force_holder = null
to_chat(loc, SPAN_NOTICE("You release \the [wrapped].")) // loc will always be the cyborg
wrapped = null
update_icon()
return TRUE
@@ -153,6 +166,8 @@
if(!isturf(target.loc))
return
grip_item(target, user)
else if (istype(target, /obj/machinery/mining)) // to prevent them from activating it by accident
return
else if (!just_dropped)
target.attack_ai(user)
just_dropped = FALSE
@@ -685,6 +685,7 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/extinguisher/mini(src) // For navigating space and/or low grav, and just being useful.
src.modules += new /obj/item/device/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws.
src.modules += new /obj/item/crowbar/robotic(src) // Base crowbar that all 'borgs should have access to.
src.modules += new /obj/item/storage/part_replacer(src)
src.emag = new /obj/item/gun/energy/plasmacutter/mounted(src)
/obj/item/robot_module/research
@@ -730,6 +731,7 @@ var/global/list/robot_modules = list(
src.modules += new /obj/item/extinguisher(src) // For navigating space and/or low grav, and just being useful.
src.modules += new /obj/item/device/flash(src) // Non-lethal tool that prevents any 'borg from going lethal on Crew so long as it's an option according to laws.
src.modules += new /obj/item/crowbar/robotic(src) // Base crowbar that all 'borgs should have access to.
src.modules += new /obj/item/storage/part_replacer(src)
src.emag = new /obj/item/hand_tele(src)
var/datum/matter_synth/nanite = new /datum/matter_synth/nanite(10000)