From 3254fcf53531e0cd713724117fa364db02adaf66 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sat, 26 Aug 2017 18:43:57 -0700 Subject: [PATCH] goddamnit_again (#2511) --- code/citadel/cit_genemods.dm | 2 +- code/datums/action.dm | 4 ++-- code/datums/martial/sleeping_carp.dm | 2 +- code/datums/riding.dm | 2 +- code/datums/riding.dm.rej | 2 +- code/game/gamemodes/changeling/powers/mutations.dm | 6 +++--- code/game/gamemodes/miniantags/borer/borer.dm | 2 +- code/game/gamemodes/wizard/artefact.dm | 2 +- code/game/objects/effects/mines.dm | 2 +- code/game/objects/effects/misc.dm | 2 +- code/game/objects/items.dm | 2 +- code/game/objects/items/blueprints.dm | 6 +++--- code/game/objects/items/charter.dm | 2 +- code/game/objects/items/cosmetics.dm | 4 ++-- code/game/objects/items/courtroom.dm | 4 ++-- code/game/objects/items/defib.dm | 8 ++++---- code/game/objects/items/dna_injector.dm | 2 +- code/game/objects/items/extinguisher.dm | 2 +- code/game/objects/items/handcuffs.dm | 4 ++-- code/game/objects/items/his_grace.dm | 2 +- code/game/objects/items/holy_weapons.dm | 2 +- code/game/objects/items/implants/implantcase.dm | 2 +- code/game/objects/items/implants/implanter.dm | 2 +- code/game/objects/items/implants/implantpad.dm | 2 +- code/game/objects/items/melee/misc.dm | 8 ++++---- code/game/objects/items/miscellaneous.dm | 2 +- code/game/objects/items/paint.dm | 2 +- code/game/objects/items/religion.dm | 2 +- code/game/objects/items/shields.dm | 6 +++--- code/game/objects/items/stacks/medical.dm | 2 +- code/game/objects/items/stacks/sheets/mineral.dm | 4 ++-- code/game/objects/items/stacks/sheets/sheet_types.dm | 6 +++--- code/game/objects/items/stacks/wrap.dm | 6 +++--- code/game/objects/items/toys.dm | 8 ++++---- code/game/objects/items/weaponry.dm | 12 ++++++------ code/game/objects/structures/manned_turret.dm | 2 +- code/game/objects/structures/tables_racks.dm | 2 +- code/game/objects/structures/watercloset.dm | 2 +- code/game/objects/weapons.dm | 2 +- code/modules/admin/fun_balloon.dm | 6 +++--- code/modules/assembly/flash.dm | 2 +- code/modules/awaymissions/capture_the_flag.dm | 4 ++-- code/modules/flufftext/Hallucination.dm | 4 ++-- code/modules/holodeck/items.dm | 2 +- code/modules/hydroponics/grown/nettle.dm | 2 +- code/modules/hydroponics/hydroitemdefines.dm | 4 ++-- code/modules/library/soapstone.dm | 2 +- code/modules/mapping/ruins.dm | 2 +- .../mob/living/carbon/human/species_types/golems.dm | 2 +- .../modules/mob/living/simple_animal/hostile/bear.dm | 2 +- code/modules/paperwork/photocopier.dm | 2 +- code/modules/paperwork/photography.dm | 12 ++++++------ code/modules/reagents/reagent_containers/spray.dm | 2 +- code/modules/spells/spell_types/godhand.dm | 2 +- 54 files changed, 93 insertions(+), 93 deletions(-) diff --git a/code/citadel/cit_genemods.dm b/code/citadel/cit_genemods.dm index 01027f5d87..2d6b027db6 100644 --- a/code/citadel/cit_genemods.dm +++ b/code/citadel/cit_genemods.dm @@ -3,7 +3,7 @@ /obj/item/genemod name = "genetic modifier" desc = "Microbodies which can grow, morph, or otherwise change an organism into something else." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "dnainjector" throw_speed = 3 throw_range = 5 diff --git a/code/datums/action.dm b/code/datums/action.dm index 5b3a5994cd..10cb2a239f 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -431,7 +431,7 @@ name = "Create Throwing Stars (1E)" desc = "Creates some throwing stars" button_icon_state = "throwingstar" - icon_icon = 'icons/obj/weapons.dmi' + icon_icon = 'icons/obj/items_and_weapons.dmi' /datum/action/item_action/ninjanet name = "Energy Net (20E)" @@ -443,7 +443,7 @@ name = "Recall Energy Katana (Variable Cost)" desc = "Teleports the Energy Katana linked to this suit to its wearer, cost based on distance." button_icon_state = "energy_katana" - icon_icon = 'icons/obj/weapons.dmi' + icon_icon = 'icons/obj/items_and_weapons.dmi' /datum/action/item_action/ninja_stealth name = "Toggle Stealth" diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 469bbb94e8..ac5083cc17 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -184,7 +184,7 @@ throwforce = 20 throw_speed = 2 attack_verb = list("smashed", "slammed", "whacked", "thwacked") - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "bostaff0" lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' diff --git a/code/datums/riding.dm b/code/datums/riding.dm index 94e78304ee..6734221773 100644 --- a/code/datums/riding.dm +++ b/code/datums/riding.dm @@ -416,7 +416,7 @@ /obj/item/riding_offhand name = "offhand" - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "offhand" w_class = WEIGHT_CLASS_HUGE flags_1 = ABSTRACT_1 | DROPDEL_1 | NOBLUDGEON_1 diff --git a/code/datums/riding.dm.rej b/code/datums/riding.dm.rej index 4be01081b1..8fe1b7d2d9 100644 --- a/code/datums/riding.dm.rej +++ b/code/datums/riding.dm.rej @@ -1,6 +1,6 @@ diff a/code/datums/riding.dm b/code/datums/riding.dm (rejected hunks) @@ -419,7 +419,7 @@ - icon = 'icons/obj/items_and_weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi.dmi' icon_state = "offhand" w_class = WEIGHT_CLASS_HUGE - flags = ABSTRACT | DROPDEL | NOBLUDGEON diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index dc290b8fa9..443720fefc 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -143,7 +143,7 @@ /obj/item/melee/arm_blade name = "arm blade" desc = "A grotesque blade made out of bone and flesh that cleaves through people as a hot knife through butter." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "arm_blade" item_state = "arm_blade" lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi' @@ -222,7 +222,7 @@ /obj/item/gun/magic/tentacle name = "tentacle" desc = "A fleshy tentacle that can stretch out and grab things or people." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "tentacle" item_state = "tentacle" lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi' @@ -396,7 +396,7 @@ name = "shield-like mass" desc = "A mass of tough, boney tissue. You can still see the fingers as a twisted pattern in the shield." flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1 - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "ling_shield" lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi' righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi' diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index 2b83017d1d..aaeee27985 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -1093,7 +1093,7 @@ GLOBAL_VAR_INIT(total_borer_hosts_needed, 10) /datum/action/innate/borer/jumpstart_host name = "Jumpstart Host" desc = "Bring your host back to life." - icon_icon = 'icons/obj/weapons.dmi' + icon_icon = 'icons/obj/items_and_weapons.dmi' button_icon_state = "defibpaddles0" /datum/action/innate/borer/jumpstart_host/Activate() diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 3f7ed4e598..59e4db9893 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -202,7 +202,7 @@ /obj/item/multisword name = "multiverse sword" desc = "A weapon capable of conquering the universe and beyond. Activate it to summon copies of yourself from others dimensions to fight by your side." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "multiverse" item_state = "multiverse" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 3a10578543..15a2397497 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -3,7 +3,7 @@ desc = "Better stay away from that thing." density = FALSE anchored = TRUE - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "uglymine" var/triggered = 0 diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm index 448f3cf815..f8ca514995 100644 --- a/code/game/objects/effects/misc.dm +++ b/code/game/objects/effects/misc.dm @@ -2,7 +2,7 @@ /obj/effect/spresent name = "strange present" desc = "It's a ... present?" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "strangepresent" density = TRUE anchored = FALSE diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 586a8d5575..f1dde24690 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -6,7 +6,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) /obj/item name = "item" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' var/item_state = null var/lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' var/righthand_file = 'icons/mob/inhands/items_righthand.dmi' diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 240c9c7b67..cd63cb0951 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -15,7 +15,7 @@ /obj/item/areaeditor name = "area modification item" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "blueprints" attack_verb = list("attacked", "bapped", "hit") var/fluffnotice = "Nobody's gonna read this stuff!" @@ -49,7 +49,7 @@ /obj/item/areaeditor/blueprints name = "station blueprints" desc = "Blueprints of the station. There is a \"Classified\" stamp and several coffee stains on it." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "blueprints" fluffnotice = "Property of Nanotrasen. For heads of staff only. Store in high-secure storage." resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF @@ -361,6 +361,6 @@ /obj/item/areaeditor/blueprints/cyborg name = "station schematics" desc = "A digital copy of the station blueprints stored in your memory." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "blueprints" fluffnotice = "Intellectual Property of Nanotrasen. For use in engineering cyborgs only. Wipe from memory upon departure from the station." diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm index cf49c7dfa7..d5134f729c 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/charter.dm @@ -96,7 +96,7 @@ /obj/item/station_charter/flag name = "nanotrasen banner" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' name_type = "planet" icon_state = "banner" item_state = "banner" diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index dab8ca6a91..4f2c1a620a 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -2,7 +2,7 @@ gender = PLURAL name = "red lipstick" desc = "A generic brand of lipstick." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "lipstick" w_class = WEIGHT_CLASS_TINY var/colour = "red" @@ -105,7 +105,7 @@ /obj/item/razor name = "electric razor" desc = "The latest and greatest power razor born from the science of shaving." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "razor" flags_1 = CONDUCT_1 w_class = WEIGHT_CLASS_TINY diff --git a/code/game/objects/items/courtroom.dm b/code/game/objects/items/courtroom.dm index 0c94046251..c0e81ed3d5 100644 --- a/code/game/objects/items/courtroom.dm +++ b/code/game/objects/items/courtroom.dm @@ -5,7 +5,7 @@ /obj/item/gavelhammer name = "gavel hammer" desc = "Order, order! No bombs in my courthouse." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "gavelhammer" force = 5 throwforce = 6 @@ -21,7 +21,7 @@ /obj/item/gavelblock name = "gavel block" desc = "Smack it with a gavel hammer when the assistants get rowdy." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "gavelblock" force = 2 throwforce = 2 diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 04634c55d8..169c464bc0 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -4,7 +4,7 @@ /obj/item/defibrillator name = "defibrillator" desc = "A device that delivers powerful shocks to detachable paddles that resuscitate incapacitated patients." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "defibunit" item_state = "defibunit" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' @@ -272,7 +272,7 @@ /obj/item/twohanded/shockpaddles name = "defibrillator paddles" desc = "A pair of plastic-gripped paddles with flat metal surfaces that are used to deliver powerful electric shocks." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "defibpaddles" item_state = "defibpaddles" force = 0 @@ -570,7 +570,7 @@ /obj/item/twohanded/shockpaddles/cyborg name = "cyborg defibrillator paddles" - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "defibpaddles0" item_state = "defibpaddles0" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' @@ -593,7 +593,7 @@ name = "syndicate defibrillator paddles" desc = "A pair of paddles used to revive deceased operatives. It possesses both the ability to penetrate armor and to deliver powerful shocks offensively." combat = TRUE - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "defibpaddles0" item_state = "defibpaddles0" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm index 2e211d1acc..b5c7c1ddce 100644 --- a/code/game/objects/items/dna_injector.dm +++ b/code/game/objects/items/dna_injector.dm @@ -1,7 +1,7 @@ /obj/item/dnainjector name = "\improper DNA injector" desc = "This injects the person with DNA." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "dnainjector" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index e16dc2eccc..05ef0220de 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -1,7 +1,7 @@ /obj/item/extinguisher name = "fire extinguisher" desc = "A traditional red fire extinguisher." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "fire_extinguisher0" item_state = "fire_extinguisher" hitsound = 'sound/weapons/smash.ogg' diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index fe82479022..bf5cf0417c 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -7,7 +7,7 @@ name = "handcuffs" desc = "Use this to keep prisoners in line." gender = PLURAL - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "handcuff" lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' @@ -231,7 +231,7 @@ name = "leg cuffs" desc = "Use this to keep prisoners in line." gender = PLURAL - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "handcuff" lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index a5563e6d4f..3621a893e9 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -9,7 +9,7 @@ desc = "A toolbox painted bright green. Looking at it makes you feel uneasy." icon_state = "his_grace" item_state = "artistic_toolbox" - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' w_class = WEIGHT_CLASS_GIGANTIC origin_tech = "combat=4;engineering=4;syndicate=2" force = 12 diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index fe42fab23c..6d377cdcc5 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -354,7 +354,7 @@ sharpness = IS_BLUNT hitsound = "swing_hit" attack_verb = list("smashed", "slammed", "whacked", "thwacked") - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "bostaff0" item_state = "bostaff0" lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' diff --git a/code/game/objects/items/implants/implantcase.dm b/code/game/objects/items/implants/implantcase.dm index 99bf1e2fe3..08681ac9e4 100644 --- a/code/game/objects/items/implants/implantcase.dm +++ b/code/game/objects/items/implants/implantcase.dm @@ -1,7 +1,7 @@ /obj/item/implantcase name = "implant case" desc = "A glass case containing an implant." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "implantcase-0" item_state = "implantcase" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' diff --git a/code/game/objects/items/implants/implanter.dm b/code/game/objects/items/implants/implanter.dm index 7a6a8ca2a9..24b1928dbc 100644 --- a/code/game/objects/items/implants/implanter.dm +++ b/code/game/objects/items/implants/implanter.dm @@ -1,7 +1,7 @@ /obj/item/implanter name = "implanter" desc = "A sterile automatic implant injector." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "implanter0" item_state = "syringe_0" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' diff --git a/code/game/objects/items/implants/implantpad.dm b/code/game/objects/items/implants/implantpad.dm index 3d73e208ee..cec3deeead 100644 --- a/code/game/objects/items/implants/implantpad.dm +++ b/code/game/objects/items/implants/implantpad.dm @@ -1,7 +1,7 @@ /obj/item/implantpad name = "implantpad" desc = "Used to modify implants." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "implantpad-0" item_state = "electronic" lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 658d2213bb..d2e1491937 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -33,7 +33,7 @@ /obj/item/melee/synthetic_arm_blade name = "synthetic arm blade" desc = "A grotesque blade that on closer inspection seems made of synthentic flesh, it still feels like it would hurt very badly as a weapon." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "arm_blade" item_state = "arm_blade" origin_tech = "combat=5;biotech=5" @@ -84,7 +84,7 @@ /obj/item/melee/classic_baton name = "police baton" desc = "A wooden truncheon for beating criminal scum." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "baton" item_state = "classic_baton" lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' @@ -142,7 +142,7 @@ /obj/item/melee/classic_baton/telescopic name = "telescopic baton" desc = "A compact yet robust personal defense weapon. Can be concealed when folded." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "telebaton_0" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' @@ -195,7 +195,7 @@ /obj/item/melee/supermatter_sword name = "supermatter sword" desc = "In a station full of bad ideas, this might just be the worst." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "supermatter_sword" item_state = "supermatter_sword" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index 50bf184945..9837936e5f 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/code/game/objects/items/miscellaneous.dm @@ -15,7 +15,7 @@ /obj/item/skub desc = "It's skub." name = "skub" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "skub" w_class = WEIGHT_CLASS_BULKY attack_verb = list("skubbed") diff --git a/code/game/objects/items/paint.dm b/code/game/objects/items/paint.dm index 519674effc..5e43d0fc5c 100644 --- a/code/game/objects/items/paint.dm +++ b/code/game/objects/items/paint.dm @@ -5,7 +5,7 @@ gender= PLURAL name = "paint" desc = "Used to recolor floors and walls. Can be removed by the janitor." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "paint_neutral" item_color = "FFFFFF" item_state = "paintcan" diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index fc18f8632a..1edbba1f56 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -1,6 +1,6 @@ /obj/item/banner name = "banner" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "banner" item_state = "banner" lefthand_file = 'icons/mob/inhands/equipment/banners_lefthand.dmi' diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index d09a867a77..83e8715c54 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -6,7 +6,7 @@ /obj/item/shield/riot name = "riot shield" desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "riot" lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' @@ -61,7 +61,7 @@ /obj/item/shield/energy name = "energy combat shield" desc = "A shield capable of stopping most melee attacks. Protects user from almost all energy projectiles. It can be retracted, expanded, and stored anywhere." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "eshield0" // eshield1 for expanded lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' @@ -106,7 +106,7 @@ /obj/item/shield/riot/tele name = "telescopic shield" desc = "An advanced riot shield made of lightweight materials that collapses for easy storage." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "teleriot0" lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 945d47ee80..92da7f52e7 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -1,7 +1,7 @@ /obj/item/stack/medical name = "medical pack" singular_name = "medical pack" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' amount = 6 max_amount = 6 w_class = WEIGHT_CLASS_TINY diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 1c665f4e24..8056674074 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -63,7 +63,7 @@ GLOBAL_LIST_INIT(sandstone_recipes, list ( \ /obj/item/stack/sheet/mineral/sandbags name = "sandbags" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "sandbags" singular_name = "sandbag" layer = LOW_ITEM_LAYER @@ -81,7 +81,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \ /obj/item/emptysandbag name = "empty sandbag" desc = "A bag to be filled with sand." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "sandbag" w_class = WEIGHT_CLASS_TINY diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index cb61eefa51..5d87c4b38e 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -159,7 +159,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ desc = "One can only guess that this is a bunch of wood." singular_name = "wood plank" icon_state = "sheet-wood" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' origin_tech = "materials=1;biotech=1" sheettype = "wood" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 0) @@ -270,7 +270,7 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \ desc = "Sheets of cold metal with shifting inscriptions writ upon them." singular_name = "runed metal sheet" icon_state = "sheet-runed" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' sheettype = "runed" merge_type = /obj/item/stack/sheet/runed_metal novariants = TRUE @@ -321,7 +321,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ desc = "Sheets made out of brass." singular_name = "brass sheet" icon_state = "sheet-brass" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' resistance_flags = FIRE_PROOF | ACID_PROOF throwforce = 10 max_amount = 50 diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm index 9d25a49314..8d42b97e95 100644 --- a/code/game/objects/items/stacks/wrap.dm +++ b/code/game/objects/items/stacks/wrap.dm @@ -7,7 +7,7 @@ /obj/item/stack/wrapping_paper name = "wrapping paper" desc = "Wrap packages with this festive paper to make gifts." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "wrap_paper" flags_1 = NOBLUDGEON_1 amount = 25 @@ -28,7 +28,7 @@ /obj/item/stack/packageWrap name = "package wrapper" desc = "You can use this to wrap items in." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "deliveryPaper" flags_1 = NOBLUDGEON_1 amount = 25 @@ -109,7 +109,7 @@ /obj/item/c_tube name = "cardboard tube" desc = "A tube... of cardboard." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "c_tube" throwforce = 0 w_class = WEIGHT_CLASS_TINY diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index f71b1930cd..648047ab62 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -112,7 +112,7 @@ throw_speed = 3 throw_range = 7 force = 0 - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "syndballoon" item_state = "syndballoon" lefthand_file = 'icons/mob/inhands/antag/balloons_lefthand.dmi' @@ -211,7 +211,7 @@ /obj/item/toy/sword name = "toy sword" desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "sword0" item_state = "sword0" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' @@ -289,7 +289,7 @@ icon_state = "his_grace" item_state = "artistic_toolbox" var/active = FALSE - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' attack_verb = list("robusted") /obj/item/toy/windupToolbox/attack_self(mob/user) @@ -329,7 +329,7 @@ /obj/item/toy/katana name = "replica katana" desc = "Woefully underpowered in D20." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "katana" item_state = "katana" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 1cfce9fb90..e44a1b89f9 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -1,7 +1,7 @@ /obj/item/banhammer desc = "A banhammer" name = "banhammer" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "toyhammer" slot_flags = SLOT_BELT throwforce = 0 @@ -317,7 +317,7 @@ /obj/item/phone name = "red phone" desc = "Should anything ever go wrong..." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "red_phone" force = 3 throwforce = 2 @@ -337,7 +337,7 @@ /obj/item/cane name = "cane" desc = "A cane used by a true gentleman. Or a clown." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "cane" item_state = "stick" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' @@ -374,7 +374,7 @@ /obj/item/staff/stick name = "stick" desc = "A great tool to drag someone else's drinks across the bar." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "stick" item_state = "stick" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' @@ -475,7 +475,7 @@ /obj/item/melee/baseball_bat name = "baseball bat" desc = "There ain't a skull in the league that can withstand a swatter." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "baseball_bat" item_state = "baseball_bat" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' @@ -540,7 +540,7 @@ /obj/item/melee/flyswatter name = "flyswatter" desc = "Useful for killing insects of all sizes." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "flyswatter" item_state = "flyswatter" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' diff --git a/code/game/objects/structures/manned_turret.dm b/code/game/objects/structures/manned_turret.dm index 76b3a4059e..e15a655a63 100644 --- a/code/game/objects/structures/manned_turret.dm +++ b/code/game/objects/structures/manned_turret.dm @@ -176,7 +176,7 @@ /obj/item/gun_control name = "turret controls" - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "offhand" w_class = WEIGHT_CLASS_HUGE flags_1 = ABSTRACT_1 | NODROP_1 | NOBLUDGEON_1 | DROPDEL_1 diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 6eb54dba0f..dda1514276 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -480,7 +480,7 @@ /obj/item/rack_parts name = "rack parts" desc = "Parts of a rack." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "rack_parts" flags_1 = CONDUCT_1 materials = list(MAT_METAL=2000) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 2dc5a57cf6..ea1f1f5214 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -184,7 +184,7 @@ /obj/item/reagent_containers/food/urinalcake name = "urinal cake" desc = "The noble urinal cake, protecting the station's pipes from the station's pee. Do not eat." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "urinalcake" w_class = WEIGHT_CLASS_TINY list_reagents = list("chlorine" = 3, "ammonia" = 1) diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm index 29d84dd247..e4d0a73b5b 100644 --- a/code/game/objects/weapons.dm +++ b/code/game/objects/weapons.dm @@ -1,6 +1,6 @@ /obj/item/weapon name = "weapon" - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' /obj/item/Initialize() . = ..() diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm index dd974fe717..1872b98ffa 100644 --- a/code/modules/admin/fun_balloon.dm +++ b/code/modules/admin/fun_balloon.dm @@ -1,7 +1,7 @@ /obj/effect/fun_balloon name = "fun balloon" desc = "This is going to be a laugh riot." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "syndballoon" anchored = TRUE var/popped = FALSE @@ -86,7 +86,7 @@ /obj/effect/station_crash name = "station crash" desc = "With no survivors!" - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "syndballoon" anchored = TRUE @@ -105,7 +105,7 @@ /obj/effect/shuttle_build name = "shuttle_build" desc = "Some assembly required" - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "syndballoon" anchored = TRUE diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index f48e2a321c..2dd7b71cc5 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -224,7 +224,7 @@ /obj/item/device/assembly/flash/shield name = "strobe shield" desc = "A shield with a built in, high intensity light capable of blinding and disorienting suspects. Takes regular handheld flashes as bulbs." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "flashshield" item_state = "flashshield" lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index c914fd5c8f..6d36f5f140 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -10,7 +10,7 @@ /obj/item/twohanded/ctf name = "banner" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "banner" item_state = "banner" lefthand_file = 'icons/mob/inhands/equipment/banners_lefthand.dmi' @@ -100,7 +100,7 @@ /obj/effect/ctf/flag_reset name = "banner landmark" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "banner" desc = "This is where a banner with Nanotrasen's logo on it would go." layer = LOW_ITEM_LAYER diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 3ea6505a61..0bac8e36ff 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -983,11 +983,11 @@ GLOBAL_LIST_INIT(hallucinations_major, list( if(prob(25)) target.halitem.icon_state = "plasticx40" if(3) //sword - target.halitem.icon = 'icons/obj/weapons.dmi' + target.halitem.icon = 'icons/obj/items_and_weapons.dmi' target.halitem.icon_state = "sword0" target.halitem.name = "Energy Sword" if(4) //stun baton - target.halitem.icon = 'icons/obj/weapons.dmi' + target.halitem.icon = 'icons/obj/items_and_weapons.dmi' target.halitem.icon_state = "stunbaton" target.halitem.name = "Stun Baton" if(5) //emag diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm index 6514b86910..8dfbfa7c63 100644 --- a/code/modules/holodeck/items.dm +++ b/code/modules/holodeck/items.dm @@ -68,7 +68,7 @@ /obj/item/toy/beach_ball/holoball name = "basketball" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "basketball" item_state = "basketball" desc = "Here's your chance, do your dance at the Space Jam." diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm index b3bd3ccee0..ba56219062 100644 --- a/code/modules/hydroponics/grown/nettle.dm +++ b/code/modules/hydroponics/grown/nettle.dm @@ -31,7 +31,7 @@ /obj/item/grown/nettle //abstract type name = "nettle" desc = "It's probably not wise to touch it with bare hands..." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "nettle" lefthand_file = 'icons/mob/inhands/weapons/plants_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/plants_righthand.dmi' diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index c721643f80..35e1df3bab 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -65,7 +65,7 @@ /obj/item/cultivator name = "cultivator" desc = "It's used for removing weeds or scratching your back." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "cultivator" item_state = "cultivator" lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi' @@ -82,7 +82,7 @@ /obj/item/hatchet name = "hatchet" desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "hatchet" item_state = "hatchet" lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi' diff --git a/code/modules/library/soapstone.dm b/code/modules/library/soapstone.dm index cd069ec44d..ab78b582a6 100644 --- a/code/modules/library/soapstone.dm +++ b/code/modules/library/soapstone.dm @@ -1,7 +1,7 @@ /obj/item/soapstone name = "soapstone" desc = "Leave informative messages for the crew, including the crew of future shifts!\nEven if out of uses, it can still be used to remove messages.\n(Not suitable for engraving on shuttles, off station or on cats. Side effects may include prompt beatings, psychotic clown incursions, and/or orbital bombardment.)" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "soapstone" throw_speed = 3 throw_range = 5 diff --git a/code/modules/mapping/ruins.dm b/code/modules/mapping/ruins.dm index abaf596f65..930f83813a 100644 --- a/code/modules/mapping/ruins.dm +++ b/code/modules/mapping/ruins.dm @@ -77,7 +77,7 @@ /obj/effect/ruin_loader name = "random ruin" - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "syndballoon" invisibility = 0 diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index f564e3f300..14726df76a 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -628,7 +628,7 @@ desc = "It emits a strange aura, as if there was still life within it..." max_integrity = 50 armor = list(melee = 90, bullet = 90, laser = 25, energy = 80, bomb = 50, bio = 100, fire = -50, acid = -50) - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "pile_bandages" resistance_flags = FLAMMABLE diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index f0ea9c1b52..1c92b6233d 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -77,7 +77,7 @@ name = "pile of bear armor" desc = "A scattered pile of various shaped armor pieces fitted for a bear, some duct tape, and a nail filer. Crude instructions \ are written on the back of one of the plates in russian. This seems like an awful idea." - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "bear_armor_upgrade" /obj/item/bear_armor/afterattack(atom/target, mob/user, proximity_flag) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 98f67618fc..0dcd5d09a0 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -168,7 +168,7 @@ p.pixel_y = rand(-10, 10) p.img = temp_img var/icon/small_img = icon(temp_img) //Icon() is needed or else temp_img will be rescaled too >.> - var/icon/ic = icon('icons/obj/items.dmi',"photo") + var/icon/ic = icon('icons/obj/items_and_weapons.dmi',"photo") small_img.Scale(8, 8) ic.Blend(small_img,ICON_OVERLAY, 13, 13) p.icon = ic diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index ea1db5cfd4..f6b39514b2 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -13,7 +13,7 @@ */ /obj/item/device/camera_film name = "film cartridge" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' desc = "A camera film cartridge. Insert it into a camera to reload it." icon_state = "film" item_state = "electropack" @@ -25,7 +25,7 @@ */ /obj/item/photo name = "photo" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "photo" item_state = "paper" w_class = WEIGHT_CLASS_TINY @@ -91,7 +91,7 @@ */ /obj/item/storage/photo_album name = "photo album" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "album" item_state = "briefcase" lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi' @@ -104,7 +104,7 @@ */ /obj/item/device/camera name = "camera" - icon = 'icons/obj/items.dmi' + icon = 'icons/obj/items_and_weapons.dmi' desc = "A polaroid camera." icon_state = "camera" item_state = "electropack" @@ -311,7 +311,7 @@ if(in_range(src, user)) //needed because of TK user.put_in_hands(P) var/icon/small_img = icon(temp) - var/icon/ic = icon('icons/obj/items.dmi',"photo") + var/icon/ic = icon('icons/obj/items_and_weapons.dmi',"photo") small_img.Scale(8, 8) ic.Blend(small_img,ICON_OVERLAY, 13, 13) P.icon = ic @@ -328,7 +328,7 @@ /obj/item/device/camera/proc/aipicture(mob/user, icon/temp, mobs, isAi) //instead of printing a picture like a regular camera would, we do this instead for the AI var/icon/small_img = icon(temp) - var/icon/ic = icon('icons/obj/items.dmi',"photo") + var/icon/ic = icon('icons/obj/items_and_weapons.dmi',"photo") small_img.Scale(8, 8) ic.Blend(small_img,ICON_OVERLAY, 13, 13) var/icon = ic diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 504fcc079f..9d7579c9dc 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -167,7 +167,7 @@ /obj/item/reagent_containers/spray/pepper name = "pepperspray" desc = "Manufactured by UhangInc, used to blind and down an opponent quickly." - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "pepperspray" item_state = "pepperspray" lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm index 5ebcca7549..455f5ef165 100644 --- a/code/modules/spells/spell_types/godhand.dm +++ b/code/modules/spells/spell_types/godhand.dm @@ -4,7 +4,7 @@ var/catchphrase = "High Five!" var/on_use_sound = null var/obj/effect/proc_holder/spell/targeted/touch/attached_spell - icon = 'icons/obj/weapons.dmi' + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "syndballoon" item_state = null flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1