diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 8c73c935388..d6c53d5c1b9 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -1,5 +1,6 @@ /obj/item/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 d6322e72e93..aec8caab0da 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -1,6 +1,7 @@ /obj/item/flash name = "flash" desc = "Used for blinding and disorienting." + 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 5b0674558e5..f6e1427c815 100644 --- a/code/game/objects/items/devices/geiger.dm +++ b/code/game/objects/items/devices/geiger.dm @@ -5,6 +5,7 @@ /obj/item/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 dd2c4e7ff8b..1e65c456ab1 100644 --- a/code/game/objects/items/devices/holowarrant.dm +++ b/code/game/objects/items/devices/holowarrant.dm @@ -1,6 +1,7 @@ /obj/item/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 16ea52d0ed4..25a30be03ba 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -1,6 +1,7 @@ /obj/item/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 5ca3a53651a..d1915aa09d3 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -5,6 +5,7 @@ /obj/item/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 a49417aba04..673458f821f 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/gas.dm b/code/game/objects/items/devices/scanners/gas.dm index e0f00144e9a..ee144227484 100644 --- a/code/game/objects/items/devices/scanners/gas.dm +++ b/code/game/objects/items/devices/scanners/gas.dm @@ -1,6 +1,7 @@ /obj/item/analyzer name = "gas 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 @@ -33,4 +34,4 @@ /obj/item/analyzer/afterattack(var/obj/O, var/mob/user, var/proximity) if(proximity) analyze_gases(O, user) - return \ No newline at end of file + return diff --git a/code/game/objects/items/devices/scanners/halogen.dm b/code/game/objects/items/devices/scanners/halogen.dm index da46438e3f5..218ec9f953e 100644 --- a/code/game/objects/items/devices/scanners/halogen.dm +++ b/code/game/objects/items/devices/scanners/halogen.dm @@ -1,5 +1,6 @@ /obj/item/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 @@ -17,4 +18,4 @@ to_chat(user, "Radiation Level: [M.radiation]") else to_chat(user, "No radiation detected.") - return \ No newline at end of file + return diff --git a/code/game/objects/items/devices/scanners/health.dm b/code/game/objects/items/devices/scanners/health.dm index a6f220ed824..117d2185c7b 100644 --- a/code/game/objects/items/devices/scanners/health.dm +++ b/code/game/objects/items/devices/scanners/health.dm @@ -3,6 +3,7 @@ /obj/item/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 diff --git a/code/game/objects/items/devices/scanners/mass_spectrometer.dm b/code/game/objects/items/devices/scanners/mass_spectrometer.dm index f266354d6e2..1647dbf65c5 100644 --- a/code/game/objects/items/devices/scanners/mass_spectrometer.dm +++ b/code/game/objects/items/devices/scanners/mass_spectrometer.dm @@ -1,6 +1,7 @@ /obj/item/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 @@ -57,4 +58,4 @@ name = "advanced mass spectrometer" icon_state = "adv_spectrometer" details = 1 - origin_tech = list(TECH_MAGNET = 4, TECH_BIO = 2) \ No newline at end of file + origin_tech = list(TECH_MAGNET = 4, TECH_BIO = 2) diff --git a/code/game/objects/items/devices/scanners/reagents.dm b/code/game/objects/items/devices/scanners/reagents.dm index 18169285b1f..d00553539b9 100644 --- a/code/game/objects/items/devices/scanners/reagents.dm +++ b/code/game/objects/items/devices/scanners/reagents.dm @@ -1,6 +1,7 @@ /obj/item/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 @@ -43,4 +44,4 @@ name = "advanced reagent scanner" icon_state = "adv_spectrometer" details = 1 - origin_tech = list(TECH_MAGNET = 4, TECH_BIO = 2) \ No newline at end of file + origin_tech = list(TECH_MAGNET = 4, TECH_BIO = 2) diff --git a/code/game/objects/items/devices/scanners/slime.dm b/code/game/objects/items/devices/scanners/slime.dm index 4bc90ad3e0f..1a2c08913c6 100644 --- a/code/game/objects/items/devices/scanners/slime.dm +++ b/code/game/objects/items/devices/scanners/slime.dm @@ -1,5 +1,6 @@ /obj/item/slime_scanner name = "slime scanner" + icon = 'icons/obj/device.dmi' icon_state = "xenobio" item_state = "xenobio" origin_tech = list(TECH_BIO = 1) @@ -39,4 +40,4 @@ if(S.unity) user.show_message("Subject is friendly to other slime colors.") - user.show_message("Growth progress: [S.amount_grown]/10") \ No newline at end of file + user.show_message("Growth progress: [S.amount_grown]/10") diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm index 5e77014ab0a..2e8345da47f 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/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 @@ -147,4 +148,4 @@ scan_range = 7 -#undef OVERLAY_CACHE_LEN \ No newline at end of file +#undef OVERLAY_CACHE_LEN diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 0cb5dfdefdc..29f240e7496 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -1,6 +1,7 @@ /obj/item/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/weapons.dmi' icon_state = "taperecorder_empty" item_state = "analyzer" w_class = ITEMSIZE_SMALL diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 6490acd7594..8ffdcd031d1 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/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 5d506884a83..246cf150322 100644 --- a/code/game/objects/items/devices/tvcamera.dm +++ b/code/game/objects/items/devices/tvcamera.dm @@ -1,6 +1,7 @@ /obj/item/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/uplink.dm b/code/game/objects/items/devices/uplink.dm index 5653bdd6db4..6d06d0581a5 100644 --- a/code/game/objects/items/devices/uplink.dm +++ b/code/game/objects/items/devices/uplink.dm @@ -23,6 +23,8 @@ var/discount_amount //The amount as a percent the item will be discounted by var/compact_mode = FALSE + icon = 'icons/obj/device.dmi' + /obj/item/uplink/Initialize(var/mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(next_offer)), offer_time) //It seems like only the /hidden type actually makes use of this... diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index 780ca0bc553..8523720cf62 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -1,6 +1,7 @@ /obj/item/latexballon name = "latex glove" desc = "A latex glove, usually used as a balloon." + icon = 'icons/obj/items.dmi' icon_state = "latexballon" item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_gloves.dmi', @@ -61,4 +62,4 @@ slot_r_hand_str = 'icons/mob/items/righthand_gloves.dmi', ) item_state = "ngloves" -*/ \ No newline at end of file +*/ diff --git a/code/modules/clothing/ears/ears.dm b/code/modules/clothing/ears/ears.dm index 99f9b009129..82245b31583 100644 --- a/code/modules/clothing/ears/ears.dm +++ b/code/modules/clothing/ears/ears.dm @@ -4,6 +4,7 @@ /obj/item/clothing/ears/earmuffs name = "earmuffs" desc = "Protects your hearing from loud noises, and quiet ones as well." + icon = 'icons/obj/items.dmi' icon_state = "earmuffs" item_state_slots = list(slot_r_hand_str = "earmuffs", slot_l_hand_str = "earmuffs") slot_flags = SLOT_EARS | SLOT_TWOEARS @@ -184,4 +185,4 @@ /obj/item/clothing/ears/skrell/cloth_male/lightblue name = "light blue headtail cloth" icon_state = "skrell_cloth_lblue_male" - item_state_slots = list(slot_r_hand_str = "egg2", slot_l_hand_str = "egg2") \ No newline at end of file + item_state_slots = list(slot_r_hand_str = "egg2", slot_l_hand_str = "egg2")