Removes TABLEPASS and FPRINT flags

- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
This commit is contained in:
DZD
2015-02-10 17:41:37 -05:00
parent 8388cb49a1
commit b3a0c9a975
185 changed files with 415 additions and 587 deletions
@@ -8,7 +8,6 @@
amount_per_transfer_from_this = 5
volume = 30
possible_transfer_amounts = null
flags = FPRINT
var/mode = 1
var/charge_cost = 50
var/charge_tick = 0
@@ -8,7 +8,7 @@
amount_per_transfer_from_this = 2
possible_transfer_amounts = 2
volume = 10
flags = FPRINT | TABLEPASS | OPENCONTAINER
flags = OPENCONTAINER
var/label_text = ""
@@ -10,7 +10,7 @@
desc = "Just your average condiment container."
icon = 'icons/obj/food.dmi'
icon_state = "emptycondiment"
flags = FPRINT | TABLEPASS | OPENCONTAINER
flags = OPENCONTAINER
possible_transfer_amounts = list(1,5,10)
volume = 50
//Possible_states has the reagent id as key and a list of, in order, the icon_state, the name and the desc as values. Used in the on_reagent_change() to change names, descs and sprites.
@@ -172,7 +172,6 @@
volume = 10
amount_per_transfer_from_this = 10
possible_transfer_amounts = 10
flags = FPRINT | TABLEPASS
possible_states = list("ketchup" = list("condi_ketchup", "Ketchup", "You feel more American already."), "capsaicin" = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"), "soysauce" = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring"), "frostoil" = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage"), "sodiumchloride" = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably"), "blackpepper" = list("condi_pepper", "Pepper Mill", "Often used to flavor food or make people sneeze"), "cornoil" = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"), "sugar" = list("condi_sugar", "Sugar", "Tasty spacey sugar!"))
var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters.
@@ -6,7 +6,7 @@
desc = "yummy"
icon = 'icons/obj/drinks.dmi'
icon_state = null
flags = FPRINT | TABLEPASS | OPENCONTAINER
flags = OPENCONTAINER
var/gulp_size = 5 //This is now officially broken ... need to think of a nice way to fix it.
possible_transfer_amounts = list(5,10,25)
volume = 50
@@ -161,7 +161,7 @@
amount_per_transfer_from_this = 20
possible_transfer_amounts = null
volume = 150
flags = FPRINT | CONDUCT | TABLEPASS | OPENCONTAINER
flags = CONDUCT | OPENCONTAINER
/obj/item/weapon/reagent_containers/food/drinks/golden_cup/tournament_26_06_2011
desc = "A golden cup. It will be presented to a winner of tournament 26 june and name of the winner will be graved on it."
@@ -12,7 +12,7 @@
␍ amount_per_transfer_from_this = 10
␍ possible_transfer_amounts = list(5,10,15,25,30,50)
␍ volume = 50
␍ flags = FPRINT | TABLEPASS | OPENCONTAINER
␍ flags = OPENCONTAINER
␍ var/label_text = ""
@@ -230,7 +230,7 @@
␍ volume = 100
␍ amount_per_transfer_from_this = 10
␍ possible_transfer_amounts = list(5,10,15,25,30,50,100)
␍ flags = FPRINT | TABLEPASS | OPENCONTAINER
␍ flags = OPENCONTAINER
␍/obj/item/weapon/reagent_containers/glass/beaker/vial
␍ name = "vial"
@@ -240,7 +240,7 @@
␍ volume = 25
␍ amount_per_transfer_from_this = 10
␍ possible_transfer_amounts = list(5,10,15,25)
␍ flags = FPRINT | TABLEPASS | OPENCONTAINER
␍ flags = OPENCONTAINER
␍/obj/item/weapon/reagent_containers/glass/beaker/noreact
␍ name = "cryostasis beaker"
@@ -249,7 +249,7 @@
␍ g_amt = 500
␍ volume = 50
␍ amount_per_transfer_from_this = 10
␍ flags = FPRINT | TABLEPASS | OPENCONTAINER | NOREACT
␍ flags = OPENCONTAINER | NOREACT
␍/obj/item/weapon/reagent_containers/glass/beaker/bluespace
␍ name = "bluespace beaker"
@@ -259,7 +259,7 @@
␍ volume = 300
␍ amount_per_transfer_from_this = 10
␍ possible_transfer_amounts = list(5,10,15,25,30,50,100,300)
␍ flags = FPRINT | TABLEPASS | OPENCONTAINER
␍ flags = OPENCONTAINER
␍/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone
␍ New()
@@ -291,7 +291,7 @@
␍ amount_per_transfer_from_this = 20
␍ possible_transfer_amounts = list(5,10,15,25,30,50,80,100,120)
␍ volume = 120
␍ flags = FPRINT | OPENCONTAINER
␍ flags = OPENCONTAINER
␍ attackby(var/obj/D, mob/user as mob)
␍ if(isprox(D))
@@ -309,7 +309,7 @@
␍ volume = 15
␍ amount_per_transfer_from_this = 5
␍ possible_transfer_amounts = list(1,5,15)
␍ flags = FPRINT | TABLEPASS | OPENCONTAINER
␍ flags = OPENCONTAINER
␍/*
␍/obj/item/weapon/reagent_containers/glass/blender_jug
@@ -341,7 +341,6 @@
␍ amount_per_transfer_from_this = 20
␍ possible_transfer_amounts = list(10,20,30,60)
␍ volume = 120
␍ flags = FPRINT
␍/obj/item/weapon/reagent_containers/glass/dispenser
␍ name = "reagent glass"
@@ -349,7 +348,7 @@
␍ icon = 'icons/obj/chemical.dmi'
␍ icon_state = "beaker0"
␍ amount_per_transfer_from_this = 10
␍ flags = FPRINT | TABLEPASS | OPENCONTAINER
␍ flags = OPENCONTAINER
␍/obj/item/weapon/reagent_containers/glass/dispenser/surfactant
␍ name = "reagent glass (surfactant)"
@@ -9,7 +9,7 @@
item_state = "atoxinbottle"
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30)
flags = FPRINT | TABLEPASS | OPENCONTAINER
flags = OPENCONTAINER
volume = 30
New()
@@ -2,7 +2,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/robot
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,50,100)
flags = FPRINT | TABLEPASS | OPENCONTAINER
flags = OPENCONTAINER
volume = 60
var/reagent = ""
@@ -12,7 +12,7 @@
amount_per_transfer_from_this = 5
volume = 30
possible_transfer_amounts = list(1,2,3,4,5,10,15,20,25,30)
flags = FPRINT | TABLEPASS | OPENCONTAINER
flags = OPENCONTAINER
slot_flags = SLOT_BELT
/obj/item/weapon/reagent_containers/hypospray/attack_paw(mob/user as mob)
@@ -4,7 +4,7 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "cleaner"
item_state = "cleaner"
flags = TABLEPASS|OPENCONTAINER|FPRINT|NOBLUDGEON
flags = OPENCONTAINER | NOBLUDGEON
slot_flags = SLOT_BELT
throwforce = 0
w_class = 2.0
@@ -7,7 +7,6 @@
icon_state = "watertank"
density = 1
anchored = 0
flags = FPRINT
pressure_resistance = 2*ONE_ATMOSPHERE
var/amount_per_transfer_from_this = 10