Merge pull request #7924 from Kelenius/ofTablesAndPass

Removes FPRINT and TABLEPASS flags
This commit is contained in:
Chinsky
2015-01-30 16:17:41 +03:00
199 changed files with 272 additions and 496 deletions
+1 -1
View File
@@ -206,7 +206,7 @@ proc/cardinalrange(var/center)
icon_state = "box"
item_state = "electronic"
w_class = 4.0
flags = FPRINT | TABLEPASS | CONDUCT
flags = CONDUCT
throwforce = 5
throw_speed = 1
throw_range = 2
-1
View File
@@ -11,7 +11,6 @@
//directwired = 0
var/icon_state_on = "bbox_on"
var/icon_state_off = "bbox_off"
flags = FPRINT
density = 1
anchored = 1
var/on = 0
+1 -1
View File
@@ -477,7 +477,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
throw_speed = 2
throw_range = 5
matter = list("metal" = 50, "glass" = 20)
flags = TABLEPASS | FPRINT | CONDUCT
flags = CONDUCT
slot_flags = SLOT_BELT
item_state = "coil"
attack_verb = list("whipped", "lashed", "disciplined", "flogged")
+2 -3
View File
@@ -16,7 +16,7 @@
desc = "Used for building lights."
icon = 'icons/obj/lighting.dmi'
icon_state = "tube-construct-item"
flags = FPRINT | TABLEPASS| CONDUCT
flags = CONDUCT
var/fixture_type = "tube"
var/obj/machinery/light/newlight = null
var/sheets_refunded = 2
@@ -63,7 +63,7 @@
desc = "Used for building small lights."
icon = 'icons/obj/lighting.dmi'
icon_state = "bulb-construct-item"
flags = FPRINT | TABLEPASS| CONDUCT
flags = CONDUCT
fixture_type = "bulb"
sheets_refunded = 1
@@ -637,7 +637,6 @@
/obj/item/weapon/light
icon = 'icons/obj/lighting.dmi'
flags = FPRINT | TABLEPASS
force = 2
throwforce = 5
w_class = 2