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

This commit is contained in:
Anewbe
2019-03-02 20:34:49 -06:00
parent 85d332e94b
commit aade8c356f
89 changed files with 27 additions and 133 deletions
@@ -191,7 +191,6 @@ proc/cardinalrange(var/center)
icon_state = "box"
item_state = "electronic"
w_class = ITEMSIZE_LARGE
flags = CONDUCT
throwforce = 5
throw_speed = 1
throw_range = 2
+1 -3
View File
@@ -238,7 +238,7 @@ var/list/possible_cable_coil_colours = list(
shock(user, 5, 0.2)
else
if (W.flags & CONDUCT)
if(!(W.flags & NOCONDUCT))
shock(user, 50, 0.7)
src.add_fingerprint(user)
@@ -511,7 +511,6 @@ obj/structure/cable/proc/cableColor(var/colorC)
throw_speed = 2
throw_range = 5
matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20)
flags = CONDUCT
slot_flags = SLOT_BELT
item_state = "coil"
attack_verb = list("whipped", "lashed", "disciplined", "flogged")
@@ -932,7 +931,6 @@ obj/structure/cable/proc/cableColor(var/colorC)
throw_speed = 2
throw_range = 5
matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20)
flags = CONDUCT
slot_flags = SLOT_BELT
attack_verb = list("whipped", "lashed", "disciplined", "flogged")
stacktype = null
+2 -2
View File
@@ -430,7 +430,7 @@
if(M == user)
continue
M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2)
if(on && (W.flags & CONDUCT))
if(on && !(W.flags & NOCONDUCT))
//if(!user.mutations & COLD_RESISTANCE)
if (prob(12))
electrocute_mob(user, get_area(src), src, 0.3)
@@ -468,7 +468,7 @@
return
user << "You stick \the [W] into the light socket!"
if(has_power() && (W.flags & CONDUCT))
if(has_power() && !(W.flags & NOCONDUCT))
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()