diff --git a/code/ATMOSPHERICS/chiller.dm b/code/ATMOSPHERICS/chiller.dm index 3aa8b0af271..b130f4327dd 100644 --- a/code/ATMOSPHERICS/chiller.dm +++ b/code/ATMOSPHERICS/chiller.dm @@ -96,11 +96,11 @@ // AUTOFIXED BY fix_string_idiocy.py // C:\Users\Rob\Documents\Projects\vgstation13\code\ATMOSPHERICS\chiller.dm:95: dat += "Power Level: [cell ? round(cell.percent(),1) : 0]%

" dat += {"Power Level: [cell ? round(cell.percent(),1) : 0]%

- Set Temperature: - - + Set Temperature: + - - - [temp]°C - + + [temp]°C + + +
"} // END AUTOFIX user.set_machine(src) diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port_construction.dm b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port_construction.dm index a188650844a..1f4d462c3c6 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port_construction.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port_construction.dm @@ -6,7 +6,7 @@ icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi' icon_state = "port2" w_class = 4 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 /obj/item/rust_fuel_assembly_port_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor_construction.dm b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor_construction.dm index 46762526c9b..1931fce6f01 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor_construction.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor_construction.dm @@ -6,7 +6,7 @@ icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi' icon_state = "fuel_compressor0" w_class = 4 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 /obj/item/rust_fuel_compressor_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) diff --git a/code/WorkInProgress/SkyMarshal/officer_stuff.dm b/code/WorkInProgress/SkyMarshal/officer_stuff.dm index 3bfac7e3be7..ac815e8e214 100644 --- a/code/WorkInProgress/SkyMarshal/officer_stuff.dm +++ b/code/WorkInProgress/SkyMarshal/officer_stuff.dm @@ -5,13 +5,13 @@ name = "officers beret" desc = "A black beret adorned with the shield—a silver kite shield with an engraved sword—of the NanoTrasen security forces, announcing to the world that the wearer is a defender of NanoTrasen." icon_state = "centcomofficerberet" - flags = FPRINT | TABLEPASS + flags = FPRINT /obj/item/clothing/head/beret/centcom/captain name = "captains beret" desc = "A white beret adorned with the shield—a cobalt kite shield with an engraved sword—of the NanoTrasen security forces, worn only by those captaining a vessel of the NanoTrasen Navy." icon_state = "centcomcaptain" - flags = FPRINT | TABLEPASS + flags = FPRINT /obj/item/clothing/shoes/centcom name = "dress shoes" diff --git a/code/WorkInProgress/autopsy.dm b/code/WorkInProgress/autopsy.dm index 3367b11f228..8fd6c232f70 100644 --- a/code/WorkInProgress/autopsy.dm +++ b/code/WorkInProgress/autopsy.dm @@ -7,7 +7,7 @@ desc = "Extracts information on wounds." icon = 'icons/obj/autopsy_scanner.dmi' icon_state = "" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 w_class = 1.0 origin_tech = "materials=1;biotech=1" diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 3e186b19df5..83d10e2fb07 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -305,7 +305,6 @@ var/list/DummyCache = list() D.flags=initial(D.flags) D.pass_flags=initial(D.pass_flags) if(pass_flags&PASSTABLE) - D.flags |= TABLEPASS D.pass_flags |= PASSTABLE if(targetturf.density && targetturf != get_turf(target)) diff --git a/code/defines/obj.dm b/code/defines/obj.dm index bcb824f3789..c06ef0bd755 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -341,7 +341,7 @@ var/global/list/PDA_Manifest = list() throwforce = 0.0 throw_speed = 1 throw_range = 20 - flags = FPRINT | USEDELAY | TABLEPASS + flags = FPRINT | USEDELAY siemens_coefficient = 1 /obj/item/weapon/beach_ball/afterattack(atom/target as mob|obj|turf|area, mob/user as mob) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 17aaaf2c289..d71ede92e96 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -3,7 +3,7 @@ desc = "Should anything ever go wrong..." icon = 'icons/obj/items.dmi' icon_state = "red_phone" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 3.0 throwforce = 2.0 @@ -27,7 +27,6 @@ anchored = 0.0 var/matter = 0 var/mode = 1 - flags = TABLEPASS w_class = 3.0 /obj/item/weapon/bananapeel @@ -109,7 +108,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "cane" item_state = "stick" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 5.0 throwforce = 7.0 @@ -135,7 +134,7 @@ name = "dummy" invisibility = 101.0 anchored = 1.0 - flags = TABLEPASS + flags = 0 /obj/item/weapon/dummy/ex_act() return @@ -163,7 +162,7 @@ gender = PLURAL icon = 'icons/obj/items.dmi' icon_state = "handcuff" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 throwforce = 0 w_class = 3.0 @@ -176,7 +175,7 @@ gender = NEUTER icon = 'icons/obj/weapons.dmi' icon_state = "bolas" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT throwforce = 2 @@ -432,7 +431,7 @@ throw_speed = 1 throw_range = 5 w_class = 2.0 - flags = FPRINT | TABLEPASS + flags = FPRINT attack_verb = list("warned", "cautioned", "smashed") proximity_sign @@ -495,7 +494,7 @@ desc = "Parts of a rack." icon = 'icons/obj/items.dmi' icon_state = "rack_parts" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 m_amt = 3750 w_type = RECYK_METAL @@ -536,7 +535,7 @@ var/traitor_frequency = 0.0 var/mob/currentUser = null var/obj/item/device/radio/origradio = null - flags = FPRINT | TABLEPASS | CONDUCT | ONBELT + flags = FPRINT | CONDUCT | ONBELT w_class = 2.0 item_state = "radio" throw_speed = 4 @@ -579,7 +578,7 @@ var/selfdestruct = 0.0 var/traitor_frequency = 0.0 var/obj/item/device/radio/origradio = null - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT item_state = "radio" @@ -602,7 +601,7 @@ throw_speed = 1 throw_range = 5 w_class = 2.0 - flags = FPRINT | TABLEPASS | NOSHIELD + flags = FPRINT | NOSHIELD attack_verb = list("bludgeoned", "whacked", "disciplined") /obj/item/weapon/staff/broom @@ -622,7 +621,7 @@ throw_speed = 1 throw_range = 5 w_class = 2.0 - flags = FPRINT | TABLEPASS | NOSHIELD + flags = FPRINT | NOSHIELD /obj/item/weapon/table_parts name = "table parts" @@ -633,7 +632,7 @@ m_amt = 3750 w_type = RECYK_METAL melt_temperature=MELTPOINT_STEEL - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 attack_verb = list("slammed", "bashed", "battered", "bludgeoned", "thrashed", "whacked") @@ -649,14 +648,14 @@ m_amt = 7500 w_type = RECYK_METAL melt_temperature=MELTPOINT_STEEL - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 /obj/item/weapon/table_parts/wood name = "wooden table parts" desc = "Keep away from fire." icon_state = "wood_tableparts" - flags = null + flags = 0 /obj/item/weapon/table_parts/wood/cultify() return @@ -683,7 +682,7 @@ icon_state = "std_module" w_class = 2.0 item_state = "electronic" - flags = FPRINT|TABLEPASS + flags = FPRINT siemens_coefficient = 1 var/mtype = 1 // 1=electronic 2=hardware @@ -717,7 +716,7 @@ desc = "Meat that appears...strange..." icon = 'icons/obj/food.dmi' icon_state = "meat" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 w_class = 1.0 origin_tech = "biotech=2" @@ -727,7 +726,7 @@ desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood." icon = 'icons/obj/weapons.dmi' icon_state = "hatchet" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 12.0 w_class = 2.0 @@ -762,7 +761,7 @@ w_class = 4.0 m_amt = 15000 w_type = RECYK_METAL - flags = FPRINT | TABLEPASS | NOSHIELD + flags = FPRINT | NOSHIELD slot_flags = SLOT_BACK origin_tech = "materials=2;combat=2" attack_verb = list("chopped", "sliced", "cut", "reaped") @@ -784,7 +783,7 @@ w_class = 1 throwforce = 2 var/cigarcount = 6 - flags = ONBELT | TABLEPASS */ + flags = ONBELT */ /obj/item/weapon/pai_cable desc = "A flexible coated cable with a universal jack on one end." diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index d8b504d71b0..758b552463c 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -3,7 +3,7 @@ desc = "An arcane weapon wielded by the followers of Nar-Sie" icon_state = "cultblade" item_state = "cultblade" - flags = FPRINT | TABLEPASS + flags = FPRINT w_class = 4 force = 30 throwforce = 10 @@ -36,7 +36,7 @@ icon_state = "culthood" desc = "A hood worn by the followers of Nar-Sie." flags_inv = HIDEFACE - flags = FPRINT|TABLEPASS|HEADCOVERSEYES + flags = FPRINT|HEADCOVERSEYES armor = list(melee = 30, bullet = 10, laser = 5,energy = 5, bomb = 0, bio = 0, rad = 0) cold_protection = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECITON_TEMPERATURE @@ -58,7 +58,7 @@ desc = "A set of armored robes worn by the followers of Nar-Sie" icon_state = "cultrobes" item_state = "cultrobes" - flags = FPRINT | TABLEPASS + flags = FPRINT body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade) armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0) @@ -74,7 +74,7 @@ item_state = "magus" desc = "A helm worn by the followers of Nar-Sie." flags_inv = HIDEFACE - flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR + flags = FPRINT|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR armor = list(melee = 30, bullet = 30, laser = 30,energy = 20, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0 @@ -83,7 +83,7 @@ desc = "A set of armored robes worn by the followers of Nar-Sie" icon_state = "magusred" item_state = "magusred" - flags = FPRINT | TABLEPASS + flags = FPRINT body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade) armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index e85b3e5accc..a69c017630c 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -198,7 +198,7 @@ var/global/list/rune_list = list() // HOLY FUCK WHY ARE WE LOOPING THROUGH THE W throw_speed = 1 throw_range = 5 w_class = 2.0 - flags = FPRINT | TABLEPASS + flags = FPRINT var/notedat = "" var/tomedat = "" var/list/words = list("ire" = "ire", "ego" = "ego", "nahlizet" = "nahlizet", "certum" = "certum", "veri" = "veri", "jatkaa" = "jatkaa", "balaq" = "balaq", "mgar" = "mgar", "karazet" = "karazet", "geeri" = "geeri") diff --git a/code/game/gamemodes/events/holidays/Christmas.dm b/code/game/gamemodes/events/holidays/Christmas.dm index ee342ca1d1c..dc1f54261fb 100644 --- a/code/game/gamemodes/events/holidays/Christmas.dm +++ b/code/game/gamemodes/events/holidays/Christmas.dm @@ -55,6 +55,6 @@ icon_state = "xmashat" desc = "A crappy paper hat that you are REQUIRED to wear." flags_inv = 0 - flags = FPRINT|TABLEPASS + flags = FPRINT armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 716ef37c118..85f65993339 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -138,7 +138,7 @@ /obj/effect/meteor/big name = "big meteor" - pass_flags = null //Nope, you're not dodging that table + pass_flags = 0 //Nope, you're not dodging that table /obj/effect/meteor/big/ex_act(severity) return diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index fa1b9717c97..ad26b03789d 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -2,7 +2,7 @@ name = "pinpointer" icon = 'icons/obj/device.dmi' icon_state = "pinoff" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT w_class = 2.0 diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 56311b96321..5c8de7f27cd 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -5,7 +5,7 @@ item_state = "shard-soulstone" desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefacts power." w_class = 1.0 - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT origin_tech = "bluespace=4;materials=4" var/imprinted = "empty" @@ -85,7 +85,7 @@ icon = 'icons/obj/wizard.dmi' icon_state = "construct" desc = "A wicked machine used by those skilled in magical arts. It is inactive." - flags = FPRINT | TABLEPASS + flags = FPRINT /obj/structure/constructshell/cultify() return diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 70052d1e400..70e369595dd 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -6,7 +6,7 @@ throw_speed = 1 throw_range = 5 w_class = 1.0 - flags = FPRINT | TABLEPASS + flags = FPRINT var/uses = 5 var/temp = null var/max_uses = 5 diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index 4290954dc49..e7931d76ed6 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -124,7 +124,7 @@ obj/machinery/door/airlock/New() desc = "Used for repairing or building airlock sensors" icon = 'icons/obj/airlock_machines.dmi' icon_state = "airlock_sensor_off" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 /obj/item/airlock_sensor_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -290,7 +290,7 @@ obj/machinery/airlock_sensor/attackby(var/obj/item/W, var/mob/user) desc = "Used for repairing or building airlock access buttons" icon = 'icons/obj/airlock_machines.dmi' icon_state = "access_button_build" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 /obj/item/access_button_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 977c58d17e3..49963cf42ae 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -925,7 +925,7 @@ Code shamelessly copied from apc_frame desc = "Used for building Air Alarms" icon = 'icons/obj/monitors.dmi' icon_state = "alarm_bitem" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 m_amt = 2*CC_PER_SHEET_METAL melt_temperature = MELTPOINT_STEEL @@ -1240,7 +1240,7 @@ Code shamelessly copied from apc_frame desc = "Used for building Fire Alarms" icon = 'icons/obj/monitors.dmi' icon_state = "fire_bitem" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 m_amt=2*CC_PER_SHEET_METAL melt_temperature = MELTPOINT_STEEL diff --git a/code/game/machinery/bees_items.dm b/code/game/machinery/bees_items.dm index bb96b811c7e..3c9e185bc23 100644 --- a/code/game/machinery/bees_items.dm +++ b/code/game/machinery/bees_items.dm @@ -64,7 +64,7 @@ name = "bottle of BeezEez" icon = 'icons/obj/chemical.dmi' icon_state = "bottle17" - flags = FPRINT | TABLEPASS + flags = FPRINT /obj/item/beezeez/New() . = ..() diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index 11abfc1465a..63f4d2c39cc 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -9,7 +9,7 @@ throw_speed = 2 throw_range = 5 w_class = 3.0 - flags = TABLEPASS + flags = 0 var/created_name = "Cleanbot" diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index faa1a3a95cc..7dd8382492b 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -9,7 +9,7 @@ throw_speed = 2 throw_range = 5 w_class = 3.0 - flags = TABLEPASS + flags = 0 var/created_name = "Floorbot" /obj/item/weapon/toolbox_tiles_sensor @@ -22,7 +22,7 @@ throw_speed = 2 throw_range = 5 w_class = 3.0 - flags = TABLEPASS + flags = 0 var/created_name = "Floorbot" // Tell other floorbots what we're fucking with so two floorbots don't dick with the same tile. diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index b8299d6c797..bde2a758ce5 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -507,7 +507,7 @@ throw_range = 5 throwforce = 0 w_class = 2.0 - flags = FPRINT | TABLEPASS | NOSHIELD + flags = FPRINT | NOSHIELD var/active = 0 /obj/item/weapon/holo/esword/green diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index e1e30cca4cc..5576599c83a 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -377,7 +377,7 @@ playsound(get_turf(src), 'sound/machines/ding.ogg', 50, 1) src.visible_message("\red The microwave gets covered in muck!") src.dirty = 100 // Make it dirty so it can't be used util cleaned - src.flags = null //So you can't add condiments + src.flags = 0 //So you can't add condiments src.icon_state = "mwbloody" // Make it look dirty too src.operating = 0 // Turn it off again aferwards src.updateUsrDialog() @@ -389,7 +389,7 @@ src.icon_state = "mwb" // Make it look all busted up and shit src.visible_message("\red The microwave breaks!") //Let them know they're stupid src.broken = 2 // Make it broken so it can't be used util fixed - src.flags = null //So you can't add condiments + src.flags = 0 //So you can't add condiments src.operating = 0 // Turn it off again aferwards src.updateUsrDialog() diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index bfa09d4f512..fe4c6587276 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -52,7 +52,7 @@ Buildable meters icon = 'icons/obj/pipe-item.dmi' icon_state = "simple" item_state = "buildpipe" - flags = TABLEPASS|FPRINT + flags = FPRINT w_class = 3 level = 2 @@ -80,7 +80,7 @@ Buildable meters icon = 'icons/obj/pipe-item.dmi' icon_state = "simple" item_state = "buildpipe" - flags = TABLEPASS|FPRINT + flags = FPRINT w_class = 3 level = 2 @@ -454,7 +454,7 @@ var/global/list/pipeID2State = list( icon = 'icons/obj/pipe-item.dmi' icon_state = "meter" item_state = "buildpipe" - flags = TABLEPASS|FPRINT + flags = FPRINT w_class = 4 /obj/item/pipe_meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) @@ -477,7 +477,7 @@ var/global/list/pipeID2State = list( icon = 'icons/obj/stationobjs.dmi' icon_state = "gsensor0" item_state = "buildpipe" - flags = TABLEPASS|FPRINT + flags = FPRINT w_class = 4 /obj/item/pipe_gsensor/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 1fa60836e4b..7e6158263a7 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -872,7 +872,7 @@ desc = "Wall-mounted Medical Equipment dispenser." icon = 'icons/obj/vending.dmi' icon_state = "wallmed_frame0" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 /obj/item/wallmed_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) diff --git a/code/game/machinery/vending_packs.dm b/code/game/machinery/vending_packs.dm index 0e15161e63d..bdfe84167e5 100644 --- a/code/game/machinery/vending_packs.dm +++ b/code/game/machinery/vending_packs.dm @@ -150,7 +150,7 @@ icon_state = "generic" item_state = "syringe_kit" w_class = 4.0 - flags = FPRINT|TABLEPASS + flags = FPRINT var/foldable = /obj/item/stack/sheet/cardboard var/foldable_amount = 4 diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index a3708dd3474..3a5734f9cee 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -7,7 +7,7 @@ icon = 'icons/mecha/mech_construct.dmi' icon_state = "blank" w_class = 20 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 origin_tech = "programming=2;materials=2" @@ -331,7 +331,7 @@ icon_state = "std_mod" item_state = "circuitboard" board_type = "other" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 5.0 w_class = 2.0 diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 0a9f7800c22..92c36a4d604 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -11,7 +11,7 @@ would spawn and follow the beaker, even if it is carried or thrown. icon = 'icons/effects/effects.dmi' mouse_opacity = 0 unacidable = 1 // so effect are not targeted by alien acid. - flags = TABLEPASS + flags = 0 w_type=NOT_RECYCLABLE /obj/effect/effect/water diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 92f51fec815..2964c25d06e 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -8,7 +8,7 @@ var/health = null var/hitsound = null var/w_class = 3.0 - flags = FPRINT | TABLEPASS + flags = FPRINT var/slot_flags = 0 //This is used to determine on which slots an item can fit. pass_flags = PASSTABLE pressure_resistance = 5 diff --git a/code/game/objects/items/airlock_control_frame.dm b/code/game/objects/items/airlock_control_frame.dm index 53627d101ba..e286a8b4cf6 100644 --- a/code/game/objects/items/airlock_control_frame.dm +++ b/code/game/objects/items/airlock_control_frame.dm @@ -5,7 +5,7 @@ desc = "Used for repairing or building airlock controllers" icon = 'icons/obj/airlock_machines.dmi' icon_state = "airlock_control_build0" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 /obj/item/airlock_controller_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index 019b699cb87..9ec2b1fa687 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -5,7 +5,7 @@ desc = "Used for repairing or building APCs" icon = 'icons/obj/apc_repair.dmi' icon_state = "apc_frame" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 w_type=RECYK_METAL @@ -54,7 +54,7 @@ desc = "Used for repairing or building intercoms" icon = 'icons/obj/radio.dmi' icon_state = "intercom_frame" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 w_type=RECYK_METAL diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 3c9d82f8927..c2d0329d795 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -12,7 +12,7 @@ var/global/list/obj/item/device/pda/PDAs = list() icon_state = "pda" item_state = "electronic" w_class = 1.0 - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_ID | SLOT_BELT //Main variables diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index bf56c4bf359..8602a83e734 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -4,7 +4,7 @@ icon_state = "aicard" // aicard-full item_state = "electronic" w_class = 2.0 - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT var/flush = null origin_tech = "programming=4;materials=4" diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 1a825fbed45..0809529e6ef 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -7,7 +7,7 @@ item_state = "" throw_speed = 4 throw_range = 20 - flags = FPRINT | TABLEPASS | NOBLUDGEON + flags = FPRINT | NOBLUDGEON var/c_tag = "" var/active = 0 var/network = "" diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 9fe2d563e9b..d9b6322bdea 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -1,7 +1,7 @@ /obj/item/device/chameleon name = "chameleon-projector" icon_state = "shield0" - flags = FPRINT | TABLEPASS| USEDELAY + flags = FPRINT | USEDELAY siemens_coefficient = 1 slot_flags = SLOT_BELT item_state = "electronic" diff --git a/code/game/objects/items/devices/codebreaker.dm b/code/game/objects/items/devices/codebreaker.dm index 1b307c65a13..cbe738a6253 100644 --- a/code/game/objects/items/devices/codebreaker.dm +++ b/code/game/objects/items/devices/codebreaker.dm @@ -3,7 +3,7 @@ desc = "Can be used to decipher a Nuclear Bomb's activation code" icon_state = "codebreaker" item_state = "electronic" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 5.0 w_class = 2.0 diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm index d2acb836b79..1a71c45b672 100644 --- a/code/game/objects/items/devices/debugger.dm +++ b/code/game/objects/items/devices/debugger.dm @@ -9,7 +9,7 @@ name = "debugger" desc = "Used to debug electronic equipment." icon_state = "hacktool-g" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 5.0 w_class = 2.0 diff --git a/code/game/objects/items/devices/deskbell.dm b/code/game/objects/items/devices/deskbell.dm index 3c4d6de6051..883a65d3c60 100644 --- a/code/game/objects/items/devices/deskbell.dm +++ b/code/game/objects/items/devices/deskbell.dm @@ -9,7 +9,7 @@ w_class = 2.0 throw_speed = 4 throw_range = 10 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 attack_verb = list("rang") hitsound = 'sound/machines/ding2.ogg' @@ -235,7 +235,7 @@ w_class = 2.0 throw_speed = 4 throw_range = 10 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 m_amt = 3750 w_type = RECYK_METAL diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 5235de92c78..1a826f92588 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -7,7 +7,7 @@ w_class = 1.0 throw_speed = 4 throw_range = 10 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 origin_tech = "magnets=2;combat=1" diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 7178a3df2c0..0fd54e9099e 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -5,7 +5,7 @@ icon_state = "flashlight" item_state = "flashlight" w_class = 2 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT m_amt = 50 @@ -108,7 +108,7 @@ desc = "A pen-sized light, used by medical staff." icon_state = "penlight" item_state = "" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 brightness_on = 2 @@ -121,7 +121,7 @@ item_state = "lamp" brightness_on = 5 w_class = 4 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 m_amt = 0 g_amt = 0 diff --git a/code/game/objects/items/devices/fuse_bomb.dm b/code/game/objects/items/devices/fuse_bomb.dm index e4e475ce3e2..40301ed2a23 100644 --- a/code/game/objects/items/devices/fuse_bomb.dm +++ b/code/game/objects/items/devices/fuse_bomb.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/device.dmi' icon_state = "fuse_bomb_5" item_state = "fuse_bomb" - flags = FPRINT | TABLEPASS + flags = FPRINT var/fuse_lit = 0 var/seconds_left = 5 diff --git a/code/game/objects/items/devices/maracas.dm b/code/game/objects/items/devices/maracas.dm index 061eff4c5ed..1bb72ed7a18 100644 --- a/code/game/objects/items/devices/maracas.dm +++ b/code/game/objects/items/devices/maracas.dm @@ -5,7 +5,7 @@ icon_state = "maracas" item_state = "maracas" w_class = 1.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT diff --git a/code/game/objects/items/devices/mat_synth.dm b/code/game/objects/items/devices/mat_synth.dm index e1cd5130ade..ba8f3defc43 100644 --- a/code/game/objects/items/devices/mat_synth.dm +++ b/code/game/objects/items/devices/mat_synth.dm @@ -11,7 +11,7 @@ icon = 'icons/obj/device.dmi' icon_state = "mat_synthoff" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 w_class = 3.0 origin_tech = "engineering=4;materials=5;power=3" diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 3b95393b057..061e71a13f8 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -4,7 +4,7 @@ icon_state = "megaphone" item_state = "radio" w_class = 1.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 var/spamcheck = 0 @@ -72,7 +72,7 @@ icon_state = "soundsynth" item_state = "radio" w_class = 1.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 var/spam_flag = 0 //To prevent mashing the button to cause annoyance like a huge idiot. diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 74a1049ba4f..f3df13f7113 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -12,7 +12,7 @@ name = "multitool" desc = "Used for pulsing wires to test which to cut. Not recommended by doctors." icon_state = "multitool" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 5.0 w_class = 2.0 diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index bebc118fb39..c95ca783cbb 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -4,7 +4,7 @@ icon_state = "pai" item_state = "electronic" w_class = 2.0 - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT origin_tech = "programming=2" var/obj/item/device/radio/radio diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index fb3303ee594..f7b106ff19d 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -6,7 +6,7 @@ icon_state = "powersink0" item_state = "electronic" w_class = 4.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 throwforce = 5 throw_speed = 1 diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index ed9bc24b2af..603483f31f7 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -4,7 +4,7 @@ icon_state = "electropack0" item_state = "electropack" frequency = 1449 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BACK w_class = 5.0 diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index b42300d624a..786a1c4cf31 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -26,7 +26,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use var/syndie = 0//Holder to see if it's a syndicate encrpyed radio var/maxf = 1499 // "Example" = FREQ_LISTENING|FREQ_BROADCASTING - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT throw_speed = 2 diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index b462c01cf05..2351a9cc495 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -13,7 +13,7 @@ REAGENT SCANNER desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." icon_state = "t-ray0" var/on = 0 - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT w_class = 2 item_state = "electronic" @@ -79,7 +79,7 @@ REAGENT SCANNER icon_state = "health" item_state = "analyzer" desc = "A hand-held body scanner able to distinguish vital signs of the subject." - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT throwforce = 3 @@ -234,7 +234,7 @@ REAGENT SCANNER icon_state = "atmos" item_state = "analyzer" w_class = 2.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT throwforce = 5 @@ -307,7 +307,7 @@ REAGENT SCANNER icon_state = "spectrometer" item_state = "analyzer" w_class = 2.0 - flags = FPRINT | TABLEPASS| OPENCONTAINER + flags = FPRINT | OPENCONTAINER siemens_coefficient = 1 slot_flags = SLOT_BELT throwforce = 5 @@ -380,7 +380,7 @@ REAGENT SCANNER icon_state = "spectrometer" item_state = "analyzer" w_class = 2.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT throwforce = 5 diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index c100e97e453..f385c15484f 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -16,7 +16,7 @@ var/list/storedinfo = new/list() var/list/timestamp = new/list() var/canprint = 1 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 throwforce = 2 throw_speed = 4 diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 4616e2e74dc..f4aa12c3c37 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -22,7 +22,7 @@ effective or pretty fucking useless. w_class = 1.0 throw_speed = 4 throw_range = 10 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 item_state = "electronic" origin_tech = "magnets=3;combat=3;syndicate=3" diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index cbbb548b14b..ce6e0e5456c 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -4,7 +4,7 @@ icon_state = "voice0" item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang) w_class = 1.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 var/spamcheck = 0 diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index bbd60843f6d..9c9f0b7b319 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/robot_parts.dmi' item_state = "buildpipe" icon_state = "blank" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT w_type=RECYK_ELECTRONIC diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 8d2688a4eb7..5ee23152e59 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -3,7 +3,7 @@ desc = "Some rods. Can be used for building, or something." singular_name = "metal rod" icon_state = "rods" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 w_class = 3.0 force = 9.0 diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm index 8480b2acd72..20b531ee761 100644 --- a/code/game/objects/items/stacks/sheets/light.dm +++ b/code/game/objects/items/stacks/sheets/light.dm @@ -8,7 +8,7 @@ throwforce = 5.0 throw_speed = 5 throw_range = 20 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 max_amount = 60 diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 2fd8c56299b..b125ee97d8c 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -214,7 +214,7 @@ var/global/list/datum/stack_recipe/phazon_recipes = list() perunit = 1500 melt_temperature = MELTPOINT_PLASTIC throwforce = 15.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 origin_tech = "materials=9" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 4cb8926ccbf..4adbc40f4ad 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -87,7 +87,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ m_amt = 3750 w_type = RECYK_METAL throwforce = 14.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 origin_tech = "materials=1" melt_temperature = MELTPOINT_STEEL @@ -124,7 +124,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \ m_amt = 3750 // Was 7500, which doesn't make any fucking sense perunit = 2875 //average of plasma and metal throwforce = 15.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 origin_tech = "materials=2" w_type = RECYK_METAL @@ -202,7 +202,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \ desc = "Large sheets of card, like boxes folded flat." singular_name = "cardboard sheet" icon_state = "sheet-card" - flags = FPRINT | TABLEPASS + flags = FPRINT origin_tech = "materials=1" /obj/item/stack/sheet/cardboard/New(var/loc, var/amount=null) @@ -219,7 +219,7 @@ var/global/list/datum/stack_recipe/charcoal_recipes = list () desc = "Yum." singular_name = "charcoal sheet" icon_state = "sheet-charcoal" - flags = FPRINT | TABLEPASS + flags = FPRINT origin_tech = "materials=1" autoignition_temperature=AUTOIGNITION_WOOD diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm index afe6f36cc05..966c21ac221 100644 --- a/code/game/objects/items/stacks/sheets/sheets.dm +++ b/code/game/objects/items/stacks/sheets/sheets.dm @@ -1,6 +1,6 @@ /obj/item/stack/sheet name = "sheet" - flags = FPRINT | TABLEPASS + flags = FPRINT w_class = 3.0 force = 5 throwforce = 5 diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm index 63f89912e64..39f3b2fe1a0 100644 --- a/code/game/objects/items/stacks/tiles/light.dm +++ b/code/game/objects/items/stacks/tiles/light.dm @@ -8,7 +8,7 @@ throwforce = 5.0 throw_speed = 5 throw_range = 20 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 max_amount = 60 attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed") diff --git a/code/game/objects/items/stacks/tiles/plasteel.dm b/code/game/objects/items/stacks/tiles/plasteel.dm index e0ada3b87fd..1b8be85ee86 100644 --- a/code/game/objects/items/stacks/tiles/plasteel.dm +++ b/code/game/objects/items/stacks/tiles/plasteel.dm @@ -11,7 +11,7 @@ throwforce = 15.0 throw_speed = 5 throw_range = 20 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 max_amount = 60 diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index cc9cafc1425..f894e7394fe 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -18,7 +18,7 @@ throwforce = 1.0 throw_speed = 5 throw_range = 20 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 max_amount = 60 origin_tech = "biotech=1" @@ -36,7 +36,7 @@ throwforce = 1.0 throw_speed = 5 throw_range = 20 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 max_amount = 60 @@ -53,6 +53,6 @@ throwforce = 1.0 throw_speed = 5 throw_range = 20 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 max_amount = 60 \ No newline at end of file diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 731a8ac3def..659bcf2b6da 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -127,7 +127,7 @@ icon = 'icons/obj/gun.dmi' icon_state = "revolver" item_state = "gun" - flags = FPRINT | TABLEPASS | USEDELAY + flags = FPRINT | USEDELAY siemens_coefficient = 1 slot_flags = SLOT_BELT w_class = 3.0 @@ -187,7 +187,7 @@ desc = "There are 7 caps left! Make sure to recyle the box in an autolathe when it gets empty." icon = 'icons/obj/ammo.dmi' icon_state = "357-7" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 w_class = 1.0 g_amt = 10 @@ -211,7 +211,7 @@ icon = 'icons/obj/gun.dmi' icon_state = "crossbow" item_state = "crossbow" - flags = FPRINT | TABLEPASS | USEDELAY + flags = FPRINT | USEDELAY w_class = 2.0 attack_verb = list("attacked", "struck", "hit") var/bullets = 5 @@ -307,7 +307,7 @@ desc = "Its nerf or nothing! Ages 8 and up." icon = 'icons/obj/toy.dmi' icon_state = "foamdart" - flags = FPRINT | TABLEPASS + flags = FPRINT w_class = 1.0 /obj/effect/foam_dart_dummy @@ -330,7 +330,7 @@ item_state = "sword0" var/active = 0.0 w_class = 2.0 - flags = FPRINT | TABLEPASS | NOSHIELD + flags = FPRINT | NOSHIELD attack_verb = list("attacked", "struck", "hit") attack_self(mob/user as mob) @@ -356,7 +356,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "katana" item_state = "katana" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT | SLOT_BACK force = 5 @@ -472,7 +472,7 @@ icon_state = "sunflower" item_state = "sunflower" var/empty = 0 - flags = USEDELAY + flags = USEDELAY /obj/item/toy/waterflower/New() . = ..() @@ -617,7 +617,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "katana" item_state = "katana" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT | SLOT_BACK force = 5 @@ -920,7 +920,7 @@ icon_state = "megaphone" item_state = "radio" w_class = 1.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 var/spamcheck = 0 diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 66c7e8d0bfa..9812e8a9842 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -12,7 +12,7 @@ RCD opacity = 0 density = 0 anchored = 0.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 10.0 throwforce = 10.0 diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index 99ec84be7c5..2d3a8f9ba32 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -135,7 +135,7 @@ var/global/list/RPD_recipes=list( opacity = 0 density = 0 anchored = 0.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 10.0 throwforce = 10.0 diff --git a/code/game/objects/items/weapons/ai_modules/AI_modules.dm b/code/game/objects/items/weapons/ai_modules/AI_modules.dm index e7a87bb6c2d..907ab5f6ea5 100644 --- a/code/game/objects/items/weapons/ai_modules/AI_modules.dm +++ b/code/game/objects/items/weapons/ai_modules/AI_modules.dm @@ -12,7 +12,7 @@ Refactored AI modules by N3X15 icon_state = "std_mod" item_state = "circuitboard" desc = "An AI Module for transmitting encrypted instructions to the AI." - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 5.0 w_class = 2.0 diff --git a/code/game/objects/items/weapons/ai_modules/planning_frame.dm b/code/game/objects/items/weapons/ai_modules/planning_frame.dm index 0c050dcd3d5..b8b4113ca34 100644 --- a/code/game/objects/items/weapons/ai_modules/planning_frame.dm +++ b/code/game/objects/items/weapons/ai_modules/planning_frame.dm @@ -11,7 +11,7 @@ /obj/item/weapon/planning_frame name = "planning frame" desc = "A large circuit board with slots for AI modules. Used for planning a law set." - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 5.0 w_class = 2.0 diff --git a/code/game/objects/items/weapons/airlock_painter.dm b/code/game/objects/items/weapons/airlock_painter.dm index 46594f67774..702d64baf05 100644 --- a/code/game/objects/items/weapons/airlock_painter.dm +++ b/code/game/objects/items/weapons/airlock_painter.dm @@ -12,7 +12,7 @@ w_type = RECYK_ELECTRONIC origin_tech = "engineering=1" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT diff --git a/code/game/objects/items/weapons/chisel.dm b/code/game/objects/items/weapons/chisel.dm index 06bf816ab42..2a6934575f3 100644 --- a/code/game/objects/items/weapons/chisel.dm +++ b/code/game/objects/items/weapons/chisel.dm @@ -7,7 +7,7 @@ m_amt = 120 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 var/use_name diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 21aab20f2c5..0b5a45fd98e 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -281,7 +281,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_on = "cigaron" icon_off = "cigaroff" overlay_on = "cigarlit" - flags = FPRINT|TABLEPASS + flags = FPRINT type_butt = /obj/item/weapon/cigbutt/cigarbutt throw_speed = 0.5 item_state = "cigaroff" @@ -400,7 +400,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/cigarette/pipe name = "smoking pipe" desc = "A pipe, for smoking. Probably made of meershaum or something." - flags = FPRINT|TABLEPASS + flags = FPRINT icon_state = "pipeoff" item_state = "pipeoff" icon_on = "pipeon" //Note - these are in masks.dmi @@ -479,7 +479,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/icon_off = "lighter-g" w_class = 1 throwforce = 4 - flags = TABLEPASS + flags = 0 siemens_coefficient = 1 slot_flags = SLOT_BELT attack_verb = list("burnt", "singed") diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 39a058a196a..37f29c81e0b 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -3,7 +3,7 @@ desc = "A generic brand of lipstick." icon = 'icons/obj/items.dmi' icon_state = "lipstick" - flags = FPRINT | TABLEPASS + flags = FPRINT w_class = 1.0 var/colour = "red" var/open = 0 diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 7ce3c61005c..3fd06c77106 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -7,7 +7,7 @@ icon = 'icons/obj/assemblies.dmi' icon_state = "plastic-explosive0" item_state = "plasticx" - flags = FPRINT | TABLEPASS | USEDELAY + flags = FPRINT | USEDELAY w_class = 2.0 origin_tech = "syndicate=2" var/datum/wires/explosive/plastic/wires = null diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 5d01ea6853c..bd4cf7466d6 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -6,7 +6,7 @@ icon_state = "fire_extinguisher0" item_state = "fire_extinguisher" hitsound = 'sound/weapons/smash.ogg' - flags = FPRINT | USEDELAY | TABLEPASS + flags = FPRINT | USEDELAY siemens_coefficient = 1 throwforce = 10 w_class = 3.0 @@ -33,7 +33,7 @@ icon_state = "miniFE0" item_state = "miniFE" hitsound = null //it is much lighter, after all. - flags = FPRINT | USEDELAY | TABLEPASS + flags = FPRINT | USEDELAY throwforce = 2 w_class = 2.0 force = 3.0 diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index f25e8d10fe7..3768defb50d 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/flamethrower.dmi' icon_state = "flamethrowerbase" item_state = "flamethrower_0" - flags = FPRINT | TABLEPASS| USEDELAY // USEDELAY flag needed in order to use afterattack() for things that are not in reach. I.E: Shooting flames. + flags = FPRINT | USEDELAY // USEDELAY flag needed in order to use afterattack() for things that are not in reach. I.E: Shooting flames. siemens_coefficient = 1 force = 3.0 throwforce = 10.0 diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 542a320691d..37a09312be9 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -416,4 +416,4 @@ obj/item/weapon/grenade/chem_grenade/exgrenade desc = "..." icon_state = null volume = 1000 - flags = FPRINT | TABLEPASS | OPENCONTAINER | NOREACT \ No newline at end of file + flags = FPRINT | OPENCONTAINER | NOREACT \ No newline at end of file diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index 089e4d82380..90f8100c6cf 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -23,7 +23,7 @@ item_state = "flashbang" throw_speed = 4 throw_range = 20 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT var/assembled = 0 diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index d6e58cb4c73..73f3c569732 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -7,7 +7,7 @@ item_state = "flashbang" throw_speed = 4 throw_range = 20 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT var/active = 0 diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm index 5c5f75ad5bb..aac576402d3 100644 --- a/code/game/objects/items/weapons/grenades/smokebomb.dm +++ b/code/game/objects/items/weapons/grenades/smokebomb.dm @@ -5,7 +5,7 @@ icon_state = "flashbang" det_time = 20 item_state = "flashbang" - flags = FPRINT | TABLEPASS | USEDELAY + flags = FPRINT | USEDELAY slot_flags = SLOT_BELT var/datum/effect/effect/system/smoke_spread/bad/smoke diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 0c6d40bd843..4cf18088e84 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -4,7 +4,7 @@ gender = PLURAL icon = 'icons/obj/items.dmi' icon_state = "handcuff" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT throwforce = 5 diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm index 983dd564542..ae0586ee757 100644 --- a/code/game/objects/items/weapons/hydroponics.dm +++ b/code/game/objects/items/weapons/hydroponics.dm @@ -20,7 +20,7 @@ desc = "A small satchel made for organizing seeds." var/mode = 1; //0 = pick one at a time, 1 = pick all on tile var/capacity = 500; //the number of seeds it can carry. - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT w_class = 1 var/list/item_quants = list() @@ -144,7 +144,7 @@ icon_state = "novaflower" damtype = "fire" force = 0 - flags = TABLEPASS + flags = 0 slot_flags = SLOT_HEAD throwforce = 1 w_class = 1.0 diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index b648dbaf7e8..d9e202a48e1 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -22,7 +22,7 @@ throwforce = 5.0 throw_speed = 3 throw_range = 5 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 origin_tech = "materials=1" attack_verb = list("attacked", "stabbed", "poked") @@ -160,7 +160,7 @@ icon = 'icons/obj/kitchen.dmi' icon_state = "knife" desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come." - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 10.0 w_class = 3.0 @@ -194,7 +194,7 @@ icon_state = "butch" hitsound = "sound/weapons/rapidslice.ogg" desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products." - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 15.0 w_class = 2.0 @@ -294,7 +294,7 @@ throw_speed = 1 throw_range = 5 w_class = 3.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 m_amt = 3000 w_type = RECYK_METAL diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 8deb2f561e7..8410b94542c 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -15,7 +15,7 @@ throw_speed = 1 throw_range = 5 w_class = 3.0 - flags = FPRINT | NOSHIELD | TABLEPASS + flags = FPRINT | NOSHIELD siemens_coefficient = 1 origin_tech = "combat=3" attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") @@ -36,7 +36,7 @@ throw_speed = 1 throw_range = 5 w_class = 2.0 - flags = FPRINT | TABLEPASS | NOSHIELD + flags = FPRINT | NOSHIELD origin_tech = "magnets=3;syndicate=4" attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -121,6 +121,6 @@ throw_speed = 1 throw_range = 1 w_class = 4.0//So you can't hide it in your pocket or some such. - flags = FPRINT | TABLEPASS | NOSHIELD + flags = FPRINT | NOSHIELD attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") var/datum/effect/effect/system/spark_spread/spark_system \ No newline at end of file diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index d7b13701709..2a910ea8d2c 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -4,7 +4,7 @@ icon_state = "chain" item_state = "chain" hitsound = "sound/weapons/whip.ogg" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT force = 10 diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index dcb839d688a..d76875013ca 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -9,7 +9,7 @@ throw_speed = 5 throw_range = 3 w_class = 3.0 - flags = FPRINT | TABLEPASS + flags = FPRINT attack_verb = list("mopped", "bashed", "bludgeoned", "whacked", "slapped", "whipped") /obj/item/weapon/mop/New() diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index 005f140fdda..8097d31ff11 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -5,7 +5,7 @@ icon_state = "cell" item_state = "cell" origin_tech = "powerstorage=1" - flags = FPRINT|TABLEPASS + flags = FPRINT force = 5.0 throwforce = 5.0 throw_speed = 3 diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index 4d5283bc59c..97e1682ee5d 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/wizard.dmi' icon_state = "scroll" var/uses = 4.0 - flags = FPRINT | TABLEPASS + flags = FPRINT w_class = 2.0 item_state = "paper" throw_speed = 4 diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 151555cd96c..1fcb1ed416f 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -6,7 +6,7 @@ desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder." icon = 'icons/obj/weapons.dmi' icon_state = "riot" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BACK force = 5.0 @@ -61,7 +61,7 @@ desc = "A shield capable of stopping most projectile and melee attacks. It can be retracted, expanded, and stored anywhere." icon = 'icons/obj/weapons.dmi' icon_state = "eshield0" // eshield1 for expanded - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 3.0 throwforce = 5.0 @@ -83,7 +83,7 @@ icon = 'icons/obj/device.dmi' icon_state = "shield0" var/active = 0.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 item_state = "electronic" throwforce = 10.0 diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index f4f327ea852..584e557168b 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -9,7 +9,7 @@ icon_state = "backpack" item_state = "backpack" w_class = 4.0 - flags = FPRINT|TABLEPASS + flags = FPRINT slot_flags = SLOT_BACK //ERROOOOO max_w_class = 3 max_combined_w_class = 21 diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 87a434ea845..6a24fa5e4f6 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -20,7 +20,7 @@ display_contents_with_number = 0 // UNStABLE AS FuCK, turn on when it stops crashing clients use_to_pickup = 1 slot_flags = SLOT_BELT - flags = FPRINT | TABLEPASS + flags = FPRINT // ----------------------------- // Trash bag diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 930a1530aac..90aa671e29a 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/clothing/belts.dmi' icon_state = "utilitybelt" item_state = "utility" - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT attack_verb = list("whipped", "lashed", "disciplined") diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index a2576b3a804..24ccb6b064d 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -5,7 +5,7 @@ throw_speed = 1 throw_range = 5 w_class = 3.0 - flags = FPRINT | TABLEPASS + flags = FPRINT var/mob/affecting = null var/deity_name = "Christ" diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 88e47b9d174..a351dfec52a 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -571,7 +571,7 @@ item_state = "zippo" storage_slots = 10 w_class = 1 - flags = TABLEPASS + flags = 0 slot_flags = SLOT_BELT New() diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 6ad8c39db3f..21c2bf442ba 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -2,7 +2,7 @@ name = "briefcase" desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional." icon_state = "briefcase" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 8.0 throw_speed = 1 diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 6dad862b56e..9b2ac9d94d5 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -92,7 +92,7 @@ item_state = "candlebox5" storage_slots = 5 throwforce = 2 - flags = TABLEPASS + flags = 0 slot_flags = SLOT_BELT @@ -156,7 +156,7 @@ item_state = "cigpacket" w_class = 1 throwforce = 2 - flags = TABLEPASS + flags = 0 slot_flags = SLOT_BELT storage_slots = 6 can_hold = list("=/obj/item/clothing/mask/cigarette") // Strict type check. diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index a472d343c10..42599405de5 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -146,7 +146,7 @@ icon_state = "secure" item_state = "sec-case" desc = "A large briefcase with a digital locking system." - flags = FPRINT | TABLEPASS + flags = FPRINT force = 8.0 throw_speed = 1 throw_range = 4 @@ -221,7 +221,7 @@ icon_opened = "safe0" icon_locking = "safeb" icon_sparking = "safespark" - flags = FPRINT | TABLEPASS + flags = FPRINT force = 8.0 w_class = 8.0 max_w_class = 8 diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 428185f8b96..994cd6e7918 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/storage.dmi' icon_state = "red" item_state = "toolbox_red" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 5.0 throwforce = 10.0 diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index feee9dd803b..2dbbee63efa 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -3,7 +3,7 @@ desc = "A stun baton for incapacitating people with." icon_state = "stun baton" item_state = "baton" - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT force = 10 throwforce = 7 diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 7af53864b5b..024f25a3ea1 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -21,7 +21,7 @@ g_amt = 5000 // OH COME ON, WHERE THE FUCK IS THERE ANY GLASS IN A GODDAMN RETRACTOR melt_temperature = MELTPOINT_STEEL w_type = RECYK_METAL - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 w_class = 1.0 origin_tech = "materials=1;biotech=1" @@ -143,7 +143,7 @@ LOOK FOR SURGERY.DM*/ m_amt = 5000 g_amt = 2500 w_type = RECYK_METAL - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 w_class = 1.0 origin_tech = "materials=1;biotech=1" @@ -286,7 +286,7 @@ LOOK FOR SURGERY.DM*/ m_amt = 5000 g_amt = 2500 w_type = RECYK_ELECTRONIC - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 w_class = 1.0 origin_tech = "materials=1;biotech=1" @@ -384,7 +384,7 @@ LOOK FOR SURGERY.DM*/ m_amt = 15000 g_amt = 10000 w_type = RECYK_ELECTRONIC - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 15.0 w_class = 1.0 @@ -405,7 +405,7 @@ LOOK FOR SURGERY.DM*/ icon = 'icons/obj/surgery.dmi' icon_state = "scalpel" hitsound = "sound/weapons/bladeslice.ogg" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 10.0 w_class = 1.0 @@ -694,7 +694,7 @@ LOOK FOR SURGERY.DM*/ icon = 'icons/obj/surgery.dmi' icon_state = "saw3" hitsound = 'sound/weapons/circsawhit.ogg' - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 15.0 w_class = 1.0 diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index e3f6f2f7ae9..aa15c3ec31f 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -24,7 +24,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "baton" item_state = "classic_baton" - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT force = 10 @@ -77,7 +77,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "telebaton_0" item_state = "telebaton_0" - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT w_class = 2 force = 3 diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index d26bbc60763..835a6b26793 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -77,7 +77,7 @@ name = "plasma tank" desc = "Contains dangerous plasma. Do not inhale. Warning: extremely flammable." icon_state = "plasma" - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = null //they have no straps! /obj/item/weapon/tank/plasma/New() @@ -114,7 +114,7 @@ name = "emergency oxygen tank" desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it." icon_state = "emergency" - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT w_class = 2.0 force = 4.0 diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index c29f06f9be2..04dd5db863c 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -4,7 +4,7 @@ /obj/item/weapon/tank name = "tank" icon = 'icons/obj/tank.dmi' - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BACK diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index e0697ad0955..00a10a6a82b 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -16,7 +16,7 @@ var/frequency = 1451 var/broadcasting = null var/listening = 1.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 w_class = 2.0 item_state = "electronic" diff --git a/code/game/objects/items/weapons/tile_painter.dm b/code/game/objects/items/weapons/tile_painter.dm index 87cb60a1bda..0b4b44fed4c 100644 --- a/code/game/objects/items/weapons/tile_painter.dm +++ b/code/game/objects/items/weapons/tile_painter.dm @@ -300,7 +300,7 @@ var/global/list/paint_variants = list( opacity = 0 density = 0 anchored = 0.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 10.0 throwforce = 10.0 diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 18dff543780..7bcd56ea378 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -21,7 +21,7 @@ icon = 'icons/obj/items.dmi' icon_state = "wrench" hitsound = "sound/weapons/smash.ogg" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT force = 5.0 @@ -49,7 +49,7 @@ icon = 'icons/obj/items.dmi' icon_state = "screwdriver" hitsound = 'sound/weapons/toolhit.ogg' - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT force = 5.0 @@ -135,7 +135,7 @@ icon = 'icons/obj/items.dmi' icon_state = "cutters" hitsound = 'sound/weapons/toolhit.ogg' - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT force = 6.0 @@ -175,7 +175,7 @@ icon = 'icons/obj/items.dmi' icon_state = "welder" hitsound = 'sound/weapons/toolhit.ogg' - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT @@ -486,7 +486,7 @@ icon = 'icons/obj/items.dmi' icon_state = "crowbar" hitsound = "sound/weapons/toolhit.ogg" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT force = 5.0 @@ -540,7 +540,7 @@ desc = "A professional conversion kit used to convert any knock off revolver into the real deal capable of shooting lethal .357 rounds without the possibility of catastrophic failure" icon = 'icons/obj/weapons.dmi' icon_state = "kit" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 w_class = 2.0 w_type = RECYK_MISC diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index f65fa9d8100..f80afc79b9f 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -229,7 +229,7 @@ force_wielded = 30 wieldsound = 'sound/weapons/saberon.ogg' unwieldsound = 'sound/weapons/saberoff.ogg' - flags = FPRINT | TABLEPASS | NOSHIELD + flags = FPRINT | NOSHIELD origin_tech = "magnets=3;syndicate=4" attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") @@ -273,7 +273,7 @@ w_class = 4.0 force_unwielded = 40 force_wielded = 120 - flags = FPRINT | TABLEPASS | NOSHIELD + flags = FPRINT | NOSHIELD origin_tech = "magnets=4;combat=5" /obj/item/weapon/twohanded/hfrequency/update_icon() diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 276b7ebc62f..d0b7fa3c302 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -3,7 +3,7 @@ name = "banhammer" icon = 'icons/obj/items.dmi' icon_state = "toyhammer" - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT throwforce = 0 w_class = 1.0 @@ -20,7 +20,7 @@ desc = "A rod of pure obsidian, its very presence disrupts and dampens the powers of paranormal phenomenae." icon_state = "nullrod" item_state = "nullrod" - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT force = 15 throw_speed = 1 @@ -71,7 +71,7 @@ desc = "This thing is so unspeakably shitty you are having a hard time even holding it." icon_state = "sord" item_state = "sord" - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT force = 2 throwforce = 1 @@ -93,7 +93,7 @@ icon_state = "claymore" item_state = "claymore" hitsound = "sound/weapons/bloodyslice.ogg" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT force = 40 @@ -122,7 +122,7 @@ icon_state = "katana" item_state = "katana" hitsound = "sound/weapons/bloodyslice.ogg" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT | SLOT_BACK force = 40 @@ -159,7 +159,7 @@ obj/item/weapon/wirerod desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit." icon_state = "wiredrod" item_state = "rods" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 9 throwforce = 10 diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index c018580ad40..cf27dc15a0e 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -7,7 +7,7 @@ anchored = 0 var/lockedby = "" pressure_resistance = 5 - flags = FPRINT | TABLEPASS | OPENCONTAINER + flags = FPRINT | OPENCONTAINER var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite /obj/structure/mopbucket/New() diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index e744f4a1622..4821a285a94 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -3,7 +3,7 @@ desc = "A small electronic device that should never exist." icon = 'icons/obj/assemblies/new_assemblies.dmi' icon_state = "" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 w_class = 2.0 m_amt = 100 diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index e8eac327d05..aefa44f6a01 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -6,7 +6,7 @@ w_class = 3.0 throw_speed = 2 throw_range = 4 - flags = FPRINT | TABLEPASS //Copied this from old code, so this may or may not be necessary + flags = FPRINT //Copied this from old code, so this may or may not be necessary siemens_coefficient = 1 var/status = 0 //0 - not readied //1 - bomb finished with welder var/obj/item/device/assembly_holder/bombassembly = null //The first part of the bomb is an assembly holder, holding an igniter+some device diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 1c8110d6bb5..4dade13ac80 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/assemblies/new_assemblies.dmi' icon_state = "holder" item_state = "assembly" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 throwforce = 5 w_class = 2.0 diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 62e7e58500a..ea5dee9fa00 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -171,7 +171,7 @@ var/visible = 0.0 var/left = null anchored = 1.0 - flags = TABLEPASS + flags = 0 var/obj/item/device/assembly/infra/assembly diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index 2d558ab88c1..a0a6d665968 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -6,7 +6,7 @@ var/obj/item/device/radio/electropack/part2 = null var/status = 0 w_class = 5.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 /obj/item/assembly/shock_kit/Destroy() diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 790db268791..28d82e85410 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -169,7 +169,7 @@ BLIND // can't see anything usr << "You push \the [src] out of the way." gas_transfer_coefficient = null permeability_coefficient = null - flags = null + flags = 0 flags_inv = null src.is_flipped = 2 usr.update_inv_wear_mask() @@ -198,7 +198,7 @@ BLIND // can't see anything icon = 'icons/obj/clothing/suits.dmi' name = "suit" var/fire_resist = T0C+100 - flags = FPRINT | TABLEPASS + flags = FPRINT allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_nitrogen) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) slot_flags = SLOT_OCLOTHING @@ -213,7 +213,7 @@ BLIND // can't see anything name = "Space helmet" icon_state = "space" desc = "A special helmet designed for work in a hazardous, low-pressure environment." - flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE + flags = FPRINT | HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE item_state = "space" permeability_coefficient = 0.01 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50) @@ -231,7 +231,7 @@ BLIND // can't see anything w_class = 4//bulky item gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 - flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE + flags = FPRINT | STOPSPRESSUREDMAGE body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_nitrogen) slowdown = 3 @@ -248,7 +248,7 @@ BLIND // can't see anything name = "under" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS permeability_coefficient = 0.90 - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_ICLOTHING armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) species_restricted = list("exclude","Muton") diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 003c9def6e4..48a281b8444 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -206,7 +206,7 @@ name = "Thermonocle" desc = "A monocle thermal." icon_state = "thermoncle" - flags = null //doesn't protect eyes because it's a monocle, duh + flags = 0 //doesn't protect eyes because it's a monocle, duh /obj/item/clothing/glasses/thermal/eyepatch name = "Optical Thermal Eyepatch" diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index be765aea8be..63021082873 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -1,7 +1,7 @@ /obj/item/clothing/glasses/hud name = "HUD" desc = "A heads-up display that provides important info in (almost) real time." - flags = null //doesn't protect eyes because it's a monocle, duh + flags = 0 //doesn't protect eyes because it's a monocle, duh origin_tech = "magnets=3;biotech=2" var/list/icon/current = list() //the current hud icons diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index de10a8fbcd8..cfd05b3a991 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -2,7 +2,7 @@ name = "hard hat" desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight." icon_state = "hardhat0_yellow" - flags = FPRINT | TABLEPASS + flags = FPRINT item_state = "hardhat0_yellow" var/brightness_on = 4 //luminosity when on var/on = 0 @@ -46,7 +46,7 @@ item_state = "hardhat0_red" _color = "red" name = "firefighter helmet" - flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE + flags = FPRINT | STOPSPRESSUREDMAGE heat_protection = HEAD max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECITON_TEMPERATURE @@ -54,7 +54,7 @@ icon_state = "hardhat0_white" item_state = "hardhat0_white" _color = "white" - flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE + flags = FPRINT | STOPSPRESSUREDMAGE heat_protection = HEAD max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECITON_TEMPERATURE diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index d32b2ebae4f..9e9849eb048 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -2,7 +2,7 @@ name = "helmet" desc = "Standard Security gear. Protects the head from impacts." icon_state = "helmet" - flags = FPRINT | TABLEPASS | HEADCOVERSEYES + flags = FPRINT | HEADCOVERSEYES item_state = "helmet" armor = list(melee = 50, bullet = 15, laser = 50,energy = 10, bomb = 25, bio = 0, rad = 0) flags_inv = HIDEEARS|HIDEEYES @@ -23,7 +23,7 @@ desc = "It's a helmet specifically designed to protect against close range attacks." icon_state = "riot" item_state = "helmet" - flags = FPRINT|TABLEPASS|HEADCOVERSEYES + flags = FPRINT|HEADCOVERSEYES armor = list(melee = 82, bullet = 15, laser = 5,energy = 5, bomb = 5, bio = 2, rad = 0) flags_inv = HIDEEARS siemens_coefficient = 0.7 @@ -32,7 +32,7 @@ name = "\improper SWAT helmet" desc = "They're often used by highly trained Swat Members." icon_state = "swat" - flags = FPRINT | TABLEPASS | HEADCOVERSEYES + flags = FPRINT | HEADCOVERSEYES item_state = "swat" armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0) flags_inv = HIDEEARS|HIDEEYES @@ -45,7 +45,7 @@ name = "\improper Thunderdome helmet" desc = "'Let the battle commence!'" icon_state = "thunderdome" - flags = FPRINT | TABLEPASS | HEADCOVERSEYES + flags = FPRINT | HEADCOVERSEYES item_state = "thunderdome" armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0) cold_protection = HEAD @@ -56,7 +56,7 @@ name = "gladiator helmet" desc = "Ave, Imperator, morituri te salutant." icon_state = "gladiator" - flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR + flags = FPRINT|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR item_state = "gladiator" flags_inv = HIDEMASK|HIDEEARS|HIDEEYES siemens_coefficient = 1 diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 14f250ebafa..553694040f2 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -6,7 +6,7 @@ icon_state = "chef" item_state = "chef" desc = "The commander in chef's head wear." - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 0.9 //Captain: This probably shouldn't be space-worthy @@ -14,7 +14,7 @@ name = "captain's hat" icon_state = "captain" desc = "It's good being the king." - flags = FPRINT|TABLEPASS + flags = FPRINT item_state = "caphat" siemens_coefficient = 0.9 @@ -23,7 +23,7 @@ name = "captain's cap" desc = "You fear to wear it for the negligence it brings." icon_state = "capcap" - flags = FPRINT|TABLEPASS + flags = FPRINT flags_inv = 0 cold_protection = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECITON_TEMPERATURE @@ -34,7 +34,7 @@ name = "chaplain's hood" desc = "It's hood that covers the head. It keeps you warm during the space winters." icon_state = "chaplain_hood" - flags = FPRINT|TABLEPASS|HEADCOVERSEYES|BLOCKHAIR + flags = FPRINT|HEADCOVERSEYES|BLOCKHAIR siemens_coefficient = 0.9 //Chaplain @@ -42,7 +42,7 @@ name = "nun hood" desc = "Maximum piety in this star system." icon_state = "nun_hood" - flags = FPRINT|TABLEPASS|HEADCOVERSEYES|BLOCKHAIR + flags = FPRINT|HEADCOVERSEYES|BLOCKHAIR siemens_coefficient = 0.9 //Mime @@ -50,7 +50,7 @@ name = "beret" desc = "A beret, an artists favorite headwear." icon_state = "beret" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 0.9 //Security @@ -58,14 +58,14 @@ name = "security beret" desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety." icon_state = "beret_badge" - flags = FPRINT | TABLEPASS + flags = FPRINT //Medical /obj/item/clothing/head/surgery name = "surgical cap" desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs." icon_state = "surgcap_blue" - flags = FPRINT | TABLEPASS | BLOCKHEADHAIR + flags = FPRINT | BLOCKHEADHAIR /obj/item/clothing/head/surgery/purple desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is deep purple." diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index add4b9eef06..ec6ef6416a5 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -4,7 +4,7 @@ name = "\improper CentComm. hat" icon_state = "centcom" desc = "It's good to be emperor." - flags = FPRINT|TABLEPASS + flags = FPRINT item_state = "centhat" siemens_coefficient = 0.9 @@ -13,7 +13,7 @@ icon_state = "hairflower" desc = "Smells nice." item_state = "hairflower" - flags = FPRINT|TABLEPASS + flags = FPRINT /obj/item/clothing/head/powdered_wig name = "powdered wig" @@ -26,26 +26,26 @@ desc = "It's an amish looking hat." icon_state = "tophat" item_state = "that" - flags = FPRINT|TABLEPASS + flags = FPRINT siemens_coefficient = 0.9 /obj/item/clothing/head/redcoat name = "redcoat's hat" icon_state = "redcoat" desc = "'I guess it's a redhead.'" - flags = FPRINT | TABLEPASS + flags = FPRINT /obj/item/clothing/head/mailman name = "mailman's hat" icon_state = "mailman" desc = "'Right-on-time' mail service head wear." - flags = FPRINT | TABLEPASS + flags = FPRINT /obj/item/clothing/head/plaguedoctorhat name = "plague doctor's hat" desc = "These were once used by Plague doctors. They're pretty much useless." icon_state = "plaguedoctor" - flags = FPRINT | TABLEPASS + flags = FPRINT permeability_coefficient = 0.01 siemens_coefficient = 0.9 @@ -53,13 +53,13 @@ name = "hastur's hood" desc = "It's unspeakably stylish" icon_state = "hasturhood" - flags = FPRINT|TABLEPASS|HEADCOVERSEYES|BLOCKHAIR + flags = FPRINT|HEADCOVERSEYES|BLOCKHAIR /obj/item/clothing/head/nursehat name = "nurse's hat" desc = "It allows quick identification of trained medical personnel." icon_state = "nursehat" - flags = FPRINT|TABLEPASS + flags = FPRINT siemens_coefficient = 0.9 /obj/item/clothing/head/syndicatefake @@ -67,7 +67,7 @@ icon_state = "syndicate" item_state = "syndicate" desc = "A plastic replica of a syndicate agent's space helmet, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!" - flags = FPRINT | TABLEPASS | BLOCKHAIR + flags = FPRINT | BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE siemens_coefficient = 2.0 @@ -75,7 +75,7 @@ name = "cueball helmet" desc = "A large, featureless white orb mean to be worn on your head. How do you even see out of this thing?" icon_state = "cueball" - flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR + flags = FPRINT|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR item_state="cueball" flags_inv = 0 @@ -84,7 +84,7 @@ desc = "It's an amish looking armored top hat." icon_state = "tophat" item_state = "that" - flags = FPRINT|TABLEPASS + flags = FPRINT flags_inv = 0 @@ -93,7 +93,7 @@ desc = "It's a green bandana with some fine nanotech lining." icon_state = "greenbandana" item_state = "greenbandana" - flags = FPRINT|TABLEPASS + flags = FPRINT flags_inv = 0 /obj/item/clothing/head/cardborg @@ -101,7 +101,7 @@ desc = "A helmet made out of a box." icon_state = "cardborg_h" item_state = "cardborg_h" - flags = FPRINT | TABLEPASS | HEADCOVERSEYES | HEADCOVERSMOUTH + flags = FPRINT | HEADCOVERSEYES | HEADCOVERSMOUTH flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE /obj/item/clothing/head/justice @@ -109,7 +109,7 @@ desc = "fight for what's righteous!" icon_state = "justicered" item_state = "justicered" - flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR + flags = FPRINT|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR /obj/item/clothing/head/justice/blue icon_state = "justiceblue" @@ -131,7 +131,7 @@ name = "rabbit ears" desc = "Wearing these makes you looks useless, and only good for your sex appeal." icon_state = "bunny" - flags = FPRINT | TABLEPASS + flags = FPRINT /obj/item/clothing/head/flatcap name = "flat cap" @@ -165,35 +165,35 @@ icon_state = "bowler_hat" item_state = "bowler_hat" desc = "For that industrial age look." - flags = FPRINT|TABLEPASS + flags = FPRINT /obj/item/clothing/head/beaverhat name = "beaver hat" icon_state = "beaver_hat" item_state = "beaver_hat" desc = "Like a top hat, but made of beavers." - flags = FPRINT|TABLEPASS + flags = FPRINT /obj/item/clothing/head/boaterhat name = "boater hat" icon_state = "boater_hat" item_state = "boater_hat" desc = "Goes well with celery." - flags = FPRINT|TABLEPASS + flags = FPRINT /obj/item/clothing/head/squatter_hat name = "slav squatter hat" icon_state = "squatter_hat" item_state = "squatter_hat" desc = "Cyka blyat." - flags = FPRINT|TABLEPASS + flags = FPRINT /obj/item/clothing/head/fedora name = "\improper fedora" icon_state = "fedora" item_state = "fedora" desc = "A great hat ruined by being within fifty yards of you." - flags = FPRINT|TABLEPASS + flags = FPRINT /obj/item/clothing/head/fedora/OnMobLife(var/mob/living/carbon/human/wearer) if(!istype(wearer)) return @@ -215,7 +215,7 @@ icon_state = "fez" item_state = "fez" desc = "Put it on your monkey, make lots of cash money." - flags = FPRINT|TABLEPASS + flags = FPRINT //end bs12 hats @@ -224,7 +224,7 @@ desc = "Eeeee~heheheheheheh!" icon_state = "witch" item_state = "witch" - flags = FPRINT | TABLEPASS | BLOCKHAIR + flags = FPRINT | BLOCKHAIR siemens_coefficient = 2.0 /obj/item/clothing/head/chicken @@ -232,7 +232,7 @@ desc = "Bkaw!" icon_state = "chickenhead" item_state = "chickensuit" - flags = FPRINT | TABLEPASS | BLOCKHAIR + flags = FPRINT | BLOCKHAIR siemens_coefficient = 2.0 /obj/item/clothing/head/bearpelt @@ -240,7 +240,7 @@ desc = "Fuzzy." icon_state = "bearpelt" item_state = "bearpelt" - flags = FPRINT | TABLEPASS | BLOCKHEADHAIR + flags = FPRINT | BLOCKHEADHAIR siemens_coefficient = 2.0 /obj/item/clothing/head/xenos @@ -248,7 +248,7 @@ icon_state = "xenos" item_state = "xenos_helm" desc = "A helmet made out of chitinous alien hide." - flags = FPRINT | TABLEPASS | BLOCKHAIR + flags = FPRINT | BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE siemens_coefficient = 2.0 @@ -257,7 +257,7 @@ desc = "No one cares who you are until you put on the mask." icon_state = "bmhead" item_state = "bmhead" - flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR + flags = FPRINT | HEADCOVERSEYES | BLOCKHAIR flags_inv = HIDEEARS|HIDEEYES|HIDEFACE /obj/item/clothing/head/stalhelm @@ -265,7 +265,7 @@ desc = "Ein Helm, um die Nazi-Interesse an fremden Raumstationen zu sichern." icon_state = "stalhelm" item_state = "stalhelm" - flags = FPRINT | TABLEPASS | BLOCKHEADHAIR + flags = FPRINT | BLOCKHEADHAIR flags_inv = HIDEEARS /obj/item/clothing/head/panzer @@ -273,14 +273,14 @@ desc = "Ein Hut passen nur für die größten Tanks." icon_state = "panzercap" item_state = "panzercap" - flags = FPRINT | TABLEPASS + flags = FPRINT /obj/item/clothing/head/naziofficer name = "Officer Cap" desc = "Ein Hut von Offizieren in der Nazi-Partei getragen." icon_state = "officercap" item_state = "officercap" - flags = FPRINT | TABLEPASS | BLOCKHEADHAIR + flags = FPRINT | BLOCKHEADHAIR flags_inv = HIDEEARS /obj/item/clothing/head/russobluecamohat @@ -288,12 +288,12 @@ desc = "A symbol of discipline, honor, and lots and lots of removal of some type of skewered food." icon_state = "russobluecamohat" item_state = "russobluecamohat" - flags = FPRINT | TABLEPASS + flags = FPRINT /obj/item/clothing/head/russofurhat name = "russian fur hat" desc = "Russian winter got you down? Maybe your enemy, but not you!" icon_state = "russofurhat" item_state = "russofurhat" - flags = FPRINT | TABLEPASS | BLOCKHEADHAIR + flags = FPRINT | BLOCKHEADHAIR flags_inv = HIDEEARS \ No newline at end of file diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index d97a41737b8..cec5ac0c5c0 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -15,7 +15,7 @@ name = "welding helmet" desc = "A head-mounted face cover designed to protect the wearer completely from space-arc eye." icon_state = "welding" - flags = (FPRINT | TABLEPASS | HEADCOVERSEYES | HEADCOVERSMOUTH) + flags = FPRINT | HEADCOVERSEYES | HEADCOVERSMOUTH item_state = "welding" m_amt = 3000 g_amt = 1000 @@ -59,7 +59,7 @@ name = "cake-hat" desc = "It's tasty looking!" icon_state = "cake0" - flags = FPRINT|TABLEPASS|HEADCOVERSEYES + flags = FPRINT|HEADCOVERSEYES var/onfire = 0.0 var/status = 0 var/fire_resist = T0C+1300 //this is the max temp it can stand before you start to cook. although it might not burn away, you take damage @@ -123,7 +123,7 @@ icon_state = "hardhat0_pumpkin"//Could stand to be renamed item_state = "hardhat0_pumpkin" _color = "pumpkin" - flags = FPRINT | TABLEPASS | HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR + flags = FPRINT | HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE var/brightness_on = 2 //luminosity when on var/on = 0 @@ -158,7 +158,7 @@ name = "kitty ears" desc = "A pair of kitty ears. Meow!" icon_state = "kitty" - flags = FPRINT | TABLEPASS + flags = FPRINT var/icon/mob var/icon/mob2 siemens_coefficient = 1.5 @@ -184,7 +184,7 @@ desc = "So many butts, so little time." icon_state = "butt" item_state = "butt" - flags = TABLEPASS + flags = 0 force = 4.0 w_class = 1.0 throwforce = 2 diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index b8d46125772..619f79806f8 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -2,7 +2,7 @@ name = "cargo cap" desc = "It's a baseball hat in a tasteless yellow colour." icon_state = "cargosoft" - flags = FPRINT|TABLEPASS|HEADCOVERSEYES + flags = FPRINT|HEADCOVERSEYES item_state = "helmet" _color = "cargo" var/flipped = 0 diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 7f6816f4bd3..160b10ff52d 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -3,7 +3,7 @@ desc = "LOADSAMONEY" icon_state = "balaclava" item_state = "balaclava" - flags = FPRINT|TABLEPASS|BLOCKHAIR + flags = FPRINT|BLOCKHAIR flags_inv = HIDEFACE w_class = 2 species_fit = list("Vox") @@ -13,7 +13,7 @@ desc = "Worn by robust fighters, flying high to defeat their foes!" icon_state = "luchag" item_state = "luchag" - flags = FPRINT|TABLEPASS|BLOCKHAIR|MASKINTERNALS + flags = FPRINT|BLOCKHAIR|MASKINTERNALS flags_inv = HIDEFACE w_class = 2 siemens_coefficient = 3.0 diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index ed16187e56a..22a6e3834b0 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -3,7 +3,7 @@ name = "breath mask" icon_state = "breath" item_state = "breath" - flags = FPRINT | TABLEPASS | MASKCOVERSMOUTH | MASKINTERNALS + flags = FPRINT | MASKCOVERSMOUTH | MASKINTERNALS w_class = 2 gas_transfer_coefficient = 0.10 permeability_coefficient = 0.50 diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 5744f89ec77..e081ee658b6 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -2,7 +2,7 @@ name = "gas mask" desc = "A face-covering mask that can be connected to an air supply." icon_state = "gas_alt" - flags = FPRINT | TABLEPASS | MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS + flags = FPRINT | MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS flags_inv = HIDEEARS|HIDEEYES|HIDEFACE w_class = 3.0 can_flip = 1 diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 0b39e7017ea..d139d66e5e7 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -3,7 +3,7 @@ desc = "To stop that awful noise." icon_state = "muzzle" item_state = "muzzle" - flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH + flags = FPRINT|MASKCOVERSMOUTH w_class = 2 gas_transfer_coefficient = 0.90 species_fit = list("Vox") @@ -23,7 +23,7 @@ icon_state = "sterile" item_state = "sterile" w_class = 1 - flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH + flags = FPRINT|MASKCOVERSMOUTH gas_transfer_coefficient = 0.90 permeability_coefficient = 0.01 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 25, rad = 0) @@ -33,7 +33,7 @@ name = "fake moustache" desc = "Warning: moustache is fake." icon_state = "fake-moustache" - flags = FPRINT|TABLEPASS + flags = FPRINT flags_inv = HIDEFACE //scarves (fit in in mask slot) @@ -43,7 +43,7 @@ desc = "A blue neck scarf." icon_state = "blueneckscarf" item_state = "blueneckscarf" - flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH + flags = FPRINT|MASKCOVERSMOUTH w_class = 2 gas_transfer_coefficient = 0.90 @@ -52,7 +52,7 @@ desc = "A red and white checkered neck scarf." icon_state = "redwhite_scarf" item_state = "redwhite_scarf" - flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH + flags = FPRINT|MASKCOVERSMOUTH w_class = 2 gas_transfer_coefficient = 0.90 @@ -61,7 +61,7 @@ desc = "A green neck scarf." icon_state = "green_scarf" item_state = "green_scarf" - flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH + flags = FPRINT|MASKCOVERSMOUTH w_class = 2 gas_transfer_coefficient = 0.90 @@ -70,7 +70,7 @@ desc = "A stealthy, dark scarf." icon_state = "ninja_scarf" item_state = "ninja_scarf" - flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH + flags = FPRINT|MASKCOVERSMOUTH w_class = 2 gas_transfer_coefficient = 0.90 siemens_coefficient = 0 @@ -80,7 +80,7 @@ desc = "A rubber pig mask." icon_state = "pig" item_state = "pig" - flags = FPRINT|TABLEPASS|BLOCKHAIR + flags = FPRINT|BLOCKHAIR flags_inv = HIDEFACE w_class = 2 siemens_coefficient = 0.9 @@ -90,7 +90,7 @@ desc = "A mask made of soft vinyl and latex, representing the head of a horse." icon_state = "horsehead" item_state = "horsehead" - flags = FPRINT|TABLEPASS|BLOCKHAIR + flags = FPRINT|BLOCKHAIR flags_inv = HIDEFACE w_class = 2 var/voicechange = 0 @@ -101,7 +101,7 @@ desc = "A plain porcelain mask that covers the entire face. Standard attire for particularly unspeakable religions. The eyes are wide shut." icon_state = "chapmask" item_state = "chapmask" - flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH + flags = FPRINT|MASKCOVERSMOUTH flags_inv = HIDEFACE w_class = 2 gas_transfer_coefficient = 0.90 diff --git a/code/modules/clothing/masks/mystic.dm b/code/modules/clothing/masks/mystic.dm index 1da5863f0cd..c147fbf7960 100644 --- a/code/modules/clothing/masks/mystic.dm +++ b/code/modules/clothing/masks/mystic.dm @@ -3,7 +3,7 @@ desc = "\"I'm happy! I'M HAPPY! SEE! I SAID I'M HAPPY PLEASE DON'T\"" icon_state = "happiest" item_state = "happiest" - flags = FPRINT|TABLEPASS|MASKINTERNALS + flags = FPRINT|MASKINTERNALS flags_inv = HIDEFACE w_class = 2 siemens_coefficient = 3.0 diff --git a/code/modules/clothing/monkeyclothes/monkeyclothes.dm b/code/modules/clothing/monkeyclothes/monkeyclothes.dm index 2bbf9e90e88..c4ca7b88de5 100644 --- a/code/modules/clothing/monkeyclothes/monkeyclothes.dm +++ b/code/modules/clothing/monkeyclothes/monkeyclothes.dm @@ -9,7 +9,7 @@ throw_speed = 2 throw_range = 5 w_class = 3.0 - flags = FPRINT | TABLEPASS + flags = FPRINT /obj/item/clothing/monkeyclothes/attack(mob/living/carbon/C as mob, mob/user as mob) //I thought I'd give people a fast way to put clothes on monkey. if(ismonkey(C)) //They can do it by opening the monkey's "show inventory" like you'd do for an human as well. diff --git a/code/modules/clothing/spacesuits/captain.dm b/code/modules/clothing/spacesuits/captain.dm index 39d9337652e..f35b2e6fab0 100644 --- a/code/modules/clothing/spacesuits/captain.dm +++ b/code/modules/clothing/spacesuits/captain.dm @@ -4,7 +4,7 @@ icon_state = "capspace" item_state = "capspacehelmet" desc = "A special helmet designed for work in a hazardous, low-pressure environment. Only for the most fashionable of military figureheads." - flags = FPRINT | TABLEPASS | HEADCOVERSEYES | STOPSPRESSUREDMAGE + flags = FPRINT | HEADCOVERSEYES | STOPSPRESSUREDMAGE flags_inv = HIDEFACE permeability_coefficient = 0.01 armor = list(melee = 65, bullet = 50, laser = 50,energy = 25, bomb = 50, bio = 100, rad = 50) @@ -20,7 +20,7 @@ w_class = 4 gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 - flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE + flags = FPRINT | STOPSPRESSUREDMAGE body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_storage, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_nitrogen) slowdown = 1.5 diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index e091294aa7b..026e155f1e6 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -13,7 +13,7 @@ desc = "An armored beret commonly used by special operations officers." icon_state = "beret_badge" armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 30, rad = 30) - flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE + flags = FPRINT | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE siemens_coefficient = 0.9 //Paramedic EVA suit @@ -37,7 +37,7 @@ name = "Santa's hat" desc = "Ho ho ho. Merrry X-mas!" icon_state = "santahat" - flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE + flags = FPRINT | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE /obj/item/clothing/suit/space/santa name = "Santa's suit" @@ -45,7 +45,7 @@ icon_state = "santa" item_state = "santa" slowdown = 0 - flags = FPRINT | TABLEPASS | ONESIZEFITSALL | STOPSPRESSUREDMAGE + flags = FPRINT | ONESIZEFITSALL | STOPSPRESSUREDMAGE allowed = list(/obj/item) //for stuffing exta special presents @@ -56,7 +56,7 @@ icon_state = "pirate" item_state = "pirate" armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) - flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE + flags = FPRINT | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE siemens_coefficient = 0.9 diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 89f628963ec..ebcce7e535a 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -10,7 +10,7 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE species_restricted = list("Plasmaman") - flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | PLASMAGUARD + flags = FPRINT | STOPSPRESSUREDMAGE | PLASMAGUARD icon_state = "plasmaman_suit" item_state = "plasmaman_suit" @@ -35,7 +35,7 @@ H.ExtinguishMob() /obj/item/clothing/head/helmet/space/plasmaman - flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE | PLASMAGUARD + flags = FPRINT | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE | PLASMAGUARD species_restricted = list("Plasmaman") icon_state = "plasmaman_helmet0" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index cb46cb25007..05e3faa68b8 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -2,7 +2,7 @@ /obj/item/clothing/suit/armor allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_storage,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs) body_parts_covered = UPPER_TORSO|LOWER_TORSO - flags = FPRINT | TABLEPASS + flags = FPRINT cold_protection = UPPER_TORSO|LOWER_TORSO min_cold_protection_temperature = ARMOR_MIN_COLD_PROTECITON_TEMPERATURE @@ -17,7 +17,7 @@ icon_state = "armor" item_state = "armor" blood_overlay_type = "armor" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) /obj/item/clothing/suit/armor/vest/security @@ -91,7 +91,7 @@ item_state = "swat_suit" gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 - flags = FPRINT | TABLEPASS + flags = FPRINT body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS allowed = list(/obj/item/weapon/gun,/obj/item/ammo_storage,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_nitrogen) slowdown = 1 @@ -117,7 +117,7 @@ icon_state = "detective-armor" item_state = "armor" blood_overlay_type = "armor" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL body_parts_covered = UPPER_TORSO|LOWER_TORSO armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) @@ -132,7 +132,7 @@ item_state = "reactiveoff" blood_overlay_type = "armor" slowdown = 1 - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/suit/armor/reactive/IsShield() diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 93e5ade5e65..7f7c1e242dc 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -4,7 +4,7 @@ icon_state = "bio" desc = "A hood that protects the head and face from biological comtaminants." permeability_coefficient = 0.01 - flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR + flags = FPRINT|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES siemens_coefficient = 0.9 @@ -17,7 +17,7 @@ w_class = 4//bulky item gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 - flags = FPRINT | TABLEPASS + flags = FPRINT body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS slowdown = 1.0 allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_nitrogen,/obj/item/weapon/pen,/obj/item/device/flashlight/pen) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index df6332424f6..1b4df53975b 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -36,7 +36,7 @@ desc = "Yarr." icon_state = "pirate" item_state = "pirate" - flags = FPRINT | TABLEPASS + flags = FPRINT species_fit = list("Vox") @@ -45,7 +45,7 @@ desc = "Yarr." icon_state = "hgpirate" item_state = "hgpirate" - flags = FPRINT | TABLEPASS + flags = FPRINT flags_inv = HIDEJUMPSUIT species_fit = list("Vox") @@ -55,7 +55,7 @@ desc = "Suit for a cyborg costume." icon_state = "death" item_state = "death" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 fire_resist = T0C+5200 flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT @@ -66,7 +66,7 @@ desc = "A Nazi great coat" icon_state = "nazi" item_state = "nazi" - flags = FPRINT | TABLEPASS + flags = FPRINT /obj/item/clothing/suit/johnny_coat @@ -74,7 +74,7 @@ desc = "Johnny~~" icon_state = "johnny" item_state = "johnny" - flags = FPRINT | TABLEPASS + flags = FPRINT /obj/item/clothing/suit/justice @@ -82,7 +82,7 @@ desc = "this pretty much looks ridiculous" icon_state = "justice" item_state = "justice" - flags = FPRINT | TABLEPASS + flags = FPRINT flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT @@ -91,7 +91,7 @@ desc = "This robe commands authority." icon_state = "judge" item_state = "judge" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS allowed = list(/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/spacecash) flags_inv = HIDEJUMPSUIT @@ -120,7 +120,7 @@ item_state = "space_suit_syndicate" desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!" w_class = 3 - flags = FPRINT | TABLEPASS + flags = FPRINT allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_nitrogen,/obj/item/toy) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT @@ -244,21 +244,21 @@ desc = "A long, thick black leather coat." icon_state = "leathercoat" item_state = "leathercoat" - flags = FPRINT | TABLEPASS + flags = FPRINT /obj/item/clothing/suit/browncoat name = "brown leather coat" desc = "A long, brown leather coat." icon_state = "browncoat" item_state = "browncoat" - flags = FPRINT | TABLEPASS + flags = FPRINT /obj/item/clothing/suit/neocoat name = "black coat" desc = "A flowing, black coat." icon_state = "neocoat" item_state = "neocoat" - flags = FPRINT | TABLEPASS + flags = FPRINT //actual suits @@ -267,7 +267,7 @@ desc = "A cream coloured, genteel suit." icon_state = "creamsuit" item_state = "creamsuit" - flags = FPRINT | TABLEPASS + flags = FPRINT //stripper diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 3192f64adff..62b112f415c 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -21,7 +21,7 @@ allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_nitrogen,/obj/item/weapon/extinguisher) slowdown = 1.0 flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT - flags = FPRINT | TABLEPASS | ONESIZEFITSALL | STOPSPRESSUREDMAGE + flags = FPRINT | ONESIZEFITSALL | STOPSPRESSUREDMAGE heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECITON_TEMPERATURE cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS @@ -47,7 +47,7 @@ name = "bomb hood" desc = "Use in case of bomb." icon_state = "bombsuit" - flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR + flags = FPRINT|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 100, bio = 0, rad = 0) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES siemens_coefficient = 0 @@ -61,7 +61,7 @@ w_class = 4//bulky item gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 - flags = FPRINT | TABLEPASS + flags = FPRINT body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS slowdown = 2 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 100, bio = 0, rad = 0) @@ -88,7 +88,7 @@ name = "Radiation Hood" icon_state = "rad" desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation" - flags = FPRINT|TABLEPASS|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR + flags = FPRINT|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100) species_fit = list("Vox") diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index f48e84e6e45..37769cf058b 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -3,7 +3,7 @@ icon_state = "black" item_state = "bl_suit" _color = "black" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/color/blackf name = "feminine black jumpsuit" @@ -11,28 +11,28 @@ icon_state = "black" item_state = "bl_suit" _color = "blackf" - flags = FPRINT | TABLEPASS + flags = FPRINT /obj/item/clothing/under/color/blue name = "blue jumpsuit" icon_state = "blue" item_state = "b_suit" _color = "blue" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/color/green name = "green jumpsuit" icon_state = "green" item_state = "g_suit" _color = "green" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/color/grey name = "grey jumpsuit" icon_state = "grey" item_state = "gy_suit" _color = "grey" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") /obj/item/clothing/under/color/orange @@ -40,7 +40,7 @@ icon_state = "orange" item_state = "o_suit" _color = "orange" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/color/prisoner name = "prison jumpsuit" @@ -50,130 +50,130 @@ _color = "prisoner" has_sensor = 2 sensor_mode = 3 - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/color/pink name = "pink jumpsuit" icon_state = "pink" item_state = "p_suit" _color = "pink" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/color/red name = "red jumpsuit" icon_state = "red" item_state = "r_suit" _color = "red" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/color/white name = "white jumpsuit" icon_state = "white" item_state = "w_suit" _color = "white" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/color/yellow name = "yellow jumpsuit" icon_state = "yellow" item_state = "y_suit" _color = "yellow" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/psyche name = "psychedelic jumpsuit" desc = "Groovy!" icon_state = "psyche" _color = "psyche" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/lightblue name = "lightblue jumpsuit" icon_state = "lightblue" _color = "lightblue" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/aqua name = "aqua jumpsuit" icon_state = "aqua" _color = "aqua" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/purple name = "purple jumpsuit" icon_state = "purple" item_state = "p_suit" _color = "purple" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/lightpurple name = "lightpurple jumpsuit" icon_state = "lightpurple" _color = "lightpurple" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/lightgreen name = "lightgreen jumpsuit" icon_state = "lightgreen" _color = "lightgreen" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/lightbrown name = "lightbrown jumpsuit" icon_state = "lightbrown" _color = "lightbrown" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/brown name = "brown jumpsuit" icon_state = "brown" _color = "brown" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/yellowgreen name = "yellowgreen jumpsuit" icon_state = "yellowgreen" _color = "yellowgreen" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/darkblue name = "darkblue jumpsuit" icon_state = "darkblue" _color = "darkblue" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/lightred name = "lightred jumpsuit" icon_state = "lightred" _color = "lightred" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/darkred name = "darkred jumpsuit" icon_state = "darkred" _color = "darkred" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/blackpants name = "black pants" icon_state = "blpants" _color = "blpants" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/redpants name = "red pants" icon_state = "rpants" _color = "rpants" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/bluepants name = "blue pants" icon_state = "bpants" _color = "bpants" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/greypants name = "grey pants" icon_state = "gpants" _color = "gpants" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL \ No newline at end of file + flags = FPRINT | ONESIZEFITSALL \ No newline at end of file diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 0d30ee98d45..68cd189b5bc 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -6,7 +6,7 @@ icon_state = "ba_suit" item_state = "ba_suit" _color = "ba_suit" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") @@ -16,7 +16,7 @@ icon_state = "captain" item_state = "caparmor" _color = "captain" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") @@ -26,7 +26,7 @@ icon_state = "qm" item_state = "lb_suit" _color = "qm" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") @@ -36,7 +36,7 @@ icon_state = "cargotech" item_state = "lb_suit" _color = "cargo" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") @@ -46,7 +46,7 @@ icon_state = "chaplain" item_state = "bl_suit" _color = "chapblack" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") @@ -55,7 +55,7 @@ name = "chef's uniform" icon_state = "chef" _color = "chef" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") @@ -65,7 +65,7 @@ icon_state = "clown" item_state = "clown" _color = "clown" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/rank/head_of_personnel @@ -74,7 +74,7 @@ icon_state = "hop" item_state = "b_suit" _color = "hop" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") @@ -85,7 +85,7 @@ item_state = "g_suit" _color = "hydroponics" permeability_coefficient = 0.50 - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") /obj/item/clothing/under/rank/botany @@ -95,7 +95,7 @@ item_state = "botany" _color = "botany" permeability_coefficient = 0.50 - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/rank/internalaffairs @@ -104,7 +104,7 @@ icon_state = "internalaffairs" item_state = "internalaffairs" _color = "internalaffairs" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") @@ -114,14 +114,14 @@ icon_state = "janitor" _color = "janitor" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") /obj/item/clothing/under/lawyer desc = "Slick threads." name = "Lawyer suit" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/lawyer/black icon_state = "lawyer_black" @@ -177,7 +177,7 @@ icon_state = "red_suit" item_state = "red_suit" _color = "red_suit" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") @@ -187,7 +187,7 @@ icon_state = "mime" item_state = "mime" _color = "mime" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/rank/miner @@ -196,5 +196,5 @@ icon_state = "miner" item_state = "miner" _color = "miner" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm index ca1f814710d..69bc171c179 100644 --- a/code/modules/clothing/under/jobs/engineering.dm +++ b/code/modules/clothing/under/jobs/engineering.dm @@ -6,7 +6,7 @@ item_state = "g_suit" _color = "chief" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") /obj/item/clothing/under/rank/atmospheric_technician @@ -15,7 +15,7 @@ icon_state = "atmos" item_state = "atmos_suit" _color = "atmos" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") /obj/item/clothing/under/rank/engineer @@ -25,7 +25,7 @@ item_state = "engi_suit" _color = "engine" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") /obj/item/clothing/under/rank/maintenance_tech @@ -35,7 +35,7 @@ item_state = "mainttech" _color = "mainttech" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/rank/engine_tech desc = "It's a yellow jumpsuit worn by engine technicians. It has minor radiation shielding." @@ -44,7 +44,7 @@ item_state = "engine_tech" _color = "engine_tech" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/rank/electrician desc = "It's a yellow jumpsuit worn by electricians. It has minor energy shielding." @@ -53,7 +53,7 @@ item_state = "electrician" _color = "electrician" armor = list(melee = 0, bullet = 0, laser = 0,energy = 10, bomb = 0, bio = 0, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/rank/roboticist desc = "It's a slimming black jumpsuit with reinforced seams; great for industrial work." @@ -61,7 +61,7 @@ icon_state = "robotics" item_state = "robotics" _color = "robotics" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") /obj/item/clothing/under/rank/mechatronic @@ -70,7 +70,7 @@ icon_state = "mechatron" item_state = "mechatron" _color = "mechatron" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/rank/biomechanical desc = "It's a slim black jumpsuit with a long white undercoat, perfect for surgery and service." @@ -78,7 +78,7 @@ icon_state = "biomech" item_state = "biomech" _color = "biomech" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/rank/mechanic desc = "It's a set of blue and yellow overalls worn by station mechanics. Greaseproof, says the label." @@ -86,4 +86,4 @@ icon_state = "mechanic" item_state = "mechanic" _color = "mechanic" - flags = FPRINT | TABLEPASS \ No newline at end of file + flags = FPRINT \ No newline at end of file diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 5455fee8145..2fb02eadc7d 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -8,7 +8,7 @@ item_state = "g_suit" _color = "director" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") /obj/item/clothing/under/rank/scientist @@ -19,7 +19,7 @@ _color = "toxinswhite" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") /obj/item/clothing/under/rank/chemist @@ -30,7 +30,7 @@ _color = "chemistrywhite" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - flags = FPRINT | TABLEPASS + flags = FPRINT species_fit = list("Vox") /obj/item/clothing/under/rank/pharma @@ -41,7 +41,7 @@ _color = "pharma" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/rank/xenoarch desc = "It's made of a special fiber that provides minor protection against radiation. It has markings that denote the wearer as a xenoarcheologist." @@ -51,7 +51,7 @@ _color = "xenoarch" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/rank/plasmares desc = "It's made of a special fiber that provides minor protection against bombs. It has markings that denote the wearer as a plasma researcher." @@ -61,7 +61,7 @@ _color = "plasmares" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/rank/xenobio desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a xenobiologist." @@ -71,7 +71,7 @@ _color = "xenobio" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/rank/anomalist desc = "It's made of a special fiber that provides minor protection against radiation. It has markings that denote the wearer as an anomalist." @@ -81,7 +81,7 @@ _color = "anomalist" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /* * Medical @@ -94,7 +94,7 @@ _color = "cmo" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") /obj/item/clothing/under/rank/geneticist @@ -105,7 +105,7 @@ _color = "geneticswhite" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") /obj/item/clothing/under/rank/virologist @@ -116,7 +116,7 @@ _color = "virologywhite" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") /obj/item/clothing/under/rank/nursesuit @@ -127,7 +127,7 @@ _color = "nursesuit" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") /obj/item/clothing/under/rank/nurse @@ -138,7 +138,7 @@ _color = "nurse" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") /obj/item/clothing/under/rank/orderly @@ -149,7 +149,7 @@ _color = "orderly" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") /obj/item/clothing/under/rank/medical @@ -160,7 +160,7 @@ _color = "medical" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") /obj/item/clothing/under/rank/medical/blue @@ -168,7 +168,7 @@ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue." icon_state = "scrubsblue" _color = "scrubsblue" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") /obj/item/clothing/under/rank/medical/green @@ -176,7 +176,7 @@ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green." icon_state = "scrubsgreen" _color = "scrubsgreen" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") /obj/item/clothing/under/rank/medical/purple @@ -184,7 +184,7 @@ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple." icon_state = "scrubspurple" _color = "scrubspurple" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") //paramedic @@ -196,7 +196,7 @@ _color = "paramedic" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 10) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL species_fit = list("Vox") diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 831ca01a3c2..693461dea6e 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -15,7 +15,7 @@ item_state = "r_suit" _color = "warden" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL siemens_coefficient = 0.9 species_fit = list("Vox") @@ -26,7 +26,7 @@ item_state = "r_suit" _color = "secred" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL siemens_coefficient = 0.9 species_fit = list("Vox") @@ -37,7 +37,7 @@ item_state = "dispatch" _color = "dispatch" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL siemens_coefficient = 0.9 /obj/item/clothing/under/rank/security2 @@ -47,7 +47,7 @@ item_state = "r_suit" _color = "redshirt2" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL siemens_coefficient = 0.9 /* @@ -60,7 +60,7 @@ item_state = "det" _color = "detective" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL siemens_coefficient = 0.9 @@ -82,7 +82,7 @@ item_state = "r_suit" _color = "hosred" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL siemens_coefficient = 0.8 species_fit = list("Vox") @@ -91,7 +91,7 @@ name = "Head of Security Hat" desc = "The hat of the Head of Security. For showing the officers who's in charge." icon_state = "hoscap" - flags = FPRINT | TABLEPASS | HEADCOVERSEYES + flags = FPRINT | HEADCOVERSEYES armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0) flags_inv = 0 flags_inv = HIDEEARS diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 772b308495d..11f19b32845 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -31,7 +31,7 @@ name = "amish suit" icon_state = "sl_suit" _color = "sl_suit" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/waiter name = "waiter's outfit" @@ -39,7 +39,7 @@ icon_state = "waiter" item_state = "waiter" _color = "waiter" - flags = FPRINT | TABLEPASS + flags = FPRINT /obj/item/clothing/under/rank/mailman name = "mailman's jumpsuit" @@ -85,7 +85,7 @@ w_class = 4//bulky item gas_transfer_coefficient = 0.01 permeability_coefficient = 0.02 - flags = FPRINT | TABLEPASS + flags = FPRINT body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | ARMS //Needs gloves and shoes with cold protection to be fully protected. min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECITON_TEMPERATURE @@ -98,7 +98,7 @@ desc = "it's a cybernetically enhanced jumpsuit used for administrative duties." gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 - flags = FPRINT | TABLEPASS + flags = FPRINT body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS armor = list(melee = 100, bullet = 100, laser = 100,energy = 100, bomb = 100, bio = 100, rad = 100) cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS @@ -110,7 +110,7 @@ desc = "A jumpsuit with owl wings. Photorealistic owl feathers! Twooooo!" icon_state = "owl" _color = "owl" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL /obj/item/clothing/under/johnny name = "johnny~~ jumpsuit" diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 48a2cb55089..f144d56f5b6 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -2,7 +2,7 @@ name = "athletic shorts" desc = "95% Polyester, 5% Spandex!" gender = PLURAL - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | ONESIZEFITSALL body_parts_covered = LOWER_TORSO /obj/item/clothing/under/shorts/red diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index fd2fe97550e..973bb853bdc 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -5,7 +5,7 @@ icon_state = "bluetie" item_state = "" //no inhands _color = "bluetie" - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = 0 w_class = 2.0 diff --git a/code/modules/detectivework/detective_scanner.dm b/code/modules/detectivework/detective_scanner.dm index c83c64cf8f1..0a427665af4 100644 --- a/code/modules/detectivework/detective_scanner.dm +++ b/code/modules/detectivework/detective_scanner.dm @@ -9,7 +9,7 @@ var/list/stored = list() w_class = 3.0 item_state = "electronic" - flags = FPRINT | TABLEPASS | USEDELAY + flags = FPRINT | USEDELAY siemens_coefficient = 1 slot_flags = SLOT_BELT diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm index 642cb446116..9f63f469848 100644 --- a/code/modules/hydroponics/grown_inedible.dm +++ b/code/modules/hydroponics/grown_inedible.dm @@ -43,7 +43,7 @@ icon = 'icons/obj/harvest.dmi' icon_state = "logs" force = 5 - flags = TABLEPASS + flags = 0 throwforce = 5 w_class = 3.0 throw_speed = 3 @@ -74,7 +74,7 @@ icon_state = "sunflower" damtype = "fire" force = 0 - flags = TABLEPASS + flags = 0 throwforce = 1 w_class = 1.0 throw_speed = 1 @@ -92,7 +92,7 @@ icon_state = "nettle" damtype = "fire" force = 15 - flags = TABLEPASS + flags = 0 throwforce = 1 w_class = 2.0 throw_speed = 1 @@ -137,7 +137,7 @@ icon_state = "deathnettle" damtype = "fire" force = 30 - flags = TABLEPASS + flags = 0 throwforce = 1 w_class = 2.0 throw_speed = 1 diff --git a/code/modules/hydroponics/hydro_tools.dm b/code/modules/hydroponics/hydro_tools.dm index 6737868ab54..47002d73920 100644 --- a/code/modules/hydroponics/hydro_tools.dm +++ b/code/modules/hydroponics/hydro_tools.dm @@ -168,7 +168,7 @@ /obj/item/weapon/plantspray icon = 'icons/obj/hydroponics.dmi' item_state = "spray" - flags = TABLEPASS | FPRINT | NOBLUDGEON + flags = FPRINT | NOBLUDGEON slot_flags = SLOT_BELT throwforce = 4 w_class = 2.0 @@ -220,7 +220,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "hoe" item_state = "hoe" - flags = FPRINT | TABLEPASS | NOBLUDGEON + flags = FPRINT | NOBLUDGEON siemens_coefficient = 1 force = 5.0 throwforce = 7.0 @@ -236,7 +236,7 @@ name = "bottle of weedkiller" icon = 'icons/obj/chemical.dmi' icon_state = "bottle16" - flags = FPRINT | TABLEPASS + flags = FPRINT var/toxicity = 0 var/weed_kill_str = 0 @@ -244,7 +244,7 @@ name = "bottle of glyphosate" icon = 'icons/obj/chemical.dmi' icon_state = "bottle16" - flags = FPRINT | TABLEPASS + flags = FPRINT toxicity = 4 weed_kill_str = 2 @@ -252,7 +252,7 @@ name = "bottle of triclopyr" icon = 'icons/obj/chemical.dmi' icon_state = "bottle18" - flags = FPRINT | TABLEPASS + flags = FPRINT toxicity = 6 weed_kill_str = 4 @@ -260,7 +260,7 @@ name = "bottle of 2,4-D" icon = 'icons/obj/chemical.dmi' icon_state = "bottle15" - flags = FPRINT | TABLEPASS + flags = FPRINT toxicity = 8 weed_kill_str = 7 @@ -274,7 +274,7 @@ desc = "A small glass bottle. Can hold up to 10 units." icon = 'icons/obj/chemical.dmi' icon_state = "bottle16" - flags = FPRINT | TABLEPASS | OPENCONTAINER + flags = FPRINT | OPENCONTAINER possible_transfer_amounts = null w_class = 2.0 @@ -314,7 +314,7 @@ desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood." icon = 'icons/obj/weapons.dmi' icon_state = "hatchet" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 12.0 w_class = 2.0 @@ -346,7 +346,7 @@ throw_speed = 1 throw_range = 3 w_class = 4.0 - flags = FPRINT | TABLEPASS | NOSHIELD + flags = FPRINT | NOSHIELD slot_flags = SLOT_BACK origin_tech = "materials=2;combat=2" attack_verb = list("chopped", "sliced", "cut", "reaped") diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 48d61cb6724..8ad98a47c68 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -3,7 +3,7 @@ name = "packet of seeds" icon = 'icons/obj/seeds.dmi' icon_state = "seed" - flags = FPRINT | TABLEPASS + flags = FPRINT w_class = 2.0 var/seed_type diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index cd07868a1d9..af36d5226dd 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -165,7 +165,7 @@ throw_speed = 1 throw_range = 5 w_class = 3 //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever) - flags = FPRINT | TABLEPASS + flags = FPRINT attack_verb = list("bashed", "whacked", "educated") autoignition_temperature = AUTOIGNITION_PAPER @@ -295,7 +295,7 @@ throw_speed = 1 throw_range = 5 w_class = 1.0 - flags = FPRINT | TABLEPASS + flags = FPRINT var/obj/machinery/librarycomp/computer // Associated computer - Modes 1 to 3 use this var/obj/item/weapon/book/book // Currently scanned book var/mode = 0 // 0 - Scan only, 1 - Scan and Set Buffer, 2 - Scan and Attempt to Check In, 3 - Scan and Attempt to Add to Inventory diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 33045444597..51c7b310563 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -188,7 +188,7 @@ proc/move_mining_shuttle() name = "pickaxe" icon = 'icons/obj/items.dmi' icon_state = "pickaxe" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT force = 15.0 diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm index a3c5dcfe7e7..1e94d5a6cf7 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/storage.dmi' name = "Money bag" icon_state = "moneybag" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 10.0 throwforce = 2.0 diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index b4139ce34ea..19bd4ca022f 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -291,7 +291,7 @@ icon = 'icons/obj/items.dmi' name = "Coin" icon_state = "coin" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 0.0 throwforce = 0.0 diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 6718cca583c..664c9f3a5db 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -15,7 +15,7 @@ var/const/MAX_ACTIVE_TIME = 400 icon_state = "facehugger" item_state = "facehugger" w_class = 1 //note: can be picked up by aliens unlike most other items of w_class below 4 - flags = FPRINT | TABLEPASS | MASKCOVERSMOUTH | MASKCOVERSEYES | MASKINTERNALS + flags = FPRINT | MASKCOVERSMOUTH | MASKCOVERSEYES | MASKINTERNALS throw_range = 5 var/stat = CONSCIOUS //UNCONSCIOUS is the idle state in this case diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index b5e2187d012..42e35bfd3b2 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -3,7 +3,7 @@ health = 400 //They need to live awhile longer than other organs. desc = "A piece of juicy meat found in a person's head." icon_state = "brain2" - flags = TABLEPASS + flags = 0 force = 1.0 w_class = 1.0 throwforce = 1.0 diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index b6ed4885d9b..b3e115d43c6 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -726,7 +726,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"." icon = 'icons/mob/slimes.dmi' icon_state = "grey slime extract" - flags = TABLEPASS | FPRINT + flags = FPRINT force = 1.0 w_class = 1.0 throwforce = 1.0 @@ -980,7 +980,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS|HEAD slowdown = 1.0 flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT - flags = FPRINT | TABLEPASS | ONESIZEFITSALL | STOPSPRESSUREDMAGE + flags = FPRINT | ONESIZEFITSALL | STOPSPRESSUREDMAGE heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS | HEAD max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECITON_TEMPERATURE cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS | HEAD @@ -1034,7 +1034,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 desc = "a golem's head" canremove = 0 unacidable = 1 - flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE + flags = FPRINT | STOPSPRESSUREDMAGE heat_protection = HEAD max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECITON_TEMPERATURE armor = list(melee = 80, bullet = 20, laser = 20, energy = 10, bomb = 0, bio = 0, rad = 0) @@ -1155,7 +1155,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"." icon = 'icons/mob/slimes.dmi' icon_state = "slime extract" - flags = TABLEPASS + flags = 0 force = 1.0 w_class = 1.0 throwforce = 1.0 diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index 1a2a9b08af4..37d7d23dadb 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -164,7 +164,7 @@ icon_state = "robotanalyzer" item_state = "analyzer" desc = "A hand-held scanner able to diagnose robotic injuries." - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT throwforce = 3 diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 31e9e24fe1d..b2c650d7410 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -4,7 +4,7 @@ icon_state = "std_module" w_class = 100.0 item_state = "electronic" - flags = FPRINT|TABLEPASS + flags = FPRINT siemens_coefficient = 1 var/list/modules = list() diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 92837728188..0f248aa96ad 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -9,7 +9,7 @@ throw_range = 10 var/obj/item/weapon/pen/haspen //The stored pen. var/obj/item/weapon/toppaper //The topmost piece of paper. - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT /obj/item/weapon/clipboard/New() diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index dfed6fdface..c9d557f3201 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -110,7 +110,7 @@ icon = 'icons/obj/bureaucracy.dmi' icon_state = "pen" item_state = "pen" - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT | slot_ears throwforce = 0 w_class = 1.0 @@ -179,7 +179,7 @@ */ /obj/item/weapon/pen/sleepypen desc = "It's a black ink pen with a sharp point and a carefully engraved \"Waffle Co.\"" - flags = FPRINT | TABLEPASS | OPENCONTAINER + flags = FPRINT | OPENCONTAINER slot_flags = SLOT_BELT origin_tech = "materials=2;syndicate=5" @@ -202,7 +202,7 @@ * Parapens */ /obj/item/weapon/pen/paralysis - flags = FPRINT | TABLEPASS | OPENCONTAINER + flags = FPRINT | OPENCONTAINER slot_flags = SLOT_BELT origin_tech = "materials=2;syndicate=5" diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 6934966c506..cc3d0aecbc1 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -102,7 +102,7 @@ icon_state = "polaroid" item_state = "polaroid" w_class = 2.0 - flags = FPRINT | USEDELAY | TABLEPASS + flags = FPRINT | USEDELAY siemens_coefficient = 1 slot_flags = SLOT_BELT m_amt = 2000 diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 74bdc3e3875..3c034a81621 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/bureaucracy.dmi' icon_state = "stamp-qm" item_state = "stamp" - flags = FPRINT | TABLEPASS + flags = FPRINT throwforce = 0 w_class = 1.0 throw_speed = 7 diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index 44f01bccaba..89899620f07 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -234,7 +234,7 @@ proc/cardinalrange(var/center) icon_state = "box" item_state = "electronic" w_class = 4.0 - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 throwforce = 5 throw_speed = 1 diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 6ca9e4d665c..ae1fe33452a 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -187,7 +187,7 @@ throw_range = 5 m_amt = CC_PER_SHEET_METAL w_type = RECYK_METAL - flags = TABLEPASS | USEDELAY | FPRINT + flags = USEDELAY | FPRINT siemens_coefficient = 1.5 //extra conducting slot_flags = SLOT_BELT item_state = "coil_red" diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 253a32b2d58..d89f1c81be1 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -17,7 +17,7 @@ desc = "Used for building lights." icon = 'icons/obj/lighting.dmi' icon_state = "tube-construct-item" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 var/fixture_type = "tube" var/obj/machinery/light/newlight = null @@ -65,7 +65,7 @@ desc = "Used for building small lights." icon = 'icons/obj/lighting.dmi' icon_state = "bulb-construct-item" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 fixture_type = "bulb" sheets_refunded = 1 @@ -643,7 +643,7 @@ /obj/item/weapon/light icon = 'icons/obj/lighting.dmi' - flags = FPRINT | TABLEPASS + flags = FPRINT force = 2 throwforce = 5 w_class = 1 diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 6da76563761..7e836f148b6 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -283,7 +283,7 @@ var/power = 1 anchored = 1.0 - flags = TABLEPASS + flags = 0 damage_type=BURN damage=30 diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 5a36f949ec9..22d06be89c4 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -3,7 +3,7 @@ desc = "A bullet casing." icon = 'icons/obj/ammo.dmi' icon_state = "s-casing" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT throwforce = 1 @@ -33,7 +33,7 @@ desc = "A box of ammo." icon_state = "357" icon = 'icons/obj/ammo.dmi' - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT item_state = "syringe_kit" diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 41fe45c2584..beba3c1b6ca 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/gun.dmi' icon_state = "detective" item_state = "gun" - flags = FPRINT | TABLEPASS | USEDELAY + flags = FPRINT | USEDELAY siemens_coefficient = 1 slot_flags = SLOT_BELT m_amt = 2000 diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 7a657708ac2..a821f93a536 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -5,7 +5,7 @@ fire_sound = 'sound/weapons/ion.ogg' origin_tech = "combat=2;magnets=4" w_class = 4.0 - flags = FPRINT | TABLEPASS | USEDELAY + flags = FPRINT | USEDELAY siemens_coefficient = 1 slot_flags = SLOT_BACK charge_cost = 100 @@ -37,7 +37,7 @@ var/available_staff_transforms=list("monkey","robot","slime","xeno","human","fur icon_state = "staffofchange" item_state = "staffofchange" fire_sound = 'sound/weapons/radgun.ogg' - flags = FPRINT | TABLEPASS | USEDELAY + flags = FPRINT | USEDELAY siemens_coefficient = 1 slot_flags = SLOT_BACK w_class = 4.0 diff --git a/code/modules/projectiles/guns/projectile/bow.dm b/code/modules/projectiles/guns/projectile/bow.dm index 943ffd76866..960dfb503b8 100644 --- a/code/modules/projectiles/guns/projectile/bow.dm +++ b/code/modules/projectiles/guns/projectile/bow.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "bolt" item_state = "bolt" - flags = FPRINT | TABLEPASS + flags = FPRINT throwforce = 8 w_class = 3.0 sharp = 1 @@ -43,7 +43,7 @@ icon_state = "crossbow" item_state = "crossbow-solid" w_class = 5.0 - flags = FPRINT | TABLEPASS | USEDELAY + flags = FPRINT | USEDELAY siemens_coefficient = 1 slot_flags = SLOT_BELT | SLOT_BACK diff --git a/code/modules/projectiles/guns/projectile/flare.dm b/code/modules/projectiles/guns/projectile/flare.dm index f114b2201ec..1e0b47edd07 100644 --- a/code/modules/projectiles/guns/projectile/flare.dm +++ b/code/modules/projectiles/guns/projectile/flare.dm @@ -15,7 +15,7 @@ force = 4 recoil = 1 fire_delay = 10 - flags = FPRINT | TABLEPASS | USEDELAY + flags = FPRINT | USEDELAY siemens_coefficient = 1 caliber = list("flare" = 1) origin_tech = "combat=2;materials=2" diff --git a/code/modules/projectiles/guns/projectile/pneumatic.dm b/code/modules/projectiles/guns/projectile/pneumatic.dm index 72e7d6760be..28530d31116 100644 --- a/code/modules/projectiles/guns/projectile/pneumatic.dm +++ b/code/modules/projectiles/guns/projectile/pneumatic.dm @@ -5,7 +5,7 @@ icon_state = "pneumatic" item_state = "pneumatic" w_class = 5.0 - flags = FPRINT | TABLEPASS | USEDELAY + flags = FPRINT | USEDELAY siemens_coefficient = 1 slot_flags = SLOT_BELT max_w_class = 3 diff --git a/code/modules/projectiles/guns/projectile/rocketlauncher.dm b/code/modules/projectiles/guns/projectile/rocketlauncher.dm index e9d5cd619a9..db6a37209c3 100644 --- a/code/modules/projectiles/guns/projectile/rocketlauncher.dm +++ b/code/modules/projectiles/guns/projectile/rocketlauncher.dm @@ -13,7 +13,7 @@ throw_speed = 4 throw_range = 3 fire_delay = 5 - flags = FPRINT | TABLEPASS | USEDELAY + flags = FPRINT | USEDELAY siemens_coefficient = 1 slot_flags = SLOT_BACK caliber = list("rpg" = 1) diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index fdabd0b190f..4bfd3d2777d 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -7,7 +7,7 @@ max_shells = 4 w_class = 4.0 force = 10 - flags = FPRINT | TABLEPASS | USEDELAY + flags = FPRINT | USEDELAY siemens_coefficient = 1 slot_flags = SLOT_BACK caliber = list("shotgun" = 1, "flare" = 1) //flare shells are still shells @@ -74,7 +74,7 @@ max_shells = 2 w_class = 4.0 force = 10 - flags = FPRINT | TABLEPASS | USEDELAY + flags = FPRINT | USEDELAY siemens_coefficient = 1 slot_flags = SLOT_BACK caliber = list("shotgun" = 1, "flare" = 1) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index c9eaf738cee..e080378af0a 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -16,7 +16,7 @@ density = 1 unacidable = 1 anchored = 1 //There's a reason this is here, Mport. God fucking damn it -Agouri. Find&Fix by Pete. The reason this is here is to stop the curving of emitter shots. - flags = FPRINT | TABLEPASS + flags = FPRINT pass_flags = PASSTABLE mouse_opacity = 0 var/bumped = 0 //Prevents it from hitting more than one guy at once diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index 94faf0c5634..ef511349951 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -10,7 +10,7 @@ desc = "Just your average condiment container." icon = 'icons/obj/food.dmi' icon_state = "emptycondiment" - flags = FPRINT | TABLEPASS | OPENCONTAINER + flags = FPRINT | OPENCONTAINER possible_transfer_amounts = list(1,5,10) volume = 50 diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index a6dad08af3e..3fc552fff27 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -6,7 +6,7 @@ desc = "yummy" icon = 'icons/obj/drinks.dmi' icon_state = null - flags = FPRINT | TABLEPASS | OPENCONTAINER + flags = FPRINT | 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 @@ -279,7 +279,7 @@ amount_per_transfer_from_this = 20 possible_transfer_amounts = null volume = 150 - flags = FPRINT | TABLEPASS | OPENCONTAINER + flags = FPRINT | OPENCONTAINER siemens_coefficient = 1 /obj/item/weapon/reagent_containers/food/drinks/golden_cup/tournament_26_06_2011 diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index ff24ceb39e3..a1012209ad4 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -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 = FPRINT | OPENCONTAINER var/label_text = "" @@ -226,7 +226,7 @@ w_type = RECYK_GLASS amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,25,30,50,100) - flags = FPRINT | TABLEPASS | OPENCONTAINER + flags = FPRINT | OPENCONTAINER /obj/item/weapon/reagent_containers/glass/beaker/noreact name = "stasis beaker" @@ -236,7 +236,7 @@ volume = 50 w_type = RECYK_GLASS amount_per_transfer_from_this = 10 - flags = FPRINT | TABLEPASS | OPENCONTAINER | NOREACT + flags = FPRINT | OPENCONTAINER | NOREACT /obj/item/weapon/reagent_containers/glass/beaker/noreactlarge name = "large stasis beaker" @@ -246,7 +246,7 @@ volume = 100 w_type = RECYK_GLASS amount_per_transfer_from_this = 10 - flags = FPRINT | TABLEPASS | OPENCONTAINER | NOREACT + flags = FPRINT | OPENCONTAINER | NOREACT /obj/item/weapon/reagent_containers/glass/beaker/bluespace name = "bluespace beaker" @@ -257,7 +257,7 @@ w_type = RECYK_GLASS amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,25,30,50,100,200) - flags = FPRINT | TABLEPASS | OPENCONTAINER + flags = FPRINT | OPENCONTAINER /obj/item/weapon/reagent_containers/glass/beaker/bluespacelarge name = "large bluespace beaker" @@ -268,7 +268,7 @@ w_type = RECYK_GLASS amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,25,30,50,100,150,200,300) - flags = FPRINT | TABLEPASS | OPENCONTAINER + flags = FPRINT | OPENCONTAINER /obj/item/weapon/reagent_containers/glass/beaker/vial @@ -280,7 +280,7 @@ w_type = RECYK_GLASS amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,25) - flags = FPRINT | TABLEPASS | OPENCONTAINER + flags = FPRINT | OPENCONTAINER /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone New() @@ -334,7 +334,7 @@ volume = 15 amount_per_transfer_from_this = 5 possible_transfer_amounts = list(1,5,15) - flags = FPRINT | TABLEPASS | OPENCONTAINER */ + flags = FPRINT | OPENCONTAINER */ /* /obj/item/weapon/reagent_containers/glass/blender_jug @@ -374,7 +374,7 @@ icon = 'icons/obj/chemical.dmi' icon_state = "beaker0" amount_per_transfer_from_this = 10 - flags = FPRINT | TABLEPASS | OPENCONTAINER + flags = FPRINT | OPENCONTAINER /obj/item/weapon/reagent_containers/glass/dispenser/surfactant name = "reagent glass (surfactant)" diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm index 675d302165b..c15e8336e0a 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle.dm @@ -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 = FPRINT | OPENCONTAINER volume = 30 g_amt = 1000 // Half of a circuit board w_type = RECYK_GLASS diff --git a/code/modules/reagents/reagent_containers/glass/bottle/robot.dm b/code/modules/reagents/reagent_containers/glass/bottle/robot.dm index 9286e5ab03b..1e43650ba43 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle/robot.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle/robot.dm @@ -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 = FPRINT | OPENCONTAINER volume = 60 var/reagent = "" diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index f061fef9c20..075c2eb50d0 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -11,7 +11,7 @@ amount_per_transfer_from_this = 5 volume = 30 possible_transfer_amounts = null - flags = FPRINT | TABLEPASS | OPENCONTAINER + flags = FPRINT | OPENCONTAINER slot_flags = SLOT_BELT /obj/item/weapon/reagent_containers/hypospray/attack_paw(mob/user as mob) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 485e961d2ee..716f22e15ce 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/janitor.dmi' icon_state = "cleaner" item_state = "cleaner" - flags = TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY + flags = OPENCONTAINER|FPRINT|USEDELAY slot_flags = SLOT_BELT throwforce = 3 w_class = 2.0 diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 5add31e4cdd..353e9f91532 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -208,7 +208,7 @@ w_class = 1 item_state = "electronic" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 slot_flags = SLOT_BELT diff --git a/code/modules/research/mechanic/device_analyser.dm b/code/modules/research/mechanic/device_analyser.dm index 4a5e2bbc416..d073107d089 100644 --- a/code/modules/research/mechanic/device_analyser.dm +++ b/code/modules/research/mechanic/device_analyser.dm @@ -12,7 +12,7 @@ var/syndi_filter = 1 //whether the scanner should filter traitor tech items. 1 is filtered, 0 is not filtered var/access_avoidance = 0 //whether the scanner can ignore access requirements for machines. 1 is ignore, 0 is not var/loadone = 0 //whether or not it should load just one at a time. 0 is all at once, 1 is one at a time - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT w_class = 2 item_state = "electronic" diff --git a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm index b31ff34ad20..6e1dfa23949 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm @@ -5,7 +5,7 @@ icon_state = "ano_scanner" item_state = "lampgreen" w_class = 1.0 - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT var/nearest_artifact_id = "unknown" var/nearest_artifact_distance = -1 diff --git a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm index 0c889dc6ee1..895ed8c17ef 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm @@ -20,7 +20,7 @@ icon_state = "sampler0" item_state = "screwdriver_brown" w_class = 1.0 - flags = FPRINT | TABLEPASS + flags = FPRINT //slot_flags = SLOT_BELT var/sampled_turf = "" var/num_stored_bags = 10 diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm index 83205776626..d70d8ccc4ba 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm @@ -10,7 +10,7 @@ icon_state = "crap" item_state = "analyzer" w_class = 1.0 - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT var/list/positive_locations = list() var/datum/depth_scan/current diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index 4037b472fc9..3fb68f1cd15 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -5,7 +5,7 @@ var/list/GPS_list = list() icon = 'icons/obj/telescience.dmi' icon_state = "gps-c" w_class = 2.0 - flags = FPRINT | TABLEPASS + flags = FPRINT slot_flags = SLOT_BELT origin_tech = "bluespace=2;magnets=2" var/gpstag = "COM0" diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index e26e890469d..29db8100b8f 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -101,7 +101,7 @@ desc = "Use this to send crates and closets to cargo telepads." icon = 'icons/obj/telescience.dmi' icon_state = "rcs" - flags = FPRINT | TABLEPASS + flags = FPRINT siemens_coefficient = 1 force = 10.0 throwforce = 10.0 diff --git a/code/modules/virus2/helpers.dm b/code/modules/virus2/helpers.dm index a11f9b7b898..3a9a80e6059 100644 --- a/code/modules/virus2/helpers.dm +++ b/code/modules/virus2/helpers.dm @@ -42,7 +42,7 @@ proc/get_infection_chance(var/mob/living/carbon/M, var/vector = "Airborne") //Checks if table-passing table can reach target (5 tile radius) proc/airborne_can_reach(turf/source, turf/target, var/radius=5) var/obj/dummy = new(source) - dummy.flags = FPRINT | TABLEPASS + dummy.flags = FPRINT dummy.pass_flags = PASSTABLE for(var/i=0, i