From aade8c356fd0282bfa0bb775cdf3a49ad5e828bc Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sat, 2 Mar 2019 20:34:49 -0600 Subject: [PATCH] Items are now assumed to be conductive, rather than the opposite --- code/__defines/flags.dm | 2 +- code/defines/obj.dm | 1 - code/defines/obj/weapon.dm | 6 +----- code/game/gamemodes/nuclear/pinpointer.dm | 1 - code/game/machinery/atmoalter/canister.dm | 1 - code/game/machinery/magnet.dm | 2 +- code/game/machinery/wall_frames.dm | 1 - code/game/mecha/mecha_parts.dm | 2 -- code/game/objects/items/apc_frame.dm | 1 - code/game/objects/items/devices/binoculars.dm | 3 --- code/game/objects/items/devices/chameleonproj.dm | 1 - code/game/objects/items/devices/debugger.dm | 1 - code/game/objects/items/devices/flash.dm | 1 - code/game/objects/items/devices/flashlight.dm | 13 ++++--------- code/game/objects/items/devices/lightreplacer.dm | 1 - code/game/objects/items/devices/megaphone.dm | 1 - code/game/objects/items/devices/multitool.dm | 1 - code/game/objects/items/devices/powersink.dm | 1 - .../game/objects/items/devices/radio/electropack.dm | 1 - code/game/objects/items/devices/radio/intercom.dm | 4 ++-- code/game/objects/items/devices/radio/radio.dm | 1 - code/game/objects/items/devices/scanners.dm | 7 +------ code/game/objects/items/devices/spy_bug.dm | 3 --- code/game/objects/items/devices/suit_cooling.dm | 1 - code/game/objects/items/devices/taperecorder.dm | 1 - code/game/objects/items/devices/traitordevices.dm | 1 - code/game/objects/items/devices/whistle.dm | 1 - code/game/objects/items/robot/robot_parts.dm | 1 - code/game/objects/items/stacks/rods.dm | 1 - code/game/objects/items/stacks/tiles/tile_types.dm | 1 - code/game/objects/items/toys.dm | 1 - code/game/objects/items/weapons/AI_modules.dm | 1 - code/game/objects/items/weapons/RCD.dm | 2 +- code/game/objects/items/weapons/autopsy.dm | 1 - code/game/objects/items/weapons/cigs_lighters.dm | 1 - .../items/weapons/circuitboards/circuitboard.dm | 1 - code/game/objects/items/weapons/extinguisher.dm | 1 - code/game/objects/items/weapons/flamethrower.dm | 1 - code/game/objects/items/weapons/grenades/grenade.dm | 1 - .../items/weapons/grenades/spawnergrenade.dm | 1 - code/game/objects/items/weapons/handcuffs.dm | 2 -- .../objects/items/weapons/improvised_components.dm | 1 - code/game/objects/items/weapons/material/knives.dm | 1 - code/game/objects/items/weapons/melee/energy.dm | 5 ++--- code/game/objects/items/weapons/melee/misc.dm | 2 -- code/game/objects/items/weapons/shields.dm | 3 +-- .../game/objects/items/weapons/storage/briefcase.dm | 1 - code/game/objects/items/weapons/storage/toolbox.dm | 1 - code/game/objects/items/weapons/surgery_tools.dm | 3 +-- code/game/objects/items/weapons/tanks/tank_types.dm | 3 --- code/game/objects/items/weapons/tanks/tanks.dm | 1 - code/game/objects/items/weapons/teleportation.dm | 1 - code/game/objects/items/weapons/tools/crowbar.dm | 1 - .../game/objects/items/weapons/tools/screwdriver.dm | 1 - .../game/objects/items/weapons/tools/weldingtool.dm | 1 - .../game/objects/items/weapons/tools/wirecutters.dm | 1 - code/game/objects/items/weapons/tools/wrench.dm | 1 - code/game/objects/items/weapons/trays.dm | 1 - code/game/objects/structures/grille.dm | 3 +-- code/game/objects/structures/lattice.dm | 1 - code/game/objects/structures/target_stake.dm | 1 - code/modules/assembly/assembly.dm | 1 - code/modules/assembly/holder.dm | 4 ++-- code/modules/assembly/shock_kit.dm | 1 - code/modules/clothing/suits/miscellaneous.dm | 1 - code/modules/economy/retail_scanner.dm | 2 +- code/modules/food/food/drinks.dm | 2 +- code/modules/integrated_electronics/core/tools.dm | 2 -- code/modules/materials/material_sheets.dm | 4 ++-- code/modules/mining/coins.dm | 1 - code/modules/mining/mine_items.dm | 2 -- code/modules/mining/money_bag.dm | 1 - code/modules/mob/living/silicon/robot/analyzer.dm | 1 - .../living/silicon/robot/robot_modules/station.dm | 1 - code/modules/paperwork/photography.dm | 1 - code/modules/power/antimatter/shielding.dm | 1 - code/modules/power/cable.dm | 4 +--- code/modules/power/lighting.dm | 4 ++-- code/modules/projectiles/ammunition.dm | 2 -- code/modules/projectiles/gun.dm | 1 - code/modules/projectiles/guns/energy/special.dm | 2 -- code/modules/projectiles/guns/launcher.dm | 1 - code/modules/projectiles/guns/launcher/pneumatic.dm | 1 - code/modules/projectiles/guns/launcher/rocket.dm | 1 - .../projectiles/guns/launcher/syringe_gun.dm | 1 - code/modules/projectiles/guns/projectile/shotgun.dm | 6 ++---- code/modules/recycling/sortingmachinery.dm | 1 - code/modules/shieldgen/sheldwallgen.dm | 1 - code/modules/virus2/items_devices.dm | 1 - 89 files changed, 27 insertions(+), 133 deletions(-) diff --git a/code/__defines/flags.dm b/code/__defines/flags.dm index 8af1d98622..18a2ec59ab 100644 --- a/code/__defines/flags.dm +++ b/code/__defines/flags.dm @@ -22,7 +22,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 // Flags bitmasks. - Used in /atom/var/flags #define NOBLUDGEON (1<<0) // When an item has this it produces no "X has been hit by Y with Z" message with the default handler. -#define CONDUCT (1<<1) // Conducts electricity. (metal etc.) +#define NOCONDUCT (1<<1) // Conducts electricity. (metal etc.) #define ON_BORDER (1<<2) // Item has priority to check when entering or leaving. #define NOBLOODY (1<<3) // Used for items if they don't want to get a blood overlay. #define OPENCONTAINER (1<<4) // Is an open container for chemistry purposes. diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 3b36f5099e..b7f4eb2243 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -222,7 +222,6 @@ var/global/list/PDA_Manifest = list() throwforce = 0.0 throw_speed = 1 throw_range = 20 - flags = CONDUCT afterattack(atom/target as mob|obj|turf|area, mob/user as mob) user.drop_item() diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 75c95d0b0c..493d5ccd38 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -3,7 +3,6 @@ desc = "Should anything ever go wrong..." icon = 'icons/obj/items.dmi' icon_state = "red_phone" - flags = CONDUCT force = 3.0 throwforce = 2.0 throw_speed = 1 @@ -85,7 +84,6 @@ slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi', ) - flags = CONDUCT force = 5.0 throwforce = 7.0 w_class = ITEMSIZE_NORMAL @@ -210,7 +208,7 @@ var/traitor_frequency = 0.0 var/mob/currentUser = null var/obj/item/device/radio/origradio = null - flags = CONDUCT | ONBELT + flags = ONBELT w_class = ITEMSIZE_SMALL item_state = "radio" throw_speed = 4 @@ -228,7 +226,6 @@ var/selfdestruct = 0.0 var/traitor_frequency = 0.0 var/obj/item/device/radio/origradio = null - flags = CONDUCT slot_flags = SLOT_BELT item_state = "radio" throwforce = 5 @@ -283,7 +280,6 @@ icon_state = "std_module" item_state = "std_mod" w_class = ITEMSIZE_SMALL - flags = CONDUCT var/mtype = 1 // 1=electronic 2=hardware /obj/item/weapon/module/card_reader diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index f6e113c5b2..333d93bf50 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -2,7 +2,6 @@ name = "pinpointer" icon = 'icons/obj/device.dmi' icon_state = "pinoff" - flags = CONDUCT slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL item_state = "electronic" diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 85544958cf..ed23884103 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -4,7 +4,6 @@ icon_state = "yellow" density = 1 var/health = 100.0 - flags = CONDUCT w_class = ITEMSIZE_HUGE layer = TABLE_LAYER // Above catwalks, hopefully below other things diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index d21d751e7e..9f97ab0360 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -167,7 +167,7 @@ center = locate(x+center_x, y+center_y, z) if(center) for(var/obj/M in orange(magnetic_field, center)) - if(!M.anchored && (M.flags & CONDUCT)) + if(!M.anchored && !(M.flags & NOCONDUCT)) step_towards(M, center) for(var/mob/living/silicon/S in orange(magnetic_field, center)) diff --git a/code/game/machinery/wall_frames.dm b/code/game/machinery/wall_frames.dm index dd75e2d8e9..2531c69574 100644 --- a/code/game/machinery/wall_frames.dm +++ b/code/game/machinery/wall_frames.dm @@ -3,7 +3,6 @@ desc = "Used for building frames." icon = 'icons/obj/stock_parts.dmi' icon_state = "frame_bitem" - flags = CONDUCT var/build_machine_type var/refund_amt = 5 var/refund_type = /obj/item/stack/material/steel diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 00720d13dc..dc4036294b 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -9,7 +9,6 @@ icon = 'icons/mecha/mech_construct.dmi' icon_state = "blank" w_class = ITEMSIZE_HUGE - flags = CONDUCT origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2) @@ -17,7 +16,6 @@ name="Mecha Chassis" icon_state = "backbone" var/datum/construction/construct - flags = CONDUCT attackby(obj/item/W as obj, mob/user as mob) if(!construct || !construct.action(W, user)) diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index fe40f772dd..f14b19b117 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -5,7 +5,6 @@ desc = "Used for repairing or building APCs" icon = 'icons/obj/apc_repair.dmi' icon_state = "apc_frame" - flags = CONDUCT /obj/item/frame/apc/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm index 00ef6501d4..a971115ada 100644 --- a/code/game/objects/items/devices/binoculars.dm +++ b/code/game/objects/items/devices/binoculars.dm @@ -1,10 +1,7 @@ /obj/item/device/binoculars - name = "binoculars" desc = "A pair of binoculars." icon_state = "binoculars" - - flags = CONDUCT force = 5.0 w_class = ITEMSIZE_SMALL throwforce = 5.0 diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 9775d64042..d0ae461edd 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -1,7 +1,6 @@ /obj/item/device/chameleon name = "chameleon projector" icon_state = "shield0" - flags = CONDUCT slot_flags = SLOT_BELT item_state = "electronic" throwforce = 5.0 diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm index c8d326b44e..a0d41a6124 100644 --- a/code/game/objects/items/devices/debugger.dm +++ b/code/game/objects/items/devices/debugger.dm @@ -9,7 +9,6 @@ desc = "Used to debug electronic equipment." icon = 'icons/obj/hacktool.dmi' icon_state = "hacktool-g" - flags = CONDUCT force = 5.0 w_class = ITEMSIZE_SMALL throwforce = 5.0 diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 624d59d4a9..b366cc64f7 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -7,7 +7,6 @@ w_class = ITEMSIZE_SMALL throw_speed = 4 throw_range = 10 - flags = CONDUCT origin_tech = list(TECH_MAGNET = 2, TECH_COMBAT = 1) var/times_used = 0 //Number of times it's been used. diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 4543a6d726..786e82d9ad 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/lighting.dmi' icon_state = "flashlight" w_class = ITEMSIZE_SMALL - flags = CONDUCT slot_flags = SLOT_BELT matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20) action_button_name = "Toggle Flashlight" @@ -25,7 +24,7 @@ /obj/item/device/flashlight/New() if(power_use) - START_PROCESSING(SSobj, src) + START_PROCESSING(SSobj, src) if(cell_type) cell = new cell_type(src) @@ -245,7 +244,6 @@ desc = "A pen-sized light, used by medical staff." icon_state = "penlight" item_state = "pen" - flags = CONDUCT slot_flags = SLOT_EARS brightness_on = 2 w_class = ITEMSIZE_TINY @@ -277,7 +275,6 @@ icon_state = "maglight" flashlight_colour = LIGHT_COLOR_FLUORESCENT_FLASHLIGHT force = 10 - flags = CONDUCT slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL attack_verb = list ("smacked", "thwacked", "thunked") @@ -289,7 +286,6 @@ desc = "A miniature lamp, that might be used by small robots." icon_state = "penlight" item_state = null - flags = CONDUCT brightness_on = 2 w_class = ITEMSIZE_TINY power_use = 0 @@ -302,7 +298,6 @@ force = 10 brightness_on = 5 w_class = ITEMSIZE_LARGE - flags = CONDUCT power_use = 0 on = 1 @@ -375,14 +370,14 @@ user.visible_message("[user] activates the flare.", "You pull the cord on the flare, activating it!") src.force = on_damage src.damtype = "fire" - START_PROCESSING(SSobj, src) + START_PROCESSING(SSobj, src) /obj/item/device/flashlight/flare/proc/ignite() //Used for flare launchers. on = !on update_icon() force = on_damage damtype = "fire" - START_PROCESSING(SSobj, src) + START_PROCESSING(SSobj, src) return 1 //Glowsticks @@ -426,7 +421,7 @@ . = ..() if(.) user.visible_message("[user] cracks and shakes the glowstick.", "You crack and shake the glowstick, turning it on!") - START_PROCESSING(SSobj, src) + START_PROCESSING(SSobj, src) /obj/item/device/flashlight/glowstick/red name = "red glowstick" diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 8fd96981fc..7e2b054165 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -45,7 +45,6 @@ force = 8 icon = 'icons/obj/janitor.dmi' icon_state = "lightreplacer0" - flags = CONDUCT slot_flags = SLOT_BELT origin_tech = list(TECH_MAGNET = 3, TECH_MATERIAL = 2) diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 9c9f1aba59..0a12b31df2 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -3,7 +3,6 @@ desc = "A device used to project your voice. Loudly." icon_state = "megaphone" w_class = ITEMSIZE_SMALL - flags = CONDUCT var/spamcheck = 0 var/emagged = 0 diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index e6385c751f..328477ff10 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -8,7 +8,6 @@ name = "multitool" desc = "Used for pulsing wires to test which to cut. Not recommended by doctors." icon_state = "multitool" - flags = CONDUCT force = 5.0 w_class = ITEMSIZE_SMALL throwforce = 5.0 diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 86608ecd28..477f161e07 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -5,7 +5,6 @@ desc = "A nulling power sink which drains energy from electrical systems." icon_state = "powersink0" w_class = ITEMSIZE_LARGE - flags = CONDUCT throwforce = 5 throw_speed = 1 throw_range = 2 diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index ddcb23a5aa..617b314600 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -8,7 +8,6 @@ ) item_state = "electropack" frequency = 1449 - flags = CONDUCT slot_flags = SLOT_BACK w_class = ITEMSIZE_HUGE diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 4a919a1c83..06a7314f32 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -7,7 +7,7 @@ anchored = 1 w_class = ITEMSIZE_LARGE canhear_range = 2 - flags = CONDUCT | NOBLOODY + flags = NOBLOODY var/circuit = /obj/item/weapon/circuitboard/intercom var/number = 0 var/last_tick //used to delay the powercheck @@ -59,7 +59,7 @@ /obj/item/device/radio/intercom/New() ..() - START_PROCESSING(SSobj, src) + START_PROCESSING(SSobj, src) circuit = new circuit(src) /obj/item/device/radio/intercom/department/medbay/New() diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index cc230cc3bf..25f76587ce 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -42,7 +42,6 @@ var/global/list/default_medbay_channels = list( var/adhoc_fallback = FALSE //Falls back to 'radio' mode if subspace not available var/syndie = 0//Holder to see if it's a syndicate encrypted radio var/centComm = 0//Holder to see if it's a CentCom encrypted radio - flags = CONDUCT slot_flags = SLOT_BELT throw_speed = 2 throw_range = 9 diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 8d4b4928ac..b155a1fb54 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -15,7 +15,6 @@ HALOGEN COUNTER - Radcount on mobs desc = "A hand-held body scanner able to distinguish vital signs of the subject." icon_state = "health" item_state = "healthanalyzer" - flags = CONDUCT slot_flags = SLOT_BELT throwforce = 3 w_class = ITEMSIZE_SMALL @@ -299,7 +298,6 @@ HALOGEN COUNTER - Radcount on mobs icon_state = "atmos" item_state = "analyzer" w_class = ITEMSIZE_SMALL - flags = CONDUCT slot_flags = SLOT_BELT throwforce = 5 throw_speed = 4 @@ -337,7 +335,7 @@ HALOGEN COUNTER - Radcount on mobs desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample." icon_state = "spectrometer" w_class = ITEMSIZE_SMALL - flags = CONDUCT | OPENCONTAINER + flags = OPENCONTAINER slot_flags = SLOT_BELT throwforce = 5 throw_speed = 4 @@ -399,7 +397,6 @@ HALOGEN COUNTER - Radcount on mobs icon_state = "spectrometer" item_state = "analyzer" w_class = ITEMSIZE_SMALL - flags = CONDUCT slot_flags = SLOT_BELT throwforce = 5 throw_speed = 4 @@ -447,7 +444,6 @@ HALOGEN COUNTER - Radcount on mobs item_state = "xenobio" origin_tech = list(TECH_BIO = 1) w_class = ITEMSIZE_SMALL - flags = CONDUCT throwforce = 0 throw_speed = 3 throw_range = 7 @@ -490,7 +486,6 @@ HALOGEN COUNTER - Radcount on mobs icon_state = "eftpos" desc = "A hand-held halogen counter, used to detect the level of irradiation of living beings." w_class = ITEMSIZE_SMALL - flags = CONDUCT origin_tech = list(TECH_MAGNET = 1, TECH_BIO = 2) throwforce = 0 throw_speed = 3 diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm index ce145fed9e..e3392f33fe 100644 --- a/code/game/objects/items/devices/spy_bug.dm +++ b/code/game/objects/items/devices/spy_bug.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/grenade.dmi' icon_state = "camgrenade" item_state = "empgrenade" - flags = CONDUCT w_class = ITEMSIZE_SMALL force = 0 throwforce = 5.0 @@ -50,7 +49,6 @@ icon = 'icons/obj/grenade.dmi' icon_state = "camgrenadebroken" item_state = "empgrenade" - flags = CONDUCT force = 5.0 w_class = ITEMSIZE_SMALL throwforce = 5.0 @@ -68,7 +66,6 @@ w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS origin_tech = list(TECH_ENGINEERING = 1, TECH_ILLEGAL = 3) //crush it and you lose the data - flags = CONDUCT force = 0 throwforce = 5.0 throw_range = 15 diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index 98df7bcae1..e11cce4762 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -7,7 +7,6 @@ slot_flags = SLOT_BACK //copied from tank.dm - flags = CONDUCT force = 5.0 throwforce = 10.0 throw_speed = 1 diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 841bcc18ed..c2320dcf44 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -13,7 +13,6 @@ var/playsleepseconds = 0.0 var/obj/item/device/tape/mytape = /obj/item/device/tape/random var/canprint = 1 - flags = CONDUCT slot_flags = SLOT_BELT throwforce = 2 throw_speed = 4 diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 7820d0c4ea..655e6efe31 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -22,7 +22,6 @@ effective or pretty fucking useless. w_class = ITEMSIZE_TINY throw_speed = 4 throw_range = 10 - flags = CONDUCT item_state = "electronic" origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 3, TECH_ILLEGAL = 3) diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index 4a67bffe56..086084f06b 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -4,7 +4,6 @@ icon_state = "voice0" item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang) w_class = ITEMSIZE_TINY - flags = CONDUCT slot_flags = SLOT_EARS var/use_message = "Halt! Security!" diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 180e261fc2..7565b9c9ac 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -3,7 +3,6 @@ icon = 'icons/obj/robot_parts.dmi' item_state = "buildpipe" icon_state = "blank" - flags = CONDUCT slot_flags = SLOT_BELT var/list/part = null // Order of args is important for installing robolimbs. var/sabotaged = 0 //Emagging limbs can have repercussions when installed as prosthetics. diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index b2477ae9ff..fb09c03ff8 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -3,7 +3,6 @@ desc = "Some rods. Can be used for building, or something." singular_name = "metal rod" icon_state = "rods" - flags = CONDUCT w_class = ITEMSIZE_NORMAL force = 9.0 throwforce = 15.0 diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 18b13a8034..116a7576f9 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -114,7 +114,6 @@ throwforce = 15.0 throw_speed = 5 throw_range = 20 - flags = CONDUCT no_variants = FALSE /obj/item/stack/tile/floor/red diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 0f9f4bff3c..89182806db 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -295,7 +295,6 @@ slot_l_hand_str = 'icons/mob/items/lefthand_material.dmi', slot_r_hand_str = 'icons/mob/items/righthand_material.dmi', ) - flags = CONDUCT slot_flags = SLOT_BELT | SLOT_BACK force = 5 throwforce = 5 diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 13c4b29d45..4d6b6eea03 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -11,7 +11,6 @@ AI MODULES icon = 'icons/obj/module.dmi' icon_state = "std_mod" desc = "An AI Module for transmitting encrypted instructions to the AI." - flags = CONDUCT force = 5.0 w_class = ITEMSIZE_SMALL throwforce = 5.0 diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 64f0ebab5e..f7f22d7611 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/tools.dmi' icon_state = "rcd" item_state = "rcd" - flags = CONDUCT | NOBLUDGEON + flags = NOBLUDGEON force = 10 throwforce = 10 throw_speed = 1 diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/game/objects/items/weapons/autopsy.dm index 7cddfd1efc..e1c165bc2f 100644 --- a/code/game/objects/items/weapons/autopsy.dm +++ b/code/game/objects/items/weapons/autopsy.dm @@ -8,7 +8,6 @@ icon = 'icons/obj/autopsy_scanner.dmi' icon_state = "" item_state = "autopsy_scanner" - flags = CONDUCT w_class = ITEMSIZE_SMALL origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) var/list/datum/autopsy_data_scanner/wdata = list() diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index e4082b3352..39fff82a82 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -502,7 +502,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM item_state = "lighter-g" w_class = ITEMSIZE_TINY throwforce = 4 - flags = CONDUCT slot_flags = SLOT_BELT attack_verb = list("burnt", "singed") var/base_state diff --git a/code/game/objects/items/weapons/circuitboards/circuitboard.dm b/code/game/objects/items/weapons/circuitboards/circuitboard.dm index 83a651a201..f049197d88 100644 --- a/code/game/objects/items/weapons/circuitboards/circuitboard.dm +++ b/code/game/objects/items/weapons/circuitboards/circuitboard.dm @@ -12,7 +12,6 @@ density = 0 anchored = 0 w_class = ITEMSIZE_SMALL - flags = CONDUCT force = 5.0 throwforce = 5.0 throw_speed = 3 diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 06649d7982..44242719fd 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -5,7 +5,6 @@ icon_state = "fire_extinguisher0" item_state = "fire_extinguisher" hitsound = 'sound/weapons/smash.ogg' - flags = CONDUCT throwforce = 10 w_class = ITEMSIZE_NORMAL throw_speed = 2 diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 1d9a926e2e..498cad3f68 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -8,7 +8,6 @@ slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi', ) item_state = "flamethrower_0" - flags = CONDUCT force = 3.0 throwforce = 10.0 throw_speed = 1 diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 7b7e85cce3..d7512f54b1 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -7,7 +7,6 @@ item_state = "grenade" throw_speed = 4 throw_range = 20 - flags = CONDUCT slot_flags = SLOT_MASK|SLOT_BELT var/active = 0 diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm index a6ad6f4592..7d725c36bb 100644 --- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm +++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm @@ -59,7 +59,6 @@ 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" item_state = "briefcase" - flags = CONDUCT force = 8.0 throw_speed = 1 throw_range = 4 diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 923eea6b15..1c9af03458 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -4,7 +4,6 @@ gender = PLURAL icon = 'icons/obj/items.dmi' icon_state = "handcuff" - flags = CONDUCT slot_flags = SLOT_BELT throwforce = 5 w_class = ITEMSIZE_SMALL @@ -205,7 +204,6 @@ var/last_chew = 0 gender = PLURAL icon = 'icons/obj/items.dmi' icon_state = "legcuff" - flags = CONDUCT throwforce = 0 w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_MATERIAL = 1) diff --git a/code/game/objects/items/weapons/improvised_components.dm b/code/game/objects/items/weapons/improvised_components.dm index ded033a746..bfd059f74d 100644 --- a/code/game/objects/items/weapons/improvised_components.dm +++ b/code/game/objects/items/weapons/improvised_components.dm @@ -44,7 +44,6 @@ 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 = CONDUCT force = 8 throwforce = 10 w_class = ITEMSIZE_NORMAL diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index b652b8c5ff..eec78da964 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -59,7 +59,6 @@ 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 = CONDUCT sharp = 1 edge = 1 force_divisor = 0.15 // 9 when wielded with hardness 60 (steel) diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 6c4930950e..dae4a19d15 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -7,7 +7,7 @@ sharp = 0 edge = 0 armor_penetration = 50 - flags = NOBLOODY + flags = NOCONDUCT | NOBLOODY var/lrange = 2 var/lpower = 2 var/lcolor = "#0099FF" @@ -82,7 +82,6 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_NORMAL - flags = CONDUCT | NOBLOODY origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 4) attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") sharp = 1 @@ -268,7 +267,7 @@ spark_system.set_up(5, 0, src) spark_system.attach(src) - START_PROCESSING(SSobj, src) + START_PROCESSING(SSobj, src) set_light(lrange, lpower, lcolor) /obj/item/weapon/melee/energy/blade/Destroy() diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 81f233cdec..7d390d613f 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -2,7 +2,6 @@ name = "chain of command" desc = "A tool used by great men to placate the frothing masses." icon_state = "chain" - flags = CONDUCT slot_flags = SLOT_BELT force = 10 throwforce = 7 @@ -21,7 +20,6 @@ icon = 'icons/obj/items.dmi' icon_state = "umbrella_closed" addblends = "umbrella_closed_a" - flags = CONDUCT slot_flags = SLOT_BELT force = 5 throwforce = 5 diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 814592a890..a1a2756eca 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -58,7 +58,6 @@ desc = "A shield adept for close quarters engagement. It's also capable of protecting from less powerful projectiles." icon = 'icons/obj/weapons.dmi' icon_state = "riot" - flags = CONDUCT slot_flags = SLOT_BACK force = 5.0 throwforce = 5.0 @@ -115,7 +114,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "eshield0" // eshield1 for expanded slot_flags = SLOT_EARS - flags = CONDUCT + flags = NOCONDUCT force = 3.0 throwforce = 5.0 throw_speed = 1 diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index aa023dce18..285461d937 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -2,7 +2,6 @@ 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 = CONDUCT force = 8.0 throw_speed = 1 throw_range = 4 diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 6576578a80..8edc046972 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/storage.dmi' icon_state = "red" item_state_slots = list(slot_r_hand_str = "toolbox_red", slot_l_hand_str = "toolbox_red") - flags = CONDUCT force = 10 throwforce = 10 throw_speed = 1 diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 50468951a4..f011cd917b 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -13,7 +13,6 @@ desc = "This shouldn't be here, ahelp it." icon = 'icons/obj/surgery.dmi' w_class = ITEMSIZE_SMALL - flags = CONDUCT var/helpforce = 0 //For help intent things /obj/item/weapon/surgical/attack(mob/M, mob/user) @@ -92,7 +91,7 @@ origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) matter = list(DEFAULT_WALL_MATERIAL = 10000, "glass" = 5000) attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - + suicide_act(mob/user) var/datum/gender/TU = gender_datums[user.get_visible_gender()] viewers(user) << pick("\The [user] is slitting [TU.his] wrists with the [src.name]! It looks like [TU.hes] trying to commit suicide.", \ diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 4aa6986d16..6308759044 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -79,7 +79,6 @@ desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." icon_state = "phoron" gauge_icon = null - flags = CONDUCT slot_flags = null //they have no straps! /obj/item/weapon/tank/phoron/Initialize() @@ -105,7 +104,6 @@ desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." icon_state = "phoron_vox" gauge_icon = null - flags = CONDUCT distribute_pressure = ONE_ATMOSPHERE*O2STANDARD slot_flags = SLOT_BACK //these ones have straps! @@ -124,7 +122,6 @@ icon_state = "emergency" gauge_icon = "indicator_emergency" gauge_cap = 4 - flags = CONDUCT slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL force = 4 diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index aa3c747d5d..985530a6f9 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -15,7 +15,6 @@ var/list/global/tank_gauge_cache = list() var/last_gauge_pressure var/gauge_cap = 6 - flags = CONDUCT slot_flags = SLOT_BACK w_class = ITEMSIZE_NORMAL diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 39e164d49f..137eadb60d 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -16,7 +16,6 @@ var/frequency = 1451 var/broadcasting = null var/listening = 1.0 - flags = CONDUCT w_class = ITEMSIZE_SMALL item_state = "electronic" throw_speed = 4 diff --git a/code/game/objects/items/weapons/tools/crowbar.dm b/code/game/objects/items/weapons/tools/crowbar.dm index 721f5e30c9..a970cd5df8 100644 --- a/code/game/objects/items/weapons/tools/crowbar.dm +++ b/code/game/objects/items/weapons/tools/crowbar.dm @@ -7,7 +7,6 @@ desc = "Used to remove floors and to pry open doors." icon = 'icons/obj/tools.dmi' icon_state = "crowbar" - flags = CONDUCT slot_flags = SLOT_BELT force = 6 throwforce = 7 diff --git a/code/game/objects/items/weapons/tools/screwdriver.dm b/code/game/objects/items/weapons/tools/screwdriver.dm index 249f49f529..26a5ef35da 100644 --- a/code/game/objects/items/weapons/tools/screwdriver.dm +++ b/code/game/objects/items/weapons/tools/screwdriver.dm @@ -6,7 +6,6 @@ desc = "You can be totally screwwy with this." icon = 'icons/obj/tools.dmi' icon_state = "screwdriver" - flags = CONDUCT slot_flags = SLOT_BELT | SLOT_EARS force = 6 w_class = ITEMSIZE_TINY diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm index e4a319fc99..2d9bd729fa 100644 --- a/code/game/objects/items/weapons/tools/weldingtool.dm +++ b/code/game/objects/items/weapons/tools/weldingtool.dm @@ -7,7 +7,6 @@ icon = 'icons/obj/tools.dmi' icon_state = "welder" item_state = "welder" - flags = CONDUCT slot_flags = SLOT_BELT //Amount of OUCH when it's thrown diff --git a/code/game/objects/items/weapons/tools/wirecutters.dm b/code/game/objects/items/weapons/tools/wirecutters.dm index eb8b940c92..1e55abfeaa 100644 --- a/code/game/objects/items/weapons/tools/wirecutters.dm +++ b/code/game/objects/items/weapons/tools/wirecutters.dm @@ -6,7 +6,6 @@ desc = "This cuts wires." icon = 'icons/obj/tools.dmi' icon_state = "cutters" - flags = CONDUCT slot_flags = SLOT_BELT force = 6 throw_speed = 2 diff --git a/code/game/objects/items/weapons/tools/wrench.dm b/code/game/objects/items/weapons/tools/wrench.dm index 13cf3e51cf..c1a45b41a7 100644 --- a/code/game/objects/items/weapons/tools/wrench.dm +++ b/code/game/objects/items/weapons/tools/wrench.dm @@ -6,7 +6,6 @@ desc = "A wrench with many common uses. Can be usually found in your hand." icon = 'icons/obj/tools.dmi' icon_state = "wrench" - flags = CONDUCT slot_flags = SLOT_BELT force = 6 throwforce = 7 diff --git a/code/game/objects/items/weapons/trays.dm b/code/game/objects/items/weapons/trays.dm index 8d9977cc17..21c8b635f3 100644 --- a/code/game/objects/items/weapons/trays.dm +++ b/code/game/objects/items/weapons/trays.dm @@ -11,7 +11,6 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_NORMAL - flags = CONDUCT matter = list(DEFAULT_WALL_MATERIAL = 3000) var/list/carrying = list() // List of things on the tray. - Doohl var/max_carry = 10 diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index e30060c78a..d379aa8211 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -5,7 +5,6 @@ icon_state = "grille" density = 1 anchored = 1 - flags = CONDUCT pressure_resistance = 5*ONE_ATMOSPHERE layer = TABLE_LAYER explosion_resistance = 1 @@ -151,7 +150,7 @@ return //window placing end - else if(!(W.flags & CONDUCT) || !shock(user, 70)) + else if((W.flags & NOCONDUCT) || !shock(user, 70)) user.setClickCooldown(user.get_attack_speed(W)) user.do_attack_animation(src) playsound(loc, 'sound/effects/grillehit.ogg', 80, 1) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 443491d633..01d282b40c 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -7,7 +7,6 @@ anchored = 1.0 w_class = ITEMSIZE_NORMAL plane = PLATING_PLANE - // flags = CONDUCT /obj/structure/lattice/Initialize() . = ..() diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index 646e52218c..fae45b8f51 100644 --- a/code/game/objects/structures/target_stake.dm +++ b/code/game/objects/structures/target_stake.dm @@ -6,7 +6,6 @@ icon_state = "target_stake" density = 1 w_class = ITEMSIZE_HUGE - flags = CONDUCT var/obj/item/target/pinned_target // the current pinned target Move() diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 317765be97..04dadddc04 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -3,7 +3,6 @@ desc = "A small electronic device that should never exist." icon = 'icons/obj/assemblies/new_assemblies.dmi' icon_state = "" - flags = CONDUCT w_class = ITEMSIZE_SMALL matter = list(DEFAULT_WALL_MATERIAL = 100) throwforce = 2 diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 1a02474a8e..930329fd93 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 = CONDUCT | PROXMOVE + flags = PROXMOVE throwforce = 5 w_class = ITEMSIZE_SMALL throw_speed = 3 @@ -233,7 +233,7 @@ tmr.time=5 tmr.secured = 1 tmr.holder = src - START_PROCESSING(SSobj, tmr) + START_PROCESSING(SSobj, tmr) a_left = tmr a_right = ign secured = 1 diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index fd5c35bbfb..55616a2b91 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -6,7 +6,6 @@ var/obj/item/device/radio/electropack/part2 = null var/status = 0 w_class = ITEMSIZE_HUGE - flags = CONDUCT /obj/item/assembly/shock_kit/Destroy() qdel(part1) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 87365674b4..0f8b999b4c 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -52,7 +52,6 @@ name = "cyborg suit" desc = "Suit for a cyborg costume." icon_state = "death" - flags = CONDUCT fire_resist = T0C+5200 flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER diff --git a/code/modules/economy/retail_scanner.dm b/code/modules/economy/retail_scanner.dm index 0a86e1a014..58331000ed 100644 --- a/code/modules/economy/retail_scanner.dm +++ b/code/modules/economy/retail_scanner.dm @@ -3,7 +3,7 @@ desc = "Swipe your ID card to make purchases electronically." icon = 'icons/obj/device.dmi' icon_state = "retail_idle" - flags = NOBLUDGEON|CONDUCT + flags = NOBLUDGEON slot_flags = SLOT_BELT req_access = list(access_heads) w_class = ITEMSIZE_SMALL diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index 8ebfd39021..14a0fbd16e 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -100,7 +100,7 @@ amount_per_transfer_from_this = 20 possible_transfer_amounts = null volume = 150 - flags = CONDUCT | OPENCONTAINER + flags = OPENCONTAINER /obj/item/weapon/reagent_containers/food/drinks/golden_cup/on_reagent_change() ..() diff --git a/code/modules/integrated_electronics/core/tools.dm b/code/modules/integrated_electronics/core/tools.dm index dd270ee326..23e8e3f24b 100644 --- a/code/modules/integrated_electronics/core/tools.dm +++ b/code/modules/integrated_electronics/core/tools.dm @@ -12,7 +12,6 @@ icon = 'icons/obj/integrated_electronics/electronic_tools.dmi' icon_state = "wirer-wire" item_state = "wirer" - flags = CONDUCT w_class = ITEMSIZE_SMALL var/datum/integrated_io/selected_io = null var/mode = WIRE @@ -110,7 +109,6 @@ settings to specific circuits, or for debugging purposes. It can also pulse activation pins." icon = 'icons/obj/integrated_electronics/electronic_tools.dmi' icon_state = "debugger" - flags = CONDUCT w_class = 2 var/data_to_write = null var/accepting_refs = 0 diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm index 3caf8df28b..0b1daf10fa 100644 --- a/code/modules/materials/material_sheets.dm +++ b/code/modules/materials/material_sheets.dm @@ -37,8 +37,8 @@ if(apply_colour) color = material.icon_colour - if(material.conductive) - flags |= CONDUCT + if(!material.conductive) + flags |= NOCONDUCT matter = material.get_matter() update_strings() diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm index baf8094967..9b75a1dba8 100644 --- a/code/modules/mining/coins.dm +++ b/code/modules/mining/coins.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/items.dmi' name = "Coin" icon_state = "coin" - flags = CONDUCT force = 0.0 throwforce = 0.0 w_class = ITEMSIZE_TINY diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 902694c34d..e05302cfc1 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -13,7 +13,6 @@ name = "mining drill" desc = "The most basic of mining drills, for short excavations and small mineral extractions." icon = 'icons/obj/items.dmi' - flags = CONDUCT slot_flags = SLOT_BELT force = 15.0 throwforce = 4.0 @@ -112,7 +111,6 @@ desc = "A large tool for digging and moving dirt." icon = 'icons/obj/items.dmi' icon_state = "shovel" - flags = CONDUCT slot_flags = SLOT_BELT force = 8.0 throwforce = 4.0 diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm index 13ddd4ad57..65e645f815 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/storage.dmi' name = "Money bag" icon_state = "moneybag" - flags = CONDUCT force = 10.0 throwforce = 2.0 w_class = ITEMSIZE_LARGE diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm index bbc8cefd36..28e0c29b50 100644 --- a/code/modules/mob/living/silicon/robot/analyzer.dm +++ b/code/modules/mob/living/silicon/robot/analyzer.dm @@ -6,7 +6,6 @@ icon_state = "robotanalyzer" item_state = "analyzer" desc = "A hand-held scanner able to diagnose robotic injuries." - flags = CONDUCT slot_flags = SLOT_BELT throwforce = 3 w_class = ITEMSIZE_SMALL diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index bf7d0a49c8..6b06532427 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -19,7 +19,6 @@ var/global/list/robot_modules = list( icon_state = "std_module" w_class = ITEMSIZE_NO_CONTAINER item_state = "std_mod" - flags = CONDUCT var/hide_on_manifest = 0 var/channels = list() var/networks = list() diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 7137160fd9..b84cbad88f 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -124,7 +124,6 @@ var/global/photo_count = 0 icon_state = "camera" item_state = "camera" w_class = ITEMSIZE_SMALL - flags = CONDUCT slot_flags = SLOT_BELT matter = list(DEFAULT_WALL_MATERIAL = 2000) var/pictures_max = 10 diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index 9bccd86d67..a3549b7a2f 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -191,7 +191,6 @@ proc/cardinalrange(var/center) icon_state = "box" item_state = "electronic" w_class = ITEMSIZE_LARGE - flags = CONDUCT throwforce = 5 throw_speed = 1 throw_range = 2 diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 4fe63628b7..3456351d86 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -238,7 +238,7 @@ var/list/possible_cable_coil_colours = list( shock(user, 5, 0.2) else - if (W.flags & CONDUCT) + if(!(W.flags & NOCONDUCT)) shock(user, 50, 0.7) src.add_fingerprint(user) @@ -511,7 +511,6 @@ obj/structure/cable/proc/cableColor(var/colorC) throw_speed = 2 throw_range = 5 matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20) - flags = CONDUCT slot_flags = SLOT_BELT item_state = "coil" attack_verb = list("whipped", "lashed", "disciplined", "flogged") @@ -932,7 +931,6 @@ obj/structure/cable/proc/cableColor(var/colorC) throw_speed = 2 throw_range = 5 matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20) - flags = CONDUCT slot_flags = SLOT_BELT attack_verb = list("whipped", "lashed", "disciplined", "flogged") stacktype = null diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 7521ddcf39..9156d49a54 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -430,7 +430,7 @@ if(M == user) continue M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) - if(on && (W.flags & CONDUCT)) + if(on && !(W.flags & NOCONDUCT)) //if(!user.mutations & COLD_RESISTANCE) if (prob(12)) electrocute_mob(user, get_area(src), src, 0.3) @@ -468,7 +468,7 @@ return user << "You stick \the [W] into the light socket!" - if(has_power() && (W.flags & CONDUCT)) + if(has_power() && !(W.flags & NOCONDUCT)) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) s.start() diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 3fc860a127..0f9608f49c 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -3,7 +3,6 @@ desc = "A bullet casing." icon = 'icons/obj/ammo.dmi' icon_state = "s-casing" - flags = CONDUCT slot_flags = SLOT_BELT | SLOT_EARS throwforce = 1 w_class = ITEMSIZE_TINY @@ -66,7 +65,6 @@ desc = "A magazine for some kind of gun." icon_state = ".357" icon = 'icons/obj/ammo.dmi' - flags = CONDUCT slot_flags = SLOT_BELT item_state = "syringe_kit" matter = list(DEFAULT_WALL_MATERIAL = 500) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index fb268148cb..56d7b78416 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -38,7 +38,6 @@ ) icon_state = "detective" item_state = "gun" - flags = CONDUCT slot_flags = SLOT_BELT|SLOT_HOLSTER matter = list(DEFAULT_WALL_MATERIAL = 2000) w_class = ITEMSIZE_NORMAL diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index c4193289dd..3fe7a4f21c 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -7,7 +7,6 @@ origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 4) w_class = ITEMSIZE_LARGE force = 10 - flags = CONDUCT slot_flags = SLOT_BACK projectile_type = /obj/item/projectile/ion @@ -127,7 +126,6 @@ icon = 'icons/obj/gun.dmi' item_icons = null icon_state = "staffofchange" - flags = CONDUCT slot_flags = SLOT_BACK w_class = ITEMSIZE_LARGE charge_cost = 480 diff --git a/code/modules/projectiles/guns/launcher.dm b/code/modules/projectiles/guns/launcher.dm index 82a6e07fc3..869f6c8b60 100644 --- a/code/modules/projectiles/guns/launcher.dm +++ b/code/modules/projectiles/guns/launcher.dm @@ -2,7 +2,6 @@ name = "launcher" desc = "A device that launches things." w_class = ITEMSIZE_HUGE - flags = CONDUCT slot_flags = SLOT_BACK var/release_force = 0 diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm index cfe4533109..45be1c017e 100644 --- a/code/modules/projectiles/guns/launcher/pneumatic.dm +++ b/code/modules/projectiles/guns/launcher/pneumatic.dm @@ -5,7 +5,6 @@ item_state = "pneumatic" slot_flags = SLOT_BELT w_class = ITEMSIZE_HUGE - flags = CONDUCT fire_sound_text = "a loud whoosh of moving air" fire_delay = 50 fire_sound = 'sound/weapons/grenade_launcher.ogg' // Formerly tablehit1.ogg but I like this better -Ace diff --git a/code/modules/projectiles/guns/launcher/rocket.dm b/code/modules/projectiles/guns/launcher/rocket.dm index dae5a5c8ee..21fdbb14f6 100644 --- a/code/modules/projectiles/guns/launcher/rocket.dm +++ b/code/modules/projectiles/guns/launcher/rocket.dm @@ -7,7 +7,6 @@ throw_speed = 2 throw_range = 10 force = 5.0 - flags = CONDUCT slot_flags = 0 origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 5) fire_sound = 'sound/weapons/rpg.ogg' diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm index 12a107b642..434f317d88 100644 --- a/code/modules/projectiles/guns/launcher/syringe_gun.dm +++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm @@ -5,7 +5,6 @@ icon_state = "syringe-cartridge" var/icon_flight = "syringe-cartridge-flight" //so it doesn't look so weird when shot matter = list(DEFAULT_WALL_MATERIAL = 125, "glass" = 375) - flags = CONDUCT slot_flags = SLOT_BELT | SLOT_EARS throwforce = 3 force = 3 diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 23fd373887..315c6edca0 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -6,7 +6,6 @@ max_shells = 4 w_class = ITEMSIZE_LARGE force = 10 - flags = CONDUCT slot_flags = SLOT_BACK caliber = "12g" origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2) @@ -41,14 +40,14 @@ loaded -= AC //Remove casing from loaded list. chambered = AC - if(animated_pump)//This affects all bolt action and shotguns. + if(animated_pump)//This affects all bolt action and shotguns. flick("[icon_state]-cycling", src)//This plays any pumping update_icon() /obj/item/weapon/gun/projectile/shotgun/pump/update_icon()//This adds empty sprite capability for shotguns. ..() - if(!empty_sprite)//Just a dirty check + if(!empty_sprite)//Just a dirty check return if((loaded.len) || (chambered)) icon_state = "[icon_state]" @@ -80,7 +79,6 @@ max_shells = 2 w_class = ITEMSIZE_LARGE force = 10 - flags = CONDUCT slot_flags = SLOT_BACK caliber = "12g" origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 1) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 59b690f31a..b60b71cc4e 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -326,7 +326,6 @@ w_class = ITEMSIZE_SMALL item_state = "electronic" - flags = CONDUCT slot_flags = SLOT_BELT proc/openwindow(mob/user as mob) diff --git a/code/modules/shieldgen/sheldwallgen.dm b/code/modules/shieldgen/sheldwallgen.dm index 812a0738a1..e6e9bc11d7 100644 --- a/code/modules/shieldgen/sheldwallgen.dm +++ b/code/modules/shieldgen/sheldwallgen.dm @@ -20,7 +20,6 @@ // var/maxshieldload = 200 var/obj/structure/cable/attached // the attached cable var/storedpower = 0 - flags = CONDUCT //There have to be at least two posts, so these are effectively doubled var/power_draw = 30000 //30 kW. How much power is drawn from powernet. Increase this to allow the generator to sustain longer shields, at the cost of more power draw. var/max_stored_power = 50000 //50 kW diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm index ae56c35087..08f688fbc3 100644 --- a/code/modules/virus2/items_devices.dm +++ b/code/modules/virus2/items_devices.dm @@ -6,7 +6,6 @@ icon_state = "health" w_class = ITEMSIZE_SMALL item_state = "electronic" - flags = CONDUCT /obj/item/device/antibody_scanner/attack(mob/M as mob, mob/user as mob) if(!istype(M,/mob/living/carbon/))