cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Borg, Gripper, and Integrated Circuit interaction update.

Browse Source
This commit is contained in:
Atermonera
2018-12-03 17:21:43 -08:00
committed by VirgoBot
parent 4579aed0ed
commit 0a77d0d70d
14 changed files with 174 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/integrated_electronics/core/assemblies.dm
View File

@@ -247,7 +247,7 @@
return TRUE
else if(istype(I, /obj/item/integrated_circuit))
if(!user.unEquip(I))
if(!user.unEquip(I) && !istype(user, /mob/living/silicon/robot)) //Robots cannot de-equip items in grippers.
return FALSE
if(add_circuit(I, user))
to_chat(user, "<span class='notice'>You slide \the [I] inside \the [src].</span>")
@@ -323,6 +323,12 @@
if(choice)
choice.ask_for_input(user)
/obj/item/device/electronic_assembly/attack_robot(mob/user as mob)
if(Adjacent(user))
return attack_self(user)
else
return ..()
/obj/item/device/electronic_assembly/emp_act(severity)
..()
for(var/atom/movable/AM in contents)