diff --git a/code/game/gamemodes/changeling/powers/armblade.dm b/code/game/gamemodes/changeling/powers/armblade.dm index f26bd3027b..ad13b5d5a2 100644 --- a/code/game/gamemodes/changeling/powers/armblade.dm +++ b/code/game/gamemodes/changeling/powers/armblade.dm @@ -52,7 +52,6 @@ /obj/item/weapon/melee/changeling name = "arm weapon" desc = "A grotesque weapon made out of bone and flesh that cleaves through people as a hot knife through butter." - icon = 'icons/obj/weapons.dmi' icon_state = "arm_blade" w_class = ITEMSIZE_HUGE force = 5 diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm index fd1725f4ff..e84641fc95 100644 --- a/code/game/objects/items/devices/binoculars.dm +++ b/code/game/objects/items/devices/binoculars.dm @@ -5,6 +5,7 @@ name = "binoculars" desc = "A pair of binoculars." zoomdevicename = "eyepieces" + icon = 'icons/obj/device.dmi' icon_state = "binoculars" force = 5.0 throwforce = 5.0 diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 2242a74fad..5c6a330de1 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -1,5 +1,6 @@ /obj/item/device/chameleon name = "chameleon projector" + icon = 'icons/obj/device.dmi' icon_state = "shield0" slot_flags = SLOT_BELT item_state = "electronic" diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 0801e0da5b..844a6c0579 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -1,6 +1,7 @@ /obj/item/device/flash name = "flash" desc = "Used for blinding and being an asshole." + icon = 'icons/obj/device.dmi' icon_state = "flash" item_state = "flashtool" throwforce = 5 diff --git a/code/game/objects/items/devices/geiger.dm b/code/game/objects/items/devices/geiger.dm index 99a5bc5fdd..a458401cfd 100644 --- a/code/game/objects/items/devices/geiger.dm +++ b/code/game/objects/items/devices/geiger.dm @@ -5,6 +5,7 @@ /obj/item/device/geiger name = "geiger counter" desc = "A handheld device used for detecting and measuring radiation in an area." + icon = 'icons/obj/device.dmi' icon_state = "geiger_off" item_state = "multitool" w_class = ITEMSIZE_SMALL diff --git a/code/game/objects/items/devices/holowarrant.dm b/code/game/objects/items/devices/holowarrant.dm index f6a5bc6ede..f9866f7feb 100644 --- a/code/game/objects/items/devices/holowarrant.dm +++ b/code/game/objects/items/devices/holowarrant.dm @@ -1,6 +1,7 @@ /obj/item/device/holowarrant name = "warrant projector" desc = "The practical paperwork replacement for the officer on the go." + icon = 'icons/obj/device.dmi' icon_state = "holowarrant" item_state = "flashtool" throwforce = 5 diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 0bbfc5bdfa..2081414941 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -1,6 +1,7 @@ /obj/item/device/megaphone name = "megaphone" desc = "A device used to project your voice. Loudly." + icon = 'icons/obj/device.dmi' icon_state = "megaphone" w_class = ITEMSIZE_SMALL diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index 820229fd83..a9e2aaf619 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -5,6 +5,7 @@ /obj/item/device/modkit name = "hardsuit modification kit" desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user." + icon = 'icons/obj/device.dmi' icon_state = "modkit" var/parts = MODKIT_FULL var/target_species = SPECIES_HUMAN diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 72552b4de9..0a1ed0c67d 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -8,6 +8,7 @@ name = "multitool" desc = "Used for pulsing wires to test which to cut. Not recommended by doctors." description_info = "You can use this on airlocks or APCs to try to hack them without cutting wires." + icon = 'icons/obj/device.dmi' icon_state = "multitool" force = 5.0 w_class = ITEMSIZE_SMALL diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index d28ebc71f4..97dffc39ec 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -13,6 +13,7 @@ HALOGEN COUNTER - Radcount on mobs /obj/item/device/healthanalyzer name = "health analyzer" desc = "A hand-held body scanner able to distinguish vital signs of the subject." + icon = 'icons/obj/device.dmi' icon_state = "health" item_state = "healthanalyzer" slot_flags = SLOT_BELT @@ -323,6 +324,7 @@ HALOGEN COUNTER - Radcount on mobs /obj/item/device/analyzer name = "analyzer" desc = "A hand-held environmental scanner which reports current gas levels." + icon = 'icons/obj/device.dmi' icon_state = "atmos" item_state = "analyzer" w_class = ITEMSIZE_SMALL @@ -361,6 +363,7 @@ HALOGEN COUNTER - Radcount on mobs /obj/item/device/mass_spectrometer name = "mass spectrometer" desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample." + icon = 'icons/obj/device.dmi' icon_state = "spectrometer" w_class = ITEMSIZE_SMALL flags = OPENCONTAINER @@ -422,6 +425,7 @@ HALOGEN COUNTER - Radcount on mobs /obj/item/device/reagent_scanner name = "reagent scanner" desc = "A hand-held reagent scanner which identifies chemical agents." + icon = 'icons/obj/device.dmi' icon_state = "spectrometer" item_state = "analyzer" w_class = ITEMSIZE_SMALL @@ -468,6 +472,7 @@ HALOGEN COUNTER - Radcount on mobs /obj/item/device/slime_scanner name = "slime scanner" + icon = 'icons/obj/device.dmi' icon_state = "xenobio" item_state = "xenobio" origin_tech = list(TECH_BIO = 1) @@ -511,6 +516,7 @@ HALOGEN COUNTER - Radcount on mobs /obj/item/device/halogen_counter name = "halogen counter" + icon = 'icons/obj/device.dmi' icon_state = "eftpos" desc = "A hand-held halogen counter, used to detect the level of irradiation of living beings." w_class = ITEMSIZE_SMALL diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm index f7f768a201..c4b943d424 100644 --- a/code/game/objects/items/devices/t_scanner.dm +++ b/code/game/objects/items/devices/t_scanner.dm @@ -3,6 +3,7 @@ /obj/item/device/t_scanner name = "\improper T-ray scanner" desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." + icon = 'icons/obj/device.dmi' icon_state = "t-ray0" item_state = "t-ray" slot_flags = SLOT_BELT diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 011a3338d6..49f7c453a3 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -1,6 +1,7 @@ /obj/item/device/taperecorder name = "universal recorder" desc = "A device that can record to cassette tapes, and play them. It automatically translates the content in playback." + icon = 'icons/obj/device.dmi' icon_state = "taperecorder_empty" item_state = "analyzer" w_class = ITEMSIZE_SMALL @@ -358,6 +359,7 @@ /obj/item/device/tape name = "tape" desc = "A magnetic tape that can hold up to ten minutes of content." + icon = 'icons/obj/device.dmi' icon_state = "tape_white" item_state = "analyzer" w_class = ITEMSIZE_TINY diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 3ddc35a209..6125b79952 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -17,6 +17,7 @@ effective or pretty fucking useless. /obj/item/device/batterer name = "mind batterer" desc = "A strange device with twin antennas." + icon = 'icons/obj/device.dmi' icon_state = "batterer" throwforce = 5 w_class = ITEMSIZE_TINY diff --git a/code/game/objects/items/devices/tvcamera.dm b/code/game/objects/items/devices/tvcamera.dm index 2f368d7a53..3bd6262cb8 100644 --- a/code/game/objects/items/devices/tvcamera.dm +++ b/code/game/objects/items/devices/tvcamera.dm @@ -1,6 +1,7 @@ /obj/item/device/tvcamera name = "press camera drone" desc = "A Ward-Takahashi EyeBuddy media streaming hovercam. Weapon of choice for war correspondents and reality show cameramen." + icon = 'icons/obj/device.dmi' icon_state = "camcorder" item_state = "camcorder" w_class = ITEMSIZE_LARGE diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index 54ed540475..dd4766b5d9 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -1,6 +1,7 @@ /obj/item/device/hailer name = "hailer" desc = "Used by obese officers to save their breath for running." + icon = 'icons/obj/device.dmi' icon_state = "voice0" item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang) w_class = ITEMSIZE_TINY diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index e29c80eaea..f6ba5d21c7 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -1309,16 +1309,6 @@ return ..() -/* NYET. -/obj/item/weapon/toddler - icon_state = "toddler" - name = "toddler" - desc = "This baby looks almost real. Wait, did it just burp?" - force = 5 - w_class = ITEMSIZE_LARGE - slot_flags = SLOT_BACK -*/ - //This should really be somewhere else but I don't know where. w/e /obj/item/weapon/inflatable_duck diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm index 26c68b0f20..95c7818459 100644 --- a/code/game/objects/items/weapons/grenades/emgrenade.dm +++ b/code/game/objects/items/weapons/grenades/emgrenade.dm @@ -1,5 +1,6 @@ /obj/item/weapon/grenade/empgrenade name = "emp grenade" + icon = 'icons/obj/device.dmi' icon_state = "emp" item_state = "empgrenade" origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 3) diff --git a/code/game/objects/items/weapons/id cards/cards.dm b/code/game/objects/items/weapons/id cards/cards.dm index 11df8e807f..228bc39cfd 100644 --- a/code/game/objects/items/weapons/id cards/cards.dm +++ b/code/game/objects/items/weapons/id cards/cards.dm @@ -103,7 +103,7 @@ origin_tech = list(TECH_MAGNET = 2, TECH_ILLEGAL = 2) var/uses = 10 -/obj/item/weapon/card/emag/resolve_attackby(atom/A, mob/user, attack_modifier, click_parameters) +/obj/item/card/emag/resolve_attackby(atom/A, mob/user, attack_modifier, var/click_parameters) var/used_uses = A.emag_act(uses, user, src) if(used_uses < 0) return ..(A, user, click_parameters) diff --git a/code/game/objects/items/weapons/material/chainsaw.dm b/code/game/objects/items/weapons/material/chainsaw.dm index 5f5789a57d..cd24e3569d 100644 --- a/code/game/objects/items/weapons/material/chainsaw.dm +++ b/code/game/objects/items/weapons/material/chainsaw.dm @@ -1,6 +1,7 @@ /obj/item/weapon/chainsaw name = "chainsaw" desc = "Vroom vroom." + icon = 'icons/obj/weapons.dmi' icon_state = "chainsaw0" item_state = "chainsaw0" var/on = 0 diff --git a/code/game/objects/items/weapons/material/gravemarker.dm b/code/game/objects/items/weapons/material/gravemarker.dm index d3c615e8fd..470fa793bb 100644 --- a/code/game/objects/items/weapons/material/gravemarker.dm +++ b/code/game/objects/items/weapons/material/gravemarker.dm @@ -1,6 +1,7 @@ /obj/item/weapon/material/gravemarker name = "grave marker" desc = "An object used in marking graves." + icon = 'icons/obj/weapons.dmi' icon_state = "gravemarker" w_class = ITEMSIZE_LARGE fragile = 1 diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm index ab65a03c97..6ac58614bb 100644 --- a/code/game/objects/items/weapons/material/material_weapons.dm +++ b/code/game/objects/items/weapons/material/material_weapons.dm @@ -10,6 +10,7 @@ w_class = ITEMSIZE_NORMAL sharp = 0 edge = 0 + icon = 'icons/obj/weapons.dmi' item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_material.dmi', slot_r_hand_str = 'icons/mob/items/righthand_material.dmi', diff --git a/code/game/objects/items/weapons/material/whetstone.dm b/code/game/objects/items/weapons/material/whetstone.dm index 65faf1fa7c..d672c8f55d 100644 --- a/code/game/objects/items/weapons/material/whetstone.dm +++ b/code/game/objects/items/weapons/material/whetstone.dm @@ -4,6 +4,7 @@ /obj/item/weapon/whetstone name = "whetstone" desc = "A simple, fine grit stone, useful for sharpening dull edges and polishing out dents." + icon = 'icons/obj/weapons.dmi' icon_state = "whetstone" force = 3 w_class = ITEMSIZE_SMALL diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index cea67ef498..f6c3a9784c 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -1,6 +1,7 @@ /obj/item/weapon/nullrod name = "null rod" desc = "A rod of pure obsidian, its very presence disrupts and dampens the powers of paranormal phenomenae." + icon = 'icons/obj/weapons.dmi' icon_state = "nullrod" item_state = "nullrod" slot_flags = SLOT_BELT diff --git a/code/game/objects/structures/props/alien_props.dm b/code/game/objects/structures/props/alien_props.dm index 38f0b1b893..1d0198a5ee 100644 --- a/code/game/objects/structures/props/alien_props.dm +++ b/code/game/objects/structures/props/alien_props.dm @@ -101,6 +101,7 @@ /obj/item/prop/alien/junk name = "alien object" desc = "You have no idea what this thing does." + icon = 'icons/obj/device.dmi' icon_state = "health" w_class = ITEMSIZE_SMALL var/static/list/possible_states = list("health", "spider", "slime", "emp", "species", "egg", "vent", "mindshock", "viral", "gland") diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm index cd0190c71e..01e8ca7766 100644 --- a/code/game/objects/weapons.dm +++ b/code/game/objects/weapons.dm @@ -5,12 +5,8 @@ var/can_cleave = FALSE // If true, a 'cleaving' attack will occur. var/cleaving = FALSE // Used to avoid infinite cleaving. -/obj/item/weapon/Bump(mob/M as mob) - spawn(0) - ..() - return - -/obj/item/weapon/melee +/obj/item/melee + icon = 'icons/obj/weapons.dmi' item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi', diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm index ccda19e9f9..e618d8ef00 100644 --- a/code/modules/clothing/spacesuits/rig/modules/combat.dm +++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm @@ -11,6 +11,7 @@ /obj/item/rig_module/device/flash name = "mounted flash" desc = "You are the law." + icon = 'icons/obj/device.dmi' icon_state = "flash" interface_name = "mounted flash" interface_desc = "Stuns your target by blinding them with a bright light." diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm index 398d511bc5..d60d11b518 100644 --- a/code/modules/clothing/spacesuits/rig/modules/computer.dm +++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm @@ -349,6 +349,7 @@ name = "hardsuit power sink" desc = "An heavy-duty power sink." + icon = 'icons/obj/device.dmi' icon_state = "powersink" toggleable = 1 activates_on_touch = 1 diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/device.dm b/code/modules/clothing/spacesuits/rig/modules/specific/device.dm index bbf0023d98..39350e3997 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/device.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/device.dm @@ -33,6 +33,7 @@ /obj/item/rig_module/device/flash name = "mounted flash" desc = "You are the law." + icon = 'icons/obj/device.dmi' icon_state = "flash" interface_name = "mounted flash" interface_desc = "Stuns your target by blinding them with a bright light." diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/powersink.dm b/code/modules/clothing/spacesuits/rig/modules/specific/powersink.dm index bfea5ccf1c..ed995a6a16 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/powersink.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/powersink.dm @@ -1,6 +1,7 @@ /obj/item/rig_module/power_sink name = "hardsuit power sink" desc = "An heavy-duty power sink." + icon = 'icons/obj/device.dmi' icon_state = "powersink" toggleable = 1 activates_on_touch = 1 diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/voice.dm b/code/modules/clothing/spacesuits/rig/modules/specific/voice.dm index 00bd42d468..7cb1c53801 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/voice.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/voice.dm @@ -2,6 +2,7 @@ name = "hardsuit voice synthesiser" desc = "A speaker box and sound processor." + icon = 'icons/obj/device.dmi' icon_state = "megaphone" usable = 1 selectable = 0 diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm index 87ae0f5eb2..1ea1f094c5 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -295,6 +295,7 @@ name = "hardsuit voice synthesiser" desc = "A speaker box and sound processor." + icon = 'icons/obj/device.dmi' icon_state = "megaphone" usable = 1 selectable = 0 diff --git a/code/modules/detectivework/tools/uvlight.dm b/code/modules/detectivework/tools/uvlight.dm index 06df4a8550..f3d4d5b458 100644 --- a/code/modules/detectivework/tools/uvlight.dm +++ b/code/modules/detectivework/tools/uvlight.dm @@ -1,6 +1,7 @@ /obj/item/device/uv_light name = "\improper UV light" desc = "A small handheld black light." + icon = 'icons/obj/device.dmi' icon_state = "uv_off" slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 3704d74d1a..4c66c5b8ac 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -273,6 +273,7 @@ /obj/item/weapon/holo/esword desc = "May the force be within you. Sorta." + icon = 'icons/obj/weapons.dmi' icon_state = "esword" var/lcolor var/rainbow = FALSE diff --git a/code/modules/holomap/mapper.dm b/code/modules/holomap/mapper.dm index a068c752eb..c39ea700f0 100644 --- a/code/modules/holomap/mapper.dm +++ b/code/modules/holomap/mapper.dm @@ -1,6 +1,7 @@ /obj/item/device/mapping_unit name = "mapping unit" desc = "A portable mapping unit, capable of locating other similar units on a map. Also has a short-range sonar mapping system." + icon = 'icons/obj/device.dmi' icon_state = "mapping_unit" item_state = null w_class = ITEMSIZE_SMALL @@ -395,6 +396,7 @@ /obj/item/device/holomap_beacon name = "holomap beacon" desc = "When active, the beacon will show itself on mapping units of the same type." + icon = 'icons/obj/device.dmi' icon_state = "holochip" w_class = ITEMSIZE_TINY var/mapper_filter = HOLOMAP_FILTER_STATIONMAP diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm index 08e0ee3601..9e294b4c6b 100644 --- a/code/modules/mob/living/silicon/robot/analyzer.dm +++ b/code/modules/mob/living/silicon/robot/analyzer.dm @@ -3,6 +3,7 @@ // /obj/item/device/robotanalyzer name = "cyborg analyzer" + icon = 'icons/obj/device.dmi' icon_state = "robotanalyzer" item_state = "analyzer" desc = "A hand-held scanner able to diagnose robotic injuries." diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm index 39ab79c2e6..106af1d496 100644 --- a/code/modules/projectiles/guns/launcher/pneumatic.dm +++ b/code/modules/projectiles/guns/launcher/pneumatic.dm @@ -141,6 +141,7 @@ /obj/item/weapon/cannonframe name = "pneumatic cannon frame" desc = "A half-finished pneumatic cannon." + icon = 'icons/obj/weapons.dmi' icon_state = "pneumatic0" item_state = "pneumatic" diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 969526be79..82ca5fcd1f 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -332,6 +332,7 @@ /obj/item/device/destTagger name = "destination tagger" desc = "Used to set the destination of properly wrapped packages." + icon = 'icons/obj/device.dmi' icon_state = "dest_tagger" var/currTag = 0 diff --git a/code/modules/shuttles/landmarks.dm b/code/modules/shuttles/landmarks.dm index c55e13ea97..0771235a89 100644 --- a/code/modules/shuttles/landmarks.dm +++ b/code/modules/shuttles/landmarks.dm @@ -162,6 +162,7 @@ /obj/item/device/spaceflare name = "bluespace flare" desc = "Burst transmitter used to broadcast all needed information for shuttle navigation systems. Has a flare attached for marking the spot where you probably shouldn't be standing." + icon = 'icons/obj/device.dmi' icon_state = "bluflare" light_color = "#3728ff" var/active diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm index 80355576fe..b5da5a9fb2 100644 --- a/code/modules/virus2/items_devices.dm +++ b/code/modules/virus2/items_devices.dm @@ -3,6 +3,7 @@ /obj/item/device/antibody_scanner name = "antibody scanner" desc = "Scans living beings for antibodies in their blood." + icon = 'icons/obj/device.dmi' icon_state = "health" w_class = ITEMSIZE_SMALL item_state = "electronic" diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index ed3288816a..d2475dd043 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ