Items are now assumed to be conductive, rather than the opposite

2026-08-24 13:46:53 +01:00 · 2019-03-02 20:34:49 -06:00
parent 85d332e94b
commit aade8c356f
89 changed files with 27 additions and 133 deletions
@@ -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)
 	..()
@@ -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
@@ -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
@@ -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
@@ -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.
@@ -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("<span class='notice'>[user] activates the flare.</span>", "<span class='notice'>You pull the cord on the flare, activating it!</span>")
 		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("<span class='notice'>[user] cracks and shakes the glowstick.</span>", "<span class='notice'>You crack and shake the glowstick, turning it on!</span>")
-		START_PROCESSING(SSobj, src)
+		START_PROCESSING(SSobj, src)

 /obj/item/device/flashlight/glowstick/red
 	name = "red glowstick"
@@ -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)

@@ -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
@@ -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
@@ -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
@@ -8,7 +8,6 @@
 			)
 	item_state = "electropack"
 	frequency = 1449
-	flags = CONDUCT
 	slot_flags = SLOT_BACK
 	w_class = ITEMSIZE_HUGE

@@ -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()
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,6 @@
 	slot_flags = SLOT_BACK

 	//copied from tank.dm
-	flags = CONDUCT
 	force = 5.0
 	throwforce = 10.0
 	throw_speed = 1
@@ -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
@@ -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)

@@ -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!"
@@ -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.
@@ -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
@@ -114,7 +114,6 @@
 	throwforce = 15.0
 	throw_speed = 5
 	throw_range = 20
-	flags = CONDUCT
 	no_variants = FALSE

 /obj/item/stack/tile/floor/red
@@ -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
@@ -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
@@ -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
@@ -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()
@@ -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
@@ -12,7 +12,6 @@
 	density = 0
 	anchored = 0
 	w_class = ITEMSIZE_SMALL
-	flags = CONDUCT
 	force = 5.0
 	throwforce = 5.0
 	throw_speed = 3
@@ -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
@@ -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
@@ -7,7 +7,6 @@
 	item_state = "grenade"
 	throw_speed = 4
 	throw_range = 20
-	flags = CONDUCT
 	slot_flags = SLOT_MASK|SLOT_BELT

 	var/active = 0
@@ -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
@@ -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)
@@ -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
@@ -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)
@@ -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()
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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("<span class='danger'>\The [user] is slitting [TU.his] wrists with the [src.name]! It looks like [TU.hes] trying to commit suicide.</span>", \
@@ -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
@@ -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

@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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