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

View File

@@ -5,7 +5,6 @@
icon_state = "grille"
density = 1
anchored = 1
flags = CONDUCT
pressure_resistance = 5*ONE_ATMOSPHERE
layer = TABLE_LAYER
explosion_resistance = 1
@@ -151,7 +150,7 @@
return
//window placing end
else if(!(W.flags & CONDUCT) || !shock(user, 70))
else if((W.flags & NOCONDUCT) || !shock(user, 70))
user.setClickCooldown(user.get_attack_speed(W))
user.do_attack_animation(src)
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)

View File

@@ -7,7 +7,6 @@
anchored = 1.0
w_class = ITEMSIZE_NORMAL
plane = PLATING_PLANE
// flags = CONDUCT
/obj/structure/lattice/Initialize()
. = ..()

View File

@@ -6,7 +6,6 @@
icon_state = "target_stake"
density = 1
w_class = ITEMSIZE_HUGE
flags = CONDUCT
var/obj/item/target/pinned_target // the current pinned target
Move()