cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 18:12:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Circuitry QoL (#9959)

Browse Source
This commit is contained in:
Geeves
2020-09-14 11:00:25 +02:00
committed by GitHub
parent 5b87eb39d3
commit 2f3eb8447b
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -263,7 +263,7 @@
update_icon()
return TRUE
else if(istype(I, /obj/item/device/integrated_electronics/wirer) || istype(I, /obj/item/device/integrated_electronics/debugger) || I.isscrewdriver())
else if(istype(I, /obj/item/device/integrated_electronics/wirer) || istype(I, /obj/item/device/integrated_electronics/debugger) || I.ismultitool() || I.isscrewdriver())
if(opened)
interact(user)
else

15
code/modules/integrated_electronics/core/integrated_circuit.dm
View File

@@ -201,6 +201,12 @@ a creative player the means to solve many problems. Circuits are held inside an
linked = locate(href_list["link"]) in pin.linked
var/obj/held_item = usr.get_active_hand()
var/obj/off_hand = usr.get_inactive_hand()
var/obj/item/device/multitool/M
if(held_item.ismultitool())
M = held_item
if(!M && off_hand?.ismultitool())
M = off_hand
if(href_list["rename"])
rename_component(usr)
@@ -211,25 +217,22 @@ a creative player the means to solve many problems. Circuits are held inside an
ea.interact(usr)
if(href_list["pin_name"])
if (!held_item.ismultitool() || !allow_multitool)
if(!M || !allow_multitool)
href_list["wire"] = 1
else
var/obj/item/device/multitool/M = held_item
M.wire(pin,usr)
if(href_list["pin_data"])
if (!held_item.ismultitool() || !allow_multitool)
if(!M || !allow_multitool)
href_list["wire"] = 1
else
var/datum/integrated_io/io = pin
io.ask_for_pin_data(usr) // The pins themselves will determine how to ask for data, and will validate the data.
if(href_list["pin_unwire"])
if (!held_item.ismultitool() || !allow_multitool)
if(!M || !allow_multitool)
href_list["wire"] = 1
else
var/obj/item/device/multitool/M = held_item
M.unwire(pin, linked, usr)
if(href_list["wire"])