cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-21 23:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Anewbe
2019-03-02 20:34:49 -06:00
parent 85d332e94b
commit aade8c356f
89 changed files with 27 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__defines/flags.dm
View File

@@ -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 // 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 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 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 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. #define OPENCONTAINER (1<<4) // Is an open container for chemistry purposes.

1
code/defines/obj.dm
View File

@@ -222,7 +222,6 @@ var/global/list/PDA_Manifest = list()
throwforce = 0.0 throwforce = 0.0
throw_speed = 1 throw_speed = 1
throw_range = 20 throw_range = 20
flags = CONDUCT
afterattack(atom/target as mob|obj|turf|area, mob/user as mob) afterattack(atom/target as mob|obj|turf|area, mob/user as mob)
user.drop_item() user.drop_item()

6
code/defines/obj/weapon.dm
View File

@@ -3,7 +3,6 @@
desc = "Should anything ever go wrong..." desc = "Should anything ever go wrong..."
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "red_phone" icon_state = "red_phone"
flags = CONDUCT
force = 3.0 force = 3.0
throwforce = 2.0 throwforce = 2.0
throw_speed = 1 throw_speed = 1
@@ -85,7 +84,6 @@
slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi', slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi',
) )
flags = CONDUCT
force = 5.0 force = 5.0
throwforce = 7.0 throwforce = 7.0
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
@@ -210,7 +208,7 @@
var/traitor_frequency = 0.0 var/traitor_frequency = 0.0
var/mob/currentUser = null var/mob/currentUser = null
var/obj/item/device/radio/origradio = null var/obj/item/device/radio/origradio = null
flags = CONDUCT | ONBELT flags = ONBELT
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
item_state = "radio" item_state = "radio"
throw_speed = 4 throw_speed = 4
@@ -228,7 +226,6 @@
var/selfdestruct = 0.0 var/selfdestruct = 0.0
var/traitor_frequency = 0.0 var/traitor_frequency = 0.0
var/obj/item/device/radio/origradio = null var/obj/item/device/radio/origradio = null
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
item_state = "radio" item_state = "radio"
throwforce = 5 throwforce = 5
@@ -283,7 +280,6 @@
icon_state = "std_module" icon_state = "std_module"
item_state = "std_mod" item_state = "std_mod"
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
flags = CONDUCT
var/mtype = 1 // 1=electronic 2=hardware var/mtype = 1 // 1=electronic 2=hardware
/obj/item/weapon/module/card_reader /obj/item/weapon/module/card_reader

1
code/game/gamemodes/nuclear/pinpointer.dm
View File

@@ -2,7 +2,6 @@
name = "pinpointer" name = "pinpointer"
icon = 'icons/obj/device.dmi' icon = 'icons/obj/device.dmi'
icon_state = "pinoff" icon_state = "pinoff"
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
item_state = "electronic" item_state = "electronic"

1
code/game/machinery/atmoalter/canister.dm
View File

@@ -4,7 +4,6 @@
icon_state = "yellow" icon_state = "yellow"
density = 1 density = 1
var/health = 100.0 var/health = 100.0
flags = CONDUCT
w_class = ITEMSIZE_HUGE w_class = ITEMSIZE_HUGE
layer = TABLE_LAYER // Above catwalks, hopefully below other things layer = TABLE_LAYER // Above catwalks, hopefully below other things

2
code/game/machinery/magnet.dm
View File

@@ -167,7 +167,7 @@
center = locate(x+center_x, y+center_y, z) center = locate(x+center_x, y+center_y, z)
if(center) if(center)
for(var/obj/M in orange(magnetic_field, 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) step_towards(M, center)
for(var/mob/living/silicon/S in orange(magnetic_field, center)) for(var/mob/living/silicon/S in orange(magnetic_field, center))

1
code/game/machinery/wall_frames.dm
View File

@@ -3,7 +3,6 @@
desc = "Used for building frames." desc = "Used for building frames."
icon = 'icons/obj/stock_parts.dmi' icon = 'icons/obj/stock_parts.dmi'
icon_state = "frame_bitem" icon_state = "frame_bitem"
flags = CONDUCT
var/build_machine_type var/build_machine_type
var/refund_amt = 5 var/refund_amt = 5
var/refund_type = /obj/item/stack/material/steel var/refund_type = /obj/item/stack/material/steel

2
code/game/mecha/mecha_parts.dm
View File

@@ -9,7 +9,6 @@
icon = 'icons/mecha/mech_construct.dmi' icon = 'icons/mecha/mech_construct.dmi'
icon_state = "blank" icon_state = "blank"
w_class = ITEMSIZE_HUGE w_class = ITEMSIZE_HUGE
flags = CONDUCT
origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2) origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2)
@@ -17,7 +16,6 @@
name="Mecha Chassis" name="Mecha Chassis"
icon_state = "backbone" icon_state = "backbone"
var/datum/construction/construct var/datum/construction/construct
flags = CONDUCT
attackby(obj/item/W as obj, mob/user as mob) attackby(obj/item/W as obj, mob/user as mob)
if(!construct || !construct.action(W, user)) if(!construct || !construct.action(W, user))

1
code/game/objects/items/apc_frame.dm
View File

@@ -5,7 +5,6 @@
desc = "Used for repairing or building APCs" desc = "Used for repairing or building APCs"
icon = 'icons/obj/apc_repair.dmi' icon = 'icons/obj/apc_repair.dmi'
icon_state = "apc_frame" icon_state = "apc_frame"
flags = CONDUCT
/obj/item/frame/apc/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/frame/apc/attackby(obj/item/weapon/W as obj, mob/user as mob)
..() ..()

3
code/game/objects/items/devices/binoculars.dm
View File

@@ -1,10 +1,7 @@
/obj/item/device/binoculars /obj/item/device/binoculars
name = "binoculars" name = "binoculars"
desc = "A pair of binoculars." desc = "A pair of binoculars."
icon_state = "binoculars" icon_state = "binoculars"
flags = CONDUCT
force = 5.0 force = 5.0
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
throwforce = 5.0 throwforce = 5.0

1
code/game/objects/items/devices/chameleonproj.dm
View File

@@ -1,7 +1,6 @@
/obj/item/device/chameleon /obj/item/device/chameleon
name = "chameleon projector" name = "chameleon projector"
icon_state = "shield0" icon_state = "shield0"
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
item_state = "electronic" item_state = "electronic"
throwforce = 5.0 throwforce = 5.0

1
code/game/objects/items/devices/debugger.dm
View File

@@ -9,7 +9,6 @@
desc = "Used to debug electronic equipment." desc = "Used to debug electronic equipment."
icon = 'icons/obj/hacktool.dmi' icon = 'icons/obj/hacktool.dmi'
icon_state = "hacktool-g" icon_state = "hacktool-g"
flags = CONDUCT
force = 5.0 force = 5.0
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
throwforce = 5.0 throwforce = 5.0

1
code/game/objects/items/devices/flash.dm
View File

@@ -7,7 +7,6 @@
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
throw_speed = 4 throw_speed = 4
throw_range = 10 throw_range = 10
flags = CONDUCT
origin_tech = list(TECH_MAGNET = 2, TECH_COMBAT = 1) origin_tech = list(TECH_MAGNET = 2, TECH_COMBAT = 1)
var/times_used = 0 //Number of times it's been used. var/times_used = 0 //Number of times it's been used.

5
code/game/objects/items/devices/flashlight.dm
View File

@@ -4,7 +4,6 @@
icon = 'icons/obj/lighting.dmi' icon = 'icons/obj/lighting.dmi'
icon_state = "flashlight" icon_state = "flashlight"
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20) matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20)
action_button_name = "Toggle Flashlight" action_button_name = "Toggle Flashlight"
@@ -245,7 +244,6 @@
desc = "A pen-sized light, used by medical staff." desc = "A pen-sized light, used by medical staff."
icon_state = "penlight" icon_state = "penlight"
item_state = "pen" item_state = "pen"
flags = CONDUCT
slot_flags = SLOT_EARS slot_flags = SLOT_EARS
brightness_on = 2 brightness_on = 2
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
@@ -277,7 +275,6 @@
icon_state = "maglight" icon_state = "maglight"
flashlight_colour = LIGHT_COLOR_FLUORESCENT_FLASHLIGHT flashlight_colour = LIGHT_COLOR_FLUORESCENT_FLASHLIGHT
force = 10 force = 10
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
attack_verb = list ("smacked", "thwacked", "thunked") attack_verb = list ("smacked", "thwacked", "thunked")
@@ -289,7 +286,6 @@
desc = "A miniature lamp, that might be used by small robots." desc = "A miniature lamp, that might be used by small robots."
icon_state = "penlight" icon_state = "penlight"
item_state = null item_state = null
flags = CONDUCT
brightness_on = 2 brightness_on = 2
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
power_use = 0 power_use = 0
@@ -302,7 +298,6 @@
force = 10 force = 10
brightness_on = 5 brightness_on = 5
w_class = ITEMSIZE_LARGE w_class = ITEMSIZE_LARGE
flags = CONDUCT
power_use = 0 power_use = 0
on = 1 on = 1

1
code/game/objects/items/devices/lightreplacer.dm
View File

@@ -45,7 +45,6 @@
force = 8 force = 8
icon = 'icons/obj/janitor.dmi' icon = 'icons/obj/janitor.dmi'
icon_state = "lightreplacer0" icon_state = "lightreplacer0"
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
origin_tech = list(TECH_MAGNET = 3, TECH_MATERIAL = 2) origin_tech = list(TECH_MAGNET = 3, TECH_MATERIAL = 2)

1
code/game/objects/items/devices/megaphone.dm
View File

@@ -3,7 +3,6 @@
desc = "A device used to project your voice. Loudly." desc = "A device used to project your voice. Loudly."
icon_state = "megaphone" icon_state = "megaphone"
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
flags = CONDUCT
var/spamcheck = 0 var/spamcheck = 0
var/emagged = 0 var/emagged = 0

1
code/game/objects/items/devices/multitool.dm
View File

@@ -8,7 +8,6 @@
name = "multitool" name = "multitool"
desc = "Used for pulsing wires to test which to cut. Not recommended by doctors." desc = "Used for pulsing wires to test which to cut. Not recommended by doctors."
icon_state = "multitool" icon_state = "multitool"
flags = CONDUCT
force = 5.0 force = 5.0
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
throwforce = 5.0 throwforce = 5.0

1
code/game/objects/items/devices/powersink.dm
View File

@@ -5,7 +5,6 @@
desc = "A nulling power sink which drains energy from electrical systems." desc = "A nulling power sink which drains energy from electrical systems."
icon_state = "powersink0" icon_state = "powersink0"
w_class = ITEMSIZE_LARGE w_class = ITEMSIZE_LARGE
flags = CONDUCT
throwforce = 5 throwforce = 5
throw_speed = 1 throw_speed = 1
throw_range = 2 throw_range = 2

1
code/game/objects/items/devices/radio/electropack.dm
View File

@@ -8,7 +8,6 @@
) )
item_state = "electropack" item_state = "electropack"
frequency = 1449 frequency = 1449
flags = CONDUCT
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
w_class = ITEMSIZE_HUGE w_class = ITEMSIZE_HUGE

2
code/game/objects/items/devices/radio/intercom.dm
View File

@@ -7,7 +7,7 @@
anchored = 1 anchored = 1
w_class = ITEMSIZE_LARGE w_class = ITEMSIZE_LARGE
canhear_range = 2 canhear_range = 2
flags = CONDUCT | NOBLOODY flags = NOBLOODY
var/circuit = /obj/item/weapon/circuitboard/intercom var/circuit = /obj/item/weapon/circuitboard/intercom
var/number = 0 var/number = 0
var/last_tick //used to delay the powercheck var/last_tick //used to delay the powercheck

1
code/game/objects/items/devices/radio/radio.dm
View File

@@ -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/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/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 var/centComm = 0//Holder to see if it's a CentCom encrypted radio
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
throw_speed = 2 throw_speed = 2
throw_range = 9 throw_range = 9

7
code/game/objects/items/devices/scanners.dm
View File

@@ -15,7 +15,6 @@ HALOGEN COUNTER - Radcount on mobs
desc = "A hand-held body scanner able to distinguish vital signs of the subject." desc = "A hand-held body scanner able to distinguish vital signs of the subject."
icon_state = "health" icon_state = "health"
item_state = "healthanalyzer" item_state = "healthanalyzer"
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
throwforce = 3 throwforce = 3
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
@@ -299,7 +298,6 @@ HALOGEN COUNTER - Radcount on mobs
icon_state = "atmos" icon_state = "atmos"
item_state = "analyzer" item_state = "analyzer"
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
throwforce = 5 throwforce = 5
throw_speed = 4 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." desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample."
icon_state = "spectrometer" icon_state = "spectrometer"
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
flags = CONDUCT | OPENCONTAINER flags = OPENCONTAINER
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
throwforce = 5 throwforce = 5
throw_speed = 4 throw_speed = 4
@@ -399,7 +397,6 @@ HALOGEN COUNTER - Radcount on mobs
icon_state = "spectrometer" icon_state = "spectrometer"
item_state = "analyzer" item_state = "analyzer"
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
throwforce = 5 throwforce = 5
throw_speed = 4 throw_speed = 4
@@ -447,7 +444,6 @@ HALOGEN COUNTER - Radcount on mobs
item_state = "xenobio" item_state = "xenobio"
origin_tech = list(TECH_BIO = 1) origin_tech = list(TECH_BIO = 1)
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
flags = CONDUCT
throwforce = 0 throwforce = 0
throw_speed = 3 throw_speed = 3
throw_range = 7 throw_range = 7
@@ -490,7 +486,6 @@ HALOGEN COUNTER - Radcount on mobs
icon_state = "eftpos" icon_state = "eftpos"
desc = "A hand-held halogen counter, used to detect the level of irradiation of living beings." desc = "A hand-held halogen counter, used to detect the level of irradiation of living beings."
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
flags = CONDUCT
origin_tech = list(TECH_MAGNET = 1, TECH_BIO = 2) origin_tech = list(TECH_MAGNET = 1, TECH_BIO = 2)
throwforce = 0 throwforce = 0
throw_speed = 3 throw_speed = 3

3
code/game/objects/items/devices/spy_bug.dm
View File

@@ -4,7 +4,6 @@
icon = 'icons/obj/grenade.dmi' icon = 'icons/obj/grenade.dmi'
icon_state = "camgrenade" icon_state = "camgrenade"
item_state = "empgrenade" item_state = "empgrenade"
flags = CONDUCT
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
force = 0 force = 0
throwforce = 5.0 throwforce = 5.0
@@ -50,7 +49,6 @@
icon = 'icons/obj/grenade.dmi' icon = 'icons/obj/grenade.dmi'
icon_state = "camgrenadebroken" icon_state = "camgrenadebroken"
item_state = "empgrenade" item_state = "empgrenade"
flags = CONDUCT
force = 5.0 force = 5.0
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
throwforce = 5.0 throwforce = 5.0
@@ -68,7 +66,6 @@
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS slot_flags = SLOT_EARS
origin_tech = list(TECH_ENGINEERING = 1, TECH_ILLEGAL = 3) //crush it and you lose the data origin_tech = list(TECH_ENGINEERING = 1, TECH_ILLEGAL = 3) //crush it and you lose the data
flags = CONDUCT
force = 0 force = 0
throwforce = 5.0 throwforce = 5.0
throw_range = 15 throw_range = 15

1
code/game/objects/items/devices/suit_cooling.dm
View File

@@ -7,7 +7,6 @@
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
//copied from tank.dm //copied from tank.dm
flags = CONDUCT
force = 5.0 force = 5.0
throwforce = 10.0 throwforce = 10.0
throw_speed = 1 throw_speed = 1

1
code/game/objects/items/devices/taperecorder.dm
View File

@@ -13,7 +13,6 @@
var/playsleepseconds = 0.0 var/playsleepseconds = 0.0
var/obj/item/device/tape/mytape = /obj/item/device/tape/random var/obj/item/device/tape/mytape = /obj/item/device/tape/random
var/canprint = 1 var/canprint = 1
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
throwforce = 2 throwforce = 2
throw_speed = 4 throw_speed = 4

1
code/game/objects/items/devices/traitordevices.dm
View File

@@ -22,7 +22,6 @@ effective or pretty fucking useless.
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
throw_speed = 4 throw_speed = 4
throw_range = 10 throw_range = 10
flags = CONDUCT
item_state = "electronic" item_state = "electronic"
origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 3, TECH_ILLEGAL = 3) origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 3, TECH_ILLEGAL = 3)

1
code/game/objects/items/devices/whistle.dm
View File

@@ -4,7 +4,6 @@
icon_state = "voice0" icon_state = "voice0"
item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang) item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang)
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
flags = CONDUCT
slot_flags = SLOT_EARS slot_flags = SLOT_EARS
var/use_message = "Halt! Security!" var/use_message = "Halt! Security!"

1
code/game/objects/items/robot/robot_parts.dm
View File

@@ -3,7 +3,6 @@
icon = 'icons/obj/robot_parts.dmi' icon = 'icons/obj/robot_parts.dmi'
item_state = "buildpipe" item_state = "buildpipe"
icon_state = "blank" icon_state = "blank"
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
var/list/part = null // Order of args is important for installing robolimbs. var/list/part = null // Order of args is important for installing robolimbs.
var/sabotaged = 0 //Emagging limbs can have repercussions when installed as prosthetics. var/sabotaged = 0 //Emagging limbs can have repercussions when installed as prosthetics.

1
code/game/objects/items/stacks/rods.dm
View File

@@ -3,7 +3,6 @@
desc = "Some rods. Can be used for building, or something." desc = "Some rods. Can be used for building, or something."
singular_name = "metal rod" singular_name = "metal rod"
icon_state = "rods" icon_state = "rods"
flags = CONDUCT
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
force = 9.0 force = 9.0
throwforce = 15.0 throwforce = 15.0

1
code/game/objects/items/stacks/tiles/tile_types.dm
View File

@@ -114,7 +114,6 @@
throwforce = 15.0 throwforce = 15.0
throw_speed = 5 throw_speed = 5
throw_range = 20 throw_range = 20
flags = CONDUCT
no_variants = FALSE no_variants = FALSE
/obj/item/stack/tile/floor/red /obj/item/stack/tile/floor/red

1
code/game/objects/items/toys.dm
View File

@@ -295,7 +295,6 @@
slot_l_hand_str = 'icons/mob/items/lefthand_material.dmi', slot_l_hand_str = 'icons/mob/items/lefthand_material.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_material.dmi', slot_r_hand_str = 'icons/mob/items/righthand_material.dmi',
) )
flags = CONDUCT
slot_flags = SLOT_BELT | SLOT_BACK slot_flags = SLOT_BELT | SLOT_BACK
force = 5 force = 5
throwforce = 5 throwforce = 5

1
code/game/objects/items/weapons/AI_modules.dm
View File

@@ -11,7 +11,6 @@ AI MODULES
icon = 'icons/obj/module.dmi' icon = 'icons/obj/module.dmi'
icon_state = "std_mod" icon_state = "std_mod"
desc = "An AI Module for transmitting encrypted instructions to the AI." desc = "An AI Module for transmitting encrypted instructions to the AI."
flags = CONDUCT
force = 5.0 force = 5.0
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
throwforce = 5.0 throwforce = 5.0

2
code/game/objects/items/weapons/RCD.dm
View File

@@ -5,7 +5,7 @@
icon = 'icons/obj/tools.dmi' icon = 'icons/obj/tools.dmi'
icon_state = "rcd" icon_state = "rcd"
item_state = "rcd" item_state = "rcd"
flags = CONDUCT | NOBLUDGEON flags = NOBLUDGEON
force = 10 force = 10
throwforce = 10 throwforce = 10
throw_speed = 1 throw_speed = 1

1
code/game/objects/items/weapons/autopsy.dm
View File

@@ -8,7 +8,6 @@
icon = 'icons/obj/autopsy_scanner.dmi' icon = 'icons/obj/autopsy_scanner.dmi'
icon_state = "" icon_state = ""
item_state = "autopsy_scanner" item_state = "autopsy_scanner"
flags = CONDUCT
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1)
var/list/datum/autopsy_data_scanner/wdata = list() var/list/datum/autopsy_data_scanner/wdata = list()

1
code/game/objects/items/weapons/cigs_lighters.dm
View File

@@ -502,7 +502,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
item_state = "lighter-g" item_state = "lighter-g"
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
throwforce = 4 throwforce = 4
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
attack_verb = list("burnt", "singed") attack_verb = list("burnt", "singed")
var/base_state var/base_state

1
code/game/objects/items/weapons/circuitboards/circuitboard.dm
View File

@@ -12,7 +12,6 @@
density = 0 density = 0
anchored = 0 anchored = 0
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
flags = CONDUCT
force = 5.0 force = 5.0
throwforce = 5.0 throwforce = 5.0
throw_speed = 3 throw_speed = 3

1
code/game/objects/items/weapons/extinguisher.dm
View File

@@ -5,7 +5,6 @@
icon_state = "fire_extinguisher0" icon_state = "fire_extinguisher0"
item_state = "fire_extinguisher" item_state = "fire_extinguisher"
hitsound = 'sound/weapons/smash.ogg' hitsound = 'sound/weapons/smash.ogg'
flags = CONDUCT
throwforce = 10 throwforce = 10
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
throw_speed = 2 throw_speed = 2

1
code/game/objects/items/weapons/flamethrower.dm
View File

@@ -8,7 +8,6 @@
slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi',
) )
item_state = "flamethrower_0" item_state = "flamethrower_0"
flags = CONDUCT
force = 3.0 force = 3.0
throwforce = 10.0 throwforce = 10.0
throw_speed = 1 throw_speed = 1

1
code/game/objects/items/weapons/grenades/grenade.dm
View File

@@ -7,7 +7,6 @@
item_state = "grenade" item_state = "grenade"
throw_speed = 4 throw_speed = 4
throw_range = 20 throw_range = 20
flags = CONDUCT
slot_flags = SLOT_MASK|SLOT_BELT slot_flags = SLOT_MASK|SLOT_BELT
var/active = 0 var/active = 0

1
code/game/objects/items/weapons/grenades/spawnergrenade.dm
View File

@@ -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." 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" icon_state = "briefcase"
item_state = "briefcase" item_state = "briefcase"
flags = CONDUCT
force = 8.0 force = 8.0
throw_speed = 1 throw_speed = 1
throw_range = 4 throw_range = 4

2
code/game/objects/items/weapons/handcuffs.dm
View File

@@ -4,7 +4,6 @@
gender = PLURAL gender = PLURAL
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "handcuff" icon_state = "handcuff"
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
throwforce = 5 throwforce = 5
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
@@ -205,7 +204,6 @@ var/last_chew = 0
gender = PLURAL gender = PLURAL
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "legcuff" icon_state = "legcuff"
flags = CONDUCT
throwforce = 0 throwforce = 0
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_MATERIAL = 1) origin_tech = list(TECH_MATERIAL = 1)

1
code/game/objects/items/weapons/improvised_components.dm
View File

@@ -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." desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit."
icon_state = "wiredrod" icon_state = "wiredrod"
item_state = "rods" item_state = "rods"
flags = CONDUCT
force = 8 force = 8
throwforce = 10 throwforce = 10
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL

1
code/game/objects/items/weapons/material/knives.dm
View File

@@ -59,7 +59,6 @@
icon = 'icons/obj/kitchen.dmi' icon = 'icons/obj/kitchen.dmi'
icon_state = "knife" icon_state = "knife"
desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come." desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
flags = CONDUCT
sharp = 1 sharp = 1
edge = 1 edge = 1
force_divisor = 0.15 // 9 when wielded with hardness 60 (steel) force_divisor = 0.15 // 9 when wielded with hardness 60 (steel)

3
code/game/objects/items/weapons/melee/energy.dm
View File

@@ -7,7 +7,7 @@
sharp = 0 sharp = 0
edge = 0 edge = 0
armor_penetration = 50 armor_penetration = 50
flags = NOBLOODY flags = NOCONDUCT | NOBLOODY
var/lrange = 2 var/lrange = 2
var/lpower = 2 var/lpower = 2
var/lcolor = "#0099FF" var/lcolor = "#0099FF"
@@ -82,7 +82,6 @@
throw_speed = 1 throw_speed = 1
throw_range = 5 throw_range = 5
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
flags = CONDUCT | NOBLOODY
origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 4) origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 4)
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
sharp = 1 sharp = 1

2
code/game/objects/items/weapons/melee/misc.dm
View File

@@ -2,7 +2,6 @@
name = "chain of command" name = "chain of command"
desc = "A tool used by great men to placate the frothing masses." desc = "A tool used by great men to placate the frothing masses."
icon_state = "chain" icon_state = "chain"
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
force = 10 force = 10
throwforce = 7 throwforce = 7
@@ -21,7 +20,6 @@
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "umbrella_closed" icon_state = "umbrella_closed"
addblends = "umbrella_closed_a" addblends = "umbrella_closed_a"
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
force = 5 force = 5
throwforce = 5 throwforce = 5

3
code/game/objects/items/weapons/shields.dm
View File

@@ -58,7 +58,6 @@
desc = "A shield adept for close quarters engagement. It's also capable of protecting from less powerful projectiles." desc = "A shield adept for close quarters engagement. It's also capable of protecting from less powerful projectiles."
icon = 'icons/obj/weapons.dmi' icon = 'icons/obj/weapons.dmi'
icon_state = "riot" icon_state = "riot"
flags = CONDUCT
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
force = 5.0 force = 5.0
throwforce = 5.0 throwforce = 5.0
@@ -115,7 +114,7 @@
icon = 'icons/obj/weapons.dmi' icon = 'icons/obj/weapons.dmi'
icon_state = "eshield0" // eshield1 for expanded icon_state = "eshield0" // eshield1 for expanded
slot_flags = SLOT_EARS slot_flags = SLOT_EARS
flags = CONDUCT flags = NOCONDUCT
force = 3.0 force = 3.0
throwforce = 5.0 throwforce = 5.0
throw_speed = 1 throw_speed = 1

1
code/game/objects/items/weapons/storage/briefcase.dm
View File

@@ -2,7 +2,6 @@
name = "briefcase" name = "briefcase"
desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional." 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" icon_state = "briefcase"
flags = CONDUCT
force = 8.0 force = 8.0
throw_speed = 1 throw_speed = 1
throw_range = 4 throw_range = 4

1
code/game/objects/items/weapons/storage/toolbox.dm
View File

@@ -4,7 +4,6 @@
icon = 'icons/obj/storage.dmi' icon = 'icons/obj/storage.dmi'
icon_state = "red" icon_state = "red"
item_state_slots = list(slot_r_hand_str = "toolbox_red", slot_l_hand_str = "toolbox_red") item_state_slots = list(slot_r_hand_str = "toolbox_red", slot_l_hand_str = "toolbox_red")
flags = CONDUCT
force = 10 force = 10
throwforce = 10 throwforce = 10
throw_speed = 1 throw_speed = 1

1
code/game/objects/items/weapons/surgery_tools.dm
View File

@@ -13,7 +13,6 @@
desc = "This shouldn't be here, ahelp it." desc = "This shouldn't be here, ahelp it."
icon = 'icons/obj/surgery.dmi' icon = 'icons/obj/surgery.dmi'
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
flags = CONDUCT
var/helpforce = 0 //For help intent things var/helpforce = 0 //For help intent things
/obj/item/weapon/surgical/attack(mob/M, mob/user) /obj/item/weapon/surgical/attack(mob/M, mob/user)

3
code/game/objects/items/weapons/tanks/tank_types.dm
View File

@@ -79,7 +79,6 @@
desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable."
icon_state = "phoron" icon_state = "phoron"
gauge_icon = null gauge_icon = null
flags = CONDUCT
slot_flags = null //they have no straps! slot_flags = null //they have no straps!
/obj/item/weapon/tank/phoron/Initialize() /obj/item/weapon/tank/phoron/Initialize()
@@ -105,7 +104,6 @@
desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable." desc = "Contains dangerous phoron. Do not inhale. Warning: extremely flammable."
icon_state = "phoron_vox" icon_state = "phoron_vox"
gauge_icon = null gauge_icon = null
flags = CONDUCT
distribute_pressure = ONE_ATMOSPHERE*O2STANDARD distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
slot_flags = SLOT_BACK //these ones have straps! slot_flags = SLOT_BACK //these ones have straps!
@@ -124,7 +122,6 @@
icon_state = "emergency" icon_state = "emergency"
gauge_icon = "indicator_emergency" gauge_icon = "indicator_emergency"
gauge_cap = 4 gauge_cap = 4
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
force = 4 force = 4

1
code/game/objects/items/weapons/tanks/tanks.dm
View File

@@ -15,7 +15,6 @@ var/list/global/tank_gauge_cache = list()
var/last_gauge_pressure var/last_gauge_pressure
var/gauge_cap = 6 var/gauge_cap = 6
flags = CONDUCT
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL

1
code/game/objects/items/weapons/teleportation.dm
View File

@@ -16,7 +16,6 @@
var/frequency = 1451 var/frequency = 1451
var/broadcasting = null var/broadcasting = null
var/listening = 1.0 var/listening = 1.0
flags = CONDUCT
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
item_state = "electronic" item_state = "electronic"
throw_speed = 4 throw_speed = 4

1
code/game/objects/items/weapons/tools/crowbar.dm
View File

@@ -7,7 +7,6 @@
desc = "Used to remove floors and to pry open doors." desc = "Used to remove floors and to pry open doors."
icon = 'icons/obj/tools.dmi' icon = 'icons/obj/tools.dmi'
icon_state = "crowbar" icon_state = "crowbar"
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
force = 6 force = 6
throwforce = 7 throwforce = 7

1
code/game/objects/items/weapons/tools/screwdriver.dm
View File

@@ -6,7 +6,6 @@
desc = "You can be totally screwwy with this." desc = "You can be totally screwwy with this."
icon = 'icons/obj/tools.dmi' icon = 'icons/obj/tools.dmi'
icon_state = "screwdriver" icon_state = "screwdriver"
flags = CONDUCT
slot_flags = SLOT_BELT | SLOT_EARS slot_flags = SLOT_BELT | SLOT_EARS
force = 6 force = 6
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY

1
code/game/objects/items/weapons/tools/weldingtool.dm
View File

@@ -7,7 +7,6 @@
icon = 'icons/obj/tools.dmi' icon = 'icons/obj/tools.dmi'
icon_state = "welder" icon_state = "welder"
item_state = "welder" item_state = "welder"
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
//Amount of OUCH when it's thrown //Amount of OUCH when it's thrown

1
code/game/objects/items/weapons/tools/wirecutters.dm
View File

@@ -6,7 +6,6 @@
desc = "This cuts wires." desc = "This cuts wires."
icon = 'icons/obj/tools.dmi' icon = 'icons/obj/tools.dmi'
icon_state = "cutters" icon_state = "cutters"
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
force = 6 force = 6
throw_speed = 2 throw_speed = 2

1
code/game/objects/items/weapons/tools/wrench.dm
View File

@@ -6,7 +6,6 @@
desc = "A wrench with many common uses. Can be usually found in your hand." desc = "A wrench with many common uses. Can be usually found in your hand."
icon = 'icons/obj/tools.dmi' icon = 'icons/obj/tools.dmi'
icon_state = "wrench" icon_state = "wrench"
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
force = 6 force = 6
throwforce = 7 throwforce = 7

1
code/game/objects/items/weapons/trays.dm
View File

@@ -11,7 +11,6 @@
throw_speed = 1 throw_speed = 1
throw_range = 5 throw_range = 5
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
flags = CONDUCT
matter = list(DEFAULT_WALL_MATERIAL = 3000) matter = list(DEFAULT_WALL_MATERIAL = 3000)
var/list/carrying = list() // List of things on the tray. - Doohl var/list/carrying = list() // List of things on the tray. - Doohl
var/max_carry = 10 var/max_carry = 10

3
code/game/objects/structures/grille.dm
View File

@@ -5,7 +5,6 @@
icon_state = "grille" icon_state = "grille"
density = 1 density = 1
anchored = 1 anchored = 1
flags = CONDUCT
pressure_resistance = 5*ONE_ATMOSPHERE pressure_resistance = 5*ONE_ATMOSPHERE
layer = TABLE_LAYER layer = TABLE_LAYER
explosion_resistance = 1 explosion_resistance = 1
@@ -151,7 +150,7 @@
return return
//window placing end //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.setClickCooldown(user.get_attack_speed(W))
user.do_attack_animation(src) user.do_attack_animation(src)
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1) playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)

1
code/game/objects/structures/lattice.dm
View File

@@ -7,7 +7,6 @@
anchored = 1.0 anchored = 1.0
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
plane = PLATING_PLANE plane = PLATING_PLANE
// flags = CONDUCT
/obj/structure/lattice/Initialize() /obj/structure/lattice/Initialize()
. = ..() . = ..()

1
code/game/objects/structures/target_stake.dm
View File

@@ -6,7 +6,6 @@
icon_state = "target_stake" icon_state = "target_stake"
density = 1 density = 1
w_class = ITEMSIZE_HUGE w_class = ITEMSIZE_HUGE
flags = CONDUCT
var/obj/item/target/pinned_target // the current pinned target var/obj/item/target/pinned_target // the current pinned target
Move() Move()

1
code/modules/assembly/assembly.dm
View File

@@ -3,7 +3,6 @@
desc = "A small electronic device that should never exist." desc = "A small electronic device that should never exist."
icon = 'icons/obj/assemblies/new_assemblies.dmi' icon = 'icons/obj/assemblies/new_assemblies.dmi'
icon_state = "" icon_state = ""
flags = CONDUCT
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
matter = list(DEFAULT_WALL_MATERIAL = 100) matter = list(DEFAULT_WALL_MATERIAL = 100)
throwforce = 2 throwforce = 2

2
code/modules/assembly/holder.dm
View File

@@ -3,7 +3,7 @@
icon = 'icons/obj/assemblies/new_assemblies.dmi' icon = 'icons/obj/assemblies/new_assemblies.dmi'
icon_state = "holder" icon_state = "holder"
item_state = "assembly" item_state = "assembly"
flags = CONDUCT | PROXMOVE flags = PROXMOVE
throwforce = 5 throwforce = 5
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
throw_speed = 3 throw_speed = 3

1
code/modules/assembly/shock_kit.dm
View File

@@ -6,7 +6,6 @@
var/obj/item/device/radio/electropack/part2 = null var/obj/item/device/radio/electropack/part2 = null
var/status = 0 var/status = 0
w_class = ITEMSIZE_HUGE w_class = ITEMSIZE_HUGE
flags = CONDUCT
/obj/item/assembly/shock_kit/Destroy() /obj/item/assembly/shock_kit/Destroy()
qdel(part1) qdel(part1)

1
code/modules/clothing/suits/miscellaneous.dm
View File

@@ -52,7 +52,6 @@
name = "cyborg suit" name = "cyborg suit"
desc = "Suit for a cyborg costume." desc = "Suit for a cyborg costume."
icon_state = "death" icon_state = "death"
flags = CONDUCT
fire_resist = T0C+5200 fire_resist = T0C+5200
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER

2
code/modules/economy/retail_scanner.dm
View File

@@ -3,7 +3,7 @@
desc = "Swipe your ID card to make purchases electronically." desc = "Swipe your ID card to make purchases electronically."
icon = 'icons/obj/device.dmi' icon = 'icons/obj/device.dmi'
icon_state = "retail_idle" icon_state = "retail_idle"
flags = NOBLUDGEON|CONDUCT flags = NOBLUDGEON
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
req_access = list(access_heads) req_access = list(access_heads)
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL

2
code/modules/food/food/drinks.dm
View File

@@ -100,7 +100,7 @@
amount_per_transfer_from_this = 20 amount_per_transfer_from_this = 20
possible_transfer_amounts = null possible_transfer_amounts = null
volume = 150 volume = 150
flags = CONDUCT | OPENCONTAINER flags = OPENCONTAINER
/obj/item/weapon/reagent_containers/food/drinks/golden_cup/on_reagent_change() /obj/item/weapon/reagent_containers/food/drinks/golden_cup/on_reagent_change()
..() ..()

2
code/modules/integrated_electronics/core/tools.dm
View File

@@ -12,7 +12,6 @@
icon = 'icons/obj/integrated_electronics/electronic_tools.dmi' icon = 'icons/obj/integrated_electronics/electronic_tools.dmi'
icon_state = "wirer-wire" icon_state = "wirer-wire"
item_state = "wirer" item_state = "wirer"
flags = CONDUCT
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
var/datum/integrated_io/selected_io = null var/datum/integrated_io/selected_io = null
var/mode = WIRE var/mode = WIRE
@@ -110,7 +109,6 @@
settings to specific circuits, or for debugging purposes. It can also pulse activation pins." settings to specific circuits, or for debugging purposes. It can also pulse activation pins."
icon = 'icons/obj/integrated_electronics/electronic_tools.dmi' icon = 'icons/obj/integrated_electronics/electronic_tools.dmi'
icon_state = "debugger" icon_state = "debugger"
flags = CONDUCT
w_class = 2 w_class = 2
var/data_to_write = null var/data_to_write = null
var/accepting_refs = 0 var/accepting_refs = 0

4
code/modules/materials/material_sheets.dm
View File

@@ -37,8 +37,8 @@
if(apply_colour) if(apply_colour)
color = material.icon_colour color = material.icon_colour
if(material.conductive) if(!material.conductive)
flags |= CONDUCT flags |= NOCONDUCT
matter = material.get_matter() matter = material.get_matter()
update_strings() update_strings()

1
code/modules/mining/coins.dm
View File

@@ -4,7 +4,6 @@
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
name = "Coin" name = "Coin"
icon_state = "coin" icon_state = "coin"
flags = CONDUCT
force = 0.0 force = 0.0
throwforce = 0.0 throwforce = 0.0
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY

2
code/modules/mining/mine_items.dm
View File

@@ -13,7 +13,6 @@
name = "mining drill" name = "mining drill"
desc = "The most basic of mining drills, for short excavations and small mineral extractions." desc = "The most basic of mining drills, for short excavations and small mineral extractions."
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
force = 15.0 force = 15.0
throwforce = 4.0 throwforce = 4.0
@@ -112,7 +111,6 @@
desc = "A large tool for digging and moving dirt." desc = "A large tool for digging and moving dirt."
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "shovel" icon_state = "shovel"
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
force = 8.0 force = 8.0
throwforce = 4.0 throwforce = 4.0

1
code/modules/mining/money_bag.dm
View File

@@ -4,7 +4,6 @@
icon = 'icons/obj/storage.dmi' icon = 'icons/obj/storage.dmi'
name = "Money bag" name = "Money bag"
icon_state = "moneybag" icon_state = "moneybag"
flags = CONDUCT
force = 10.0 force = 10.0
throwforce = 2.0 throwforce = 2.0
w_class = ITEMSIZE_LARGE w_class = ITEMSIZE_LARGE

1
code/modules/mob/living/silicon/robot/analyzer.dm
View File

@@ -6,7 +6,6 @@
icon_state = "robotanalyzer" icon_state = "robotanalyzer"
item_state = "analyzer" item_state = "analyzer"
desc = "A hand-held scanner able to diagnose robotic injuries." desc = "A hand-held scanner able to diagnose robotic injuries."
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
throwforce = 3 throwforce = 3
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL

1
code/modules/mob/living/silicon/robot/robot_modules/station.dm
View File

@@ -19,7 +19,6 @@ var/global/list/robot_modules = list(
icon_state = "std_module" icon_state = "std_module"
w_class = ITEMSIZE_NO_CONTAINER w_class = ITEMSIZE_NO_CONTAINER
item_state = "std_mod" item_state = "std_mod"
flags = CONDUCT
var/hide_on_manifest = 0 var/hide_on_manifest = 0
var/channels = list() var/channels = list()
var/networks = list() var/networks = list()

1
code/modules/paperwork/photography.dm
View File

@@ -124,7 +124,6 @@ var/global/photo_count = 0
icon_state = "camera" icon_state = "camera"
item_state = "camera" item_state = "camera"
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
matter = list(DEFAULT_WALL_MATERIAL = 2000) matter = list(DEFAULT_WALL_MATERIAL = 2000)
var/pictures_max = 10 var/pictures_max = 10

1
code/modules/power/antimatter/shielding.dm
View File

@@ -191,7 +191,6 @@ proc/cardinalrange(var/center)
icon_state = "box" icon_state = "box"
item_state = "electronic" item_state = "electronic"
w_class = ITEMSIZE_LARGE w_class = ITEMSIZE_LARGE
flags = CONDUCT
throwforce = 5 throwforce = 5
throw_speed = 1 throw_speed = 1
throw_range = 2 throw_range = 2

4
code/modules/power/cable.dm
View File

@@ -238,7 +238,7 @@ var/list/possible_cable_coil_colours = list(
shock(user, 5, 0.2) shock(user, 5, 0.2)
else else
if (W.flags & CONDUCT) if(!(W.flags & NOCONDUCT))
shock(user, 50, 0.7) shock(user, 50, 0.7)
src.add_fingerprint(user) src.add_fingerprint(user)
@@ -511,7 +511,6 @@ obj/structure/cable/proc/cableColor(var/colorC)
throw_speed = 2 throw_speed = 2
throw_range = 5 throw_range = 5
matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20) matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20)
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
item_state = "coil" item_state = "coil"
attack_verb = list("whipped", "lashed", "disciplined", "flogged") attack_verb = list("whipped", "lashed", "disciplined", "flogged")
@@ -932,7 +931,6 @@ obj/structure/cable/proc/cableColor(var/colorC)
throw_speed = 2 throw_speed = 2
throw_range = 5 throw_range = 5
matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20) matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20)
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
attack_verb = list("whipped", "lashed", "disciplined", "flogged") attack_verb = list("whipped", "lashed", "disciplined", "flogged")
stacktype = null stacktype = null

4
code/modules/power/lighting.dm
View File

@@ -430,7 +430,7 @@
if(M == user) if(M == user)
continue continue
M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) 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(!user.mutations & COLD_RESISTANCE)
if (prob(12)) if (prob(12))
electrocute_mob(user, get_area(src), src, 0.3) electrocute_mob(user, get_area(src), src, 0.3)
@@ -468,7 +468,7 @@
return return
user << "You stick \the [W] into the light socket!" 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 var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src) s.set_up(3, 1, src)
s.start() s.start()

2
code/modules/projectiles/ammunition.dm
View File

@@ -3,7 +3,6 @@
desc = "A bullet casing." desc = "A bullet casing."
icon = 'icons/obj/ammo.dmi' icon = 'icons/obj/ammo.dmi'
icon_state = "s-casing" icon_state = "s-casing"
flags = CONDUCT
slot_flags = SLOT_BELT | SLOT_EARS slot_flags = SLOT_BELT | SLOT_EARS
throwforce = 1 throwforce = 1
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
@@ -66,7 +65,6 @@
desc = "A magazine for some kind of gun." desc = "A magazine for some kind of gun."
icon_state = ".357" icon_state = ".357"
icon = 'icons/obj/ammo.dmi' icon = 'icons/obj/ammo.dmi'
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
item_state = "syringe_kit" item_state = "syringe_kit"
matter = list(DEFAULT_WALL_MATERIAL = 500) matter = list(DEFAULT_WALL_MATERIAL = 500)

1
code/modules/projectiles/gun.dm
View File

@@ -38,7 +38,6 @@
) )
icon_state = "detective" icon_state = "detective"
item_state = "gun" item_state = "gun"
flags = CONDUCT
slot_flags = SLOT_BELT|SLOT_HOLSTER slot_flags = SLOT_BELT|SLOT_HOLSTER
matter = list(DEFAULT_WALL_MATERIAL = 2000) matter = list(DEFAULT_WALL_MATERIAL = 2000)
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL

2
code/modules/projectiles/guns/energy/special.dm
View File

@@ -7,7 +7,6 @@
origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 4) origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 4)
w_class = ITEMSIZE_LARGE w_class = ITEMSIZE_LARGE
force = 10 force = 10
flags = CONDUCT
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
projectile_type = /obj/item/projectile/ion projectile_type = /obj/item/projectile/ion
@@ -127,7 +126,6 @@
icon = 'icons/obj/gun.dmi' icon = 'icons/obj/gun.dmi'
item_icons = null item_icons = null
icon_state = "staffofchange" icon_state = "staffofchange"
flags = CONDUCT
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
w_class = ITEMSIZE_LARGE w_class = ITEMSIZE_LARGE
charge_cost = 480 charge_cost = 480

1
code/modules/projectiles/guns/launcher.dm
View File

@@ -2,7 +2,6 @@
name = "launcher" name = "launcher"
desc = "A device that launches things." desc = "A device that launches things."
w_class = ITEMSIZE_HUGE w_class = ITEMSIZE_HUGE
flags = CONDUCT
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
var/release_force = 0 var/release_force = 0

1
code/modules/projectiles/guns/launcher/pneumatic.dm
View File

@@ -5,7 +5,6 @@
item_state = "pneumatic" item_state = "pneumatic"
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
w_class = ITEMSIZE_HUGE w_class = ITEMSIZE_HUGE
flags = CONDUCT
fire_sound_text = "a loud whoosh of moving air" fire_sound_text = "a loud whoosh of moving air"
fire_delay = 50 fire_delay = 50
fire_sound = 'sound/weapons/grenade_launcher.ogg' // Formerly tablehit1.ogg but I like this better -Ace fire_sound = 'sound/weapons/grenade_launcher.ogg' // Formerly tablehit1.ogg but I like this better -Ace

1
code/modules/projectiles/guns/launcher/rocket.dm
View File

@@ -7,7 +7,6 @@
throw_speed = 2 throw_speed = 2
throw_range = 10 throw_range = 10
force = 5.0 force = 5.0
flags = CONDUCT
slot_flags = 0 slot_flags = 0
origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 5) origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 5)
fire_sound = 'sound/weapons/rpg.ogg' fire_sound = 'sound/weapons/rpg.ogg'

1
code/modules/projectiles/guns/launcher/syringe_gun.dm
View File

@@ -5,7 +5,6 @@
icon_state = "syringe-cartridge" icon_state = "syringe-cartridge"
var/icon_flight = "syringe-cartridge-flight" //so it doesn't look so weird when shot var/icon_flight = "syringe-cartridge-flight" //so it doesn't look so weird when shot
matter = list(DEFAULT_WALL_MATERIAL = 125, "glass" = 375) matter = list(DEFAULT_WALL_MATERIAL = 125, "glass" = 375)
flags = CONDUCT
slot_flags = SLOT_BELT | SLOT_EARS slot_flags = SLOT_BELT | SLOT_EARS
throwforce = 3 throwforce = 3
force = 3 force = 3

2
code/modules/projectiles/guns/projectile/shotgun.dm
View File

@@ -6,7 +6,6 @@
max_shells = 4 max_shells = 4
w_class = ITEMSIZE_LARGE w_class = ITEMSIZE_LARGE
force = 10 force = 10
flags = CONDUCT
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
caliber = "12g" caliber = "12g"
origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2) origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2)
@@ -80,7 +79,6 @@
max_shells = 2 max_shells = 2
w_class = ITEMSIZE_LARGE w_class = ITEMSIZE_LARGE
force = 10 force = 10
flags = CONDUCT
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
caliber = "12g" caliber = "12g"
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 1) origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 1)

1
code/modules/recycling/sortingmachinery.dm
View File

@@ -326,7 +326,6 @@
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
item_state = "electronic" item_state = "electronic"
flags = CONDUCT
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
proc/openwindow(mob/user as mob) proc/openwindow(mob/user as mob)

1
code/modules/shieldgen/sheldwallgen.dm
View File

@@ -20,7 +20,6 @@
// var/maxshieldload = 200 // var/maxshieldload = 200
var/obj/structure/cable/attached // the attached cable var/obj/structure/cable/attached // the attached cable
var/storedpower = 0 var/storedpower = 0
flags = CONDUCT
//There have to be at least two posts, so these are effectively doubled //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/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 var/max_stored_power = 50000 //50 kW

1
code/modules/virus2/items_devices.dm
View File

@@ -6,7 +6,6 @@
icon_state = "health" icon_state = "health"
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
item_state = "electronic" item_state = "electronic"
flags = CONDUCT
/obj/item/device/antibody_scanner/attack(mob/M as mob, mob/user as mob) /obj/item/device/antibody_scanner/attack(mob/M as mob, mob/user as mob)
if(!istype(M,/mob/living/carbon/)) if(!istype(M,/mob/living/carbon/))