Items are now assumed to be conductive, rather than the opposite

This commit is contained in:
Neerti
2019-03-28 21:45:38 -04:00
committed by Novacat
parent 5ca397fb43
commit 30b967e28a
89 changed files with 765 additions and 867 deletions
-1
View File
@@ -3,7 +3,6 @@
desc = "A small electronic device that should never exist."
icon = 'icons/obj/assemblies/new_assemblies.dmi'
icon_state = ""
flags = CONDUCT
w_class = ITEMSIZE_SMALL
matter = list(DEFAULT_WALL_MATERIAL = 100)
throwforce = 2
+2 -2
View File
@@ -3,7 +3,7 @@
icon = 'icons/obj/assemblies/new_assemblies.dmi'
icon_state = "holder"
item_state = "assembly"
flags = CONDUCT | PROXMOVE
flags = PROXMOVE
throwforce = 5
w_class = ITEMSIZE_SMALL
throw_speed = 3
@@ -233,7 +233,7 @@
tmr.time=5
tmr.secured = 1
tmr.holder = src
START_PROCESSING(SSobj, tmr)
START_PROCESSING(SSobj, tmr)
a_left = tmr
a_right = ign
secured = 1
-1
View File
@@ -6,7 +6,6 @@
var/obj/item/device/radio/electropack/part2 = null
var/status = 0
w_class = ITEMSIZE_HUGE
flags = CONDUCT
/obj/item/assembly/shock_kit/Destroy()
qdel(part1)