cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-29 16:18:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "What was supposed to be another straightforward major system overhaul that once again spiraled out of control (#8220)"

Browse Source 
This reverts commit 4d8c43f106.
This commit is contained in:
atermonera
2022-03-29 16:01:32 -08:00
parent 20b60157eb
commit c7f1880394
312 changed files with 2273 additions and 1900 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/integrated_electronics/core/assemblies.dm
+4 -4
View File
@@ -233,7 +233,7 @@
visible_message("<span class='notice'>\The [user] waves \the [src] around [target].</span>")
/obj/item/device/electronic_assembly/attackby(var/obj/item/I, var/mob/user)
if(can_anchor && I.get_tool_quality(TOOL_WRENCH))
if(can_anchor && I.is_wrench())
anchored = !anchored
to_chat(user, span("notice", "You've [anchored ? "" : "un"]secured \the [src] to \the [get_turf(src)]."))
if(anchored)
@@ -252,14 +252,14 @@
interact(user)
return TRUE
else if(I.get_tool_quality(TOOL_CROWBAR))
else if(I.is_crowbar())
playsound(src, 'sound/items/Crowbar.ogg', 50, 1)
opened = !opened
to_chat(user, "<span class='notice'>You [opened ? "opened" : "closed"] \the [src].</span>")
update_icon()
return TRUE
else if(istype(I, /obj/item/device/integrated_electronics/wirer) || istype(I, /obj/item/device/integrated_electronics/debugger) || I.get_tool_quality(TOOL_SCREWDRIVER))
else if(istype(I, /obj/item/device/integrated_electronics/wirer) || istype(I, /obj/item/device/integrated_electronics/debugger) || I.is_screwdriver())
if(opened)
interact(user)
return TRUE
@@ -359,4 +359,4 @@
// Returns TRUE if I is something that could/should have a valid interaction. Used to tell circuitclothes to hit the circuit with something instead of the clothes
/obj/item/device/electronic_assembly/proc/is_valid_tool(var/obj/item/I)
return I.get_tool_quality(TOOL_CROWBAR) || I.get_tool_quality(TOOL_SCREWDRIVER) || istype(I, /obj/item/integrated_circuit) || istype(I, /obj/item/weapon/cell/device) || istype(I, /obj/item/device/integrated_electronics)
return I.is_crowbar() || I.is_screwdriver() || istype(I, /obj/item/integrated_circuit) || istype(I, /obj/item/weapon/cell/device) || istype(I, /obj/item/device/integrated_electronics)
code/modules/integrated_electronics/core/assemblies/device.dm
+1 -1
View File
@@ -12,7 +12,7 @@
. = ..()
/obj/item/device/assembly/electronic_assembly/attackby(obj/item/I as obj, mob/user as mob)
if (I.get_tool_quality(TOOL_CROWBAR))
if (I.is_crowbar())
toggle_open(user)
else if (opened)
EA.attackby(I, user)
code/modules/integrated_electronics/core/tools.dm
+1 -1
View File
@@ -274,7 +274,7 @@
/obj/item/weapon/tool/screwdriver,
/obj/item/device/multitool
)
cant_hold = list(/obj/item/weapon/tool/powerdrill)
cant_hold = list(/obj/item/weapon/tool/screwdriver/power)
/obj/item/weapon/storage/bag/circuits/basic/Initialize()
. = ..()