diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm
index e26e155054f..7f23e6ba1b7 100644
--- a/code/game/objects/effects/anomalies.dm
+++ b/code/game/objects/effects/anomalies.dm
@@ -201,7 +201,7 @@
/obj/effect/anomaly/bluespace
name = "bluespace anomaly"
- icon = 'icons/obj/projectiles.dmi'
+ icon = 'icons/obj/guns/projectiles.dmi'
icon_state = "bluespace"
density = TRUE
aSignal = /obj/item/assembly/signaler/anomaly/bluespace
diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
index 007df9cf753..25eb3efdd4f 100644
--- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm
+++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -312,7 +312,7 @@
/obj/effect/temp_visual/kinetic_blast
name = "kinetic explosion"
- icon = 'icons/obj/projectiles.dmi'
+ icon = 'icons/obj/guns/projectiles.dmi'
icon_state = "kinetic_blast"
layer = ABOVE_ALL_MOB_LAYER
duration = 4
diff --git a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm
index 6460937bfe5..379923bd7f0 100644
--- a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm
+++ b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm
@@ -1,6 +1,6 @@
/obj/effect/projectile/impact
name = "beam impact"
- icon = 'icons/obj/projectiles_impact.dmi'
+ icon = 'icons/obj/guns/projectiles_impact.dmi'
/obj/effect/projectile/impact/laser
name = "laser impact"
diff --git a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
index 57edcdf6a28..35d57e17be8 100644
--- a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
+++ b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
@@ -1,6 +1,6 @@
/obj/effect/projectile/muzzle
name = "muzzle flash"
- icon = 'icons/obj/projectiles_muzzle.dmi'
+ icon = 'icons/obj/guns/projectiles_muzzle.dmi'
/obj/effect/projectile/muzzle/laser
icon_state = "muzzle_laser"
diff --git a/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm b/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm
index 47fc591829a..b31b575c3ce 100644
--- a/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm
+++ b/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm
@@ -1,6 +1,6 @@
/obj/effect/projectile
name = "pew"
- icon = 'icons/obj/projectiles.dmi'
+ icon = 'icons/obj/guns/projectiles.dmi'
icon_state = "nothing"
layer = ABOVE_MOB_LAYER
anchored = TRUE
diff --git a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
index ed96360fffb..e5aea132e0a 100644
--- a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
+++ b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
@@ -22,7 +22,7 @@
/obj/effect/projectile/tracer
name = "beam"
- icon = 'icons/obj/projectiles_tracer.dmi'
+ icon = 'icons/obj/guns/projectiles_tracer.dmi'
/obj/effect/projectile/tracer/laser
name = "laser"
diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm
index 922b9ffc01d..aee6fcbeaa0 100644
--- a/code/game/objects/items/RCD.dm
+++ b/code/game/objects/items/RCD.dm
@@ -743,9 +743,8 @@ RLD
/obj/item/rcd_ammo
name = "compressed matter cartridge"
desc = "Highly compressed matter for the RCD."
- icon = 'icons/obj/ammo.dmi'
- icon_state = "rcd"
- inhand_icon_state = "rcdammo"
+ icon = 'icons/obj/tools.dmi'
+ icon_state = "rcdammo"
w_class = WEIGHT_CLASS_TINY
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index b2328f7901f..214c45105e3 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -161,7 +161,7 @@
//laser pointer image
icon_state = "pointer_[pointer_icon_state]"
- var/image/I = image('icons/obj/projectiles.dmi',targloc,pointer_icon_state,10)
+ var/image/I = image('icons/obj/guns/projectiles.dmi',targloc,pointer_icon_state,10)
var/list/modifiers = params2list(params)
if(modifiers)
if(LAZYACCESS(modifiers, ICON_X))
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 390d943bad9..251d6a702b5 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -549,7 +549,7 @@
. = ..()
var/obj/item/food/chewable/lollipop/S = new ammo_type(src)
color2 = S.headcolor
- var/mutable_appearance/head = mutable_appearance('icons/obj/projectiles.dmi', "lollipop_2")
+ var/mutable_appearance/head = mutable_appearance('icons/obj/guns/projectiles.dmi', "lollipop_2")
head.color = color2
add_overlay(head)
diff --git a/code/game/objects/items/shrapnel.dm b/code/game/objects/items/shrapnel.dm
index 4c7d8114e5c..cd76f2312e5 100644
--- a/code/game/objects/items/shrapnel.dm
+++ b/code/game/objects/items/shrapnel.dm
@@ -15,7 +15,7 @@
/obj/item/shrapnel/bullet // bullets
name = "bullet"
- icon = 'icons/obj/ammo.dmi'
+ icon = 'icons/obj/guns/ammo.dmi'
icon_state = "s-casing"
embedding = null // embedding vars are taken from the projectile itself
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index c88d432e5dc..ac922889034 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -238,7 +238,7 @@
/obj/item/toy/gun
name = "cap gun"
desc = "Looks almost like the real thing! Ages 8 and up. Please recycle in an autolathe when you're out of caps."
- icon = 'icons/obj/guns/projectile.dmi'
+ icon = 'icons/obj/guns/ballistic.dmi'
icon_state = "revolver"
inhand_icon_state = "gun"
worn_icon_state = "gun"
@@ -299,7 +299,7 @@
/obj/item/toy/ammo/gun
name = "capgun ammo"
desc = "Make sure to recyle the box in an autolathe when it gets empty."
- icon = 'icons/obj/ammo.dmi'
+ icon = 'icons/obj/guns/ammo.dmi'
icon_state = "357OLD-7"
w_class = WEIGHT_CLASS_TINY
custom_materials = list(/datum/material/iron=10, /datum/material/glass=10)
@@ -1544,7 +1544,7 @@
/obj/item/toy/foamfinger
name = "foam finger"
desc = "root for the home team! wait, does this station even have a sports team?"
- icon = 'icons/obj/guns/projectile.dmi'
+ icon = 'icons/obj/guns/ballistic.dmi'
icon_state = "foamfinger"
inhand_icon_state = "foamfinger_inhand"
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index 9d718e7be4f..7e4add3923c 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -805,7 +805,7 @@
if(iscultist(user))
var/static/list/spells = list(
"Bloody Halberd (150)" = image(icon = 'icons/obj/items_and_weapons.dmi', icon_state = "occultpoleaxe0"),
- "Blood Bolt Barrage (300)" = image(icon = 'icons/obj/guns/projectile.dmi', icon_state = "arcane_barrage"),
+ "Blood Bolt Barrage (300)" = image(icon = 'icons/obj/guns/ballistic.dmi', icon_state = "arcane_barrage"),
"Blood Beam (500)" = image(icon = 'icons/obj/items_and_weapons.dmi', icon_state = "disintegrate")
)
var/choice = show_radial_menu(user, src, spells, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE)
diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index 16034ab7395..f1fa34e0772 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -162,7 +162,7 @@
/obj/item/scrying
name = "scrying orb"
desc = "An incandescent orb of otherworldly energy, merely holding it gives you vision and hearing beyond mortal means, and staring into it lets you see the entire universe."
- icon = 'icons/obj/projectiles.dmi'
+ icon = 'icons/obj/guns/projectiles.dmi'
icon_state ="bluespace"
throw_speed = 3
throw_range = 7
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 5e861507023..edc0fdb7a9d 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -221,7 +221,7 @@
/obj/effect/beam/i_beam
name = "infrared beam"
- icon = 'icons/obj/projectiles.dmi'
+ icon = 'icons/obj/guns/projectiles.dmi'
icon_state = "ibeam"
anchored = TRUE
density = FALSE
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index cf9f0dd001c..8014a9df27f 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -1183,7 +1183,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
halitem.plane = ABOVE_HUD_PLANE
switch(rand(1,6))
if(1) //revolver
- halitem.icon = 'icons/obj/guns/projectile.dmi'
+ halitem.icon = 'icons/obj/guns/ballistic.dmi'
halitem.icon_state = "revolver"
halitem.name = "Revolver"
if(2) //c4
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
index 5ad18414c57..2744f15a9ed 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
@@ -56,7 +56,7 @@
/obj/effect/temp_visual/leaper_projectile_impact
name = "leaper bubble"
- icon = 'icons/obj/projectiles.dmi'
+ icon = 'icons/obj/guns/projectiles.dmi'
icon_state = "leaper_bubble_pop"
layer = ABOVE_ALL_MOB_LAYER
duration = 3
@@ -74,7 +74,7 @@
/obj/structure/leaper_bubble
name = "leaper bubble"
desc = "A floating bubble containing leaper venom. The contents are under a surprising amount of pressure."
- icon = 'icons/obj/projectiles.dmi'
+ icon = 'icons/obj/guns/projectiles.dmi'
icon_state = "leaper"
max_integrity = 10
density = FALSE
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm b/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm
index 2f602a69792..4ea56112b57 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm
@@ -67,4 +67,4 @@
item_flags = DROPDEL
flags_1 = NONE
icon_state = "tentacle_end"
- icon = 'icons/obj/projectiles.dmi'
+ icon = 'icons/obj/guns/projectiles.dmi'
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index 8bf8c97afa0..0ec8e88b01c 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -77,14 +77,14 @@
/datum/action/innate/megafauna_attack/shotgun
name = "Shotgun Fire"
- icon_icon = 'icons/obj/guns/projectile.dmi'
+ icon_icon = 'icons/obj/guns/ballistic.dmi'
button_icon_state = "shotgun"
chosen_message = "You are now firing shotgun shots where you aim."
chosen_attack_num = 3
/datum/action/innate/megafauna_attack/alternating_cardinals
name = "Alternating Shots"
- icon_icon = 'icons/obj/guns/projectile.dmi'
+ icon_icon = 'icons/obj/guns/ballistic.dmi'
button_icon_state = "pistol"
chosen_message = "You are now firing in alternating cardinal directions."
chosen_attack_num = 4
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
index 7ed341a50ef..732a47aa457 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
@@ -75,7 +75,7 @@ Difficulty: Extremely Hard
/datum/action/innate/megafauna_attack/ice_shotgun
name = "Fire Ice Shotgun"
- icon_icon = 'icons/obj/guns/projectile.dmi'
+ icon_icon = 'icons/obj/guns/ballistic.dmi'
button_icon_state = "shotgun"
chosen_message = "You are now firing shotgun ice blasts."
chosen_attack_num = 3
diff --git a/code/modules/projectiles/ammunition/_ammunition.dm b/code/modules/projectiles/ammunition/_ammunition.dm
index 3817e5ecfee..2a9288b10aa 100644
--- a/code/modules/projectiles/ammunition/_ammunition.dm
+++ b/code/modules/projectiles/ammunition/_ammunition.dm
@@ -1,7 +1,7 @@
/obj/item/ammo_casing
name = "bullet casing"
desc = "A bullet casing."
- icon = 'icons/obj/ammo.dmi'
+ icon = 'icons/obj/guns/ammo.dmi'
icon_state = "s-casing"
worn_icon_state = "bullet"
flags_1 = CONDUCT_1
diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
index db8db1c1397..d631fdb500c 100644
--- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm
+++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
@@ -2,7 +2,7 @@
/obj/item/ammo_box
name = "ammo box (null_reference_exception)"
desc = "A box of ammo."
- icon = 'icons/obj/ammo.dmi'
+ icon = 'icons/obj/guns/ammo.dmi'
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BELT
inhand_icon_state = "syringe_kit"
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 5d521353e86..fc391c8a2fd 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -5,7 +5,7 @@
/obj/item/gun
name = "gun"
desc = "It's a gun. It's pretty terrible, though."
- icon = 'icons/obj/guns/projectile.dmi'
+ icon = 'icons/obj/guns/ballistic.dmi'
icon_state = "detective"
inhand_icon_state = "gun"
worn_icon_state = "gun"
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index d0b34668f59..5d52c8e2916 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -638,7 +638,7 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
/obj/item/suppressor
name = "suppressor"
desc = "A syndicate small-arms suppressor for maximum espionage."
- icon = 'icons/obj/guns/projectile.dmi'
+ icon = 'icons/obj/guns/ballistic.dmi'
icon_state = "suppressor"
w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index b5d2e9c5083..98402c5fec1 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -71,7 +71,7 @@
/obj/item/gun/energy/laser/scatter/shotty
name = "energy shotgun"
- icon = 'icons/obj/guns/projectile.dmi'
+ icon = 'icons/obj/guns/ballistic.dmi'
icon_state = "cshotgun"
inhand_icon_state = "shotgun"
desc = "A combat shotgun gutted and refitted with an internal laser system. Can switch between taser and scattered disabler shots."
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 83817a442c8..8dc29120d10 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -291,7 +291,7 @@
name = "cyborg lmg"
desc = "An LMG that fires 3D-printed flechettes. They are slowly resupplied using the cyborg's internal power source."
icon_state = "l6_cyborg"
- icon = 'icons/obj/guns/projectile.dmi'
+ icon = 'icons/obj/guns/ballistic.dmi'
cell_type = "/obj/item/stock_parts/cell/secborg"
ammo_type = list(/obj/item/ammo_casing/energy/c3dbullet)
can_charge = FALSE
diff --git a/code/modules/projectiles/guns/misc/bow.dm b/code/modules/projectiles/guns/misc/bow.dm
index 2dcaacb4ff1..30724d81f6c 100644
--- a/code/modules/projectiles/guns/misc/bow.dm
+++ b/code/modules/projectiles/guns/misc/bow.dm
@@ -2,7 +2,7 @@
/obj/item/gun/ballistic/bow
name = "longbow"
desc = "While pretty finely crafted, surely you can find something better to use in the current year."
- icon = 'icons/obj/guns/projectile.dmi'
+ icon = 'icons/obj/guns/ballistic.dmi'
icon_state = "bow"
inhand_icon_state = "bow"
load_sound = null
diff --git a/code/modules/projectiles/guns/misc/grenade_launcher.dm b/code/modules/projectiles/guns/misc/grenade_launcher.dm
index fc1de2b0deb..2aea1a2fb0e 100644
--- a/code/modules/projectiles/guns/misc/grenade_launcher.dm
+++ b/code/modules/projectiles/guns/misc/grenade_launcher.dm
@@ -1,7 +1,7 @@
/obj/item/gun/grenadelauncher
name = "grenade launcher"
desc = "A terrible, terrible thing. It's really awful!"
- icon = 'icons/obj/guns/projectile.dmi'
+ icon = 'icons/obj/guns/ballistic.dmi'
icon_state = "riotgun"
inhand_icon_state = "riotgun"
w_class = WEIGHT_CLASS_BULKY
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index d83c40bf6a0..7a13130b4aa 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -4,7 +4,7 @@
/obj/projectile
name = "projectile"
- icon = 'icons/obj/projectiles.dmi'
+ icon = 'icons/obj/guns/projectiles.dmi'
icon_state = "bullet"
density = FALSE
anchored = TRUE
@@ -716,7 +716,7 @@
transform = matrix
if(trajectory)
trajectory.set_angle(new_angle)
-
+
var/list/coordinates = trajectory.return_coordinates()
trajectory.set_location(coordinates[1], coordinates[2], coordinates[3]) // Sets the trajectory to the center of the tile it bounced at
@@ -726,7 +726,7 @@
point_cache.initialize_location(coordinates[1], coordinates[2], coordinates[3]) // Take the center of the hitscan collision tile
store_hitscan_collision(point_cache)
return TRUE
-
+
/obj/projectile/forceMove(atom/target)
diff --git a/code/modules/projectiles/projectile/special/hallucination.dm b/code/modules/projectiles/projectile/special/hallucination.dm
index 918ce629ebc..b9b54f3718e 100644
--- a/code/modules/projectiles/projectile/special/hallucination.dm
+++ b/code/modules/projectiles/projectile/special/hallucination.dm
@@ -23,7 +23,7 @@
/obj/projectile/hallucination/fire()
..()
- fake_icon = image('icons/obj/projectiles.dmi', src, hal_icon_state, ABOVE_MOB_LAYER)
+ fake_icon = image('icons/obj/guns/projectiles.dmi', src, hal_icon_state, ABOVE_MOB_LAYER)
if(hal_target.client)
hal_target.client.images += fake_icon
diff --git a/code/modules/projectiles/projectile/special/rocket.dm b/code/modules/projectiles/projectile/special/rocket.dm
index face4dcd1e9..f50a08f6b51 100644
--- a/code/modules/projectiles/projectile/special/rocket.dm
+++ b/code/modules/projectiles/projectile/special/rocket.dm
@@ -90,7 +90,7 @@
/obj/item/broken_missile
name = "\improper broken missile"
desc = "A missile that did not detonate. The tail has snapped and it is in no way fit to be used again."
- icon = 'icons/obj/projectiles.dmi'
+ icon = 'icons/obj/guns/projectiles.dmi'
icon_state = "missile_broken"
w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 05f4baea219..5d537693bc1 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -305,7 +305,7 @@
/obj/item/reagent_containers/spray/chemsprayer
name = "chem sprayer"
desc = "A utility used to spray large amounts of reagents in a given area."
- icon = 'icons/obj/guns/projectile.dmi'
+ icon = 'icons/obj/guns/ballistic.dmi'
icon_state = "chemsprayer"
inhand_icon_state = "chemsprayer"
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
diff --git a/code/modules/spells/spell_types/lichdom.dm b/code/modules/spells/spell_types/lichdom.dm
index 76739d03321..ddce7ca10f3 100644
--- a/code/modules/spells/spell_types/lichdom.dm
+++ b/code/modules/spells/spell_types/lichdom.dm
@@ -75,7 +75,7 @@
/obj/item/phylactery
name = "phylactery"
desc = "Stores souls. Revives liches. Also repels mosquitos."
- icon = 'icons/obj/projectiles.dmi'
+ icon = 'icons/obj/guns/projectiles.dmi'
icon_state = "bluespace"
color = COLOR_VERY_DARK_LIME_GREEN
light_system = MOVABLE_LIGHT
diff --git a/code/modules/spells/spell_types/projectile.dm b/code/modules/spells/spell_types/projectile.dm
index 8441365eeac..a929bbf20d0 100644
--- a/code/modules/spells/spell_types/projectile.dm
+++ b/code/modules/spells/spell_types/projectile.dm
@@ -65,7 +65,7 @@
var/update_projectile = FALSE //So you want to admin abuse magic bullets ? This is for you
//Below only apply if update_projectile is true
- var/proj_icon = 'icons/obj/projectiles.dmi'
+ var/proj_icon = 'icons/obj/guns/projectiles.dmi'
var/proj_icon_state = "spell"
var/proj_name = "a spell projectile"
var/proj_trail = FALSE //if it leaves a trail
diff --git a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm
index 1e81db60e5a..8872115aa8e 100644
--- a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm
+++ b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm
@@ -259,7 +259,7 @@
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun
name = "exosuit syringe gun"
desc = "Equipment for medical exosuits. A chem synthesizer with syringe gun. Reagents inside are held in stasis, so no reactions will occur."
- icon = 'icons/obj/guns/projectile.dmi'
+ icon = 'icons/obj/guns/ballistic.dmi'
icon_state = "syringegun"
range = MECHA_MELEE|MECHA_RANGED
equip_cooldown = 10
diff --git a/code/modules/vehicles/mecha/mecha_wreckage.dm b/code/modules/vehicles/mecha/mecha_wreckage.dm
index 9e5d5703722..5d7f776c466 100644
--- a/code/modules/vehicles/mecha/mecha_wreckage.dm
+++ b/code/modules/vehicles/mecha/mecha_wreckage.dm
@@ -34,7 +34,7 @@
AI.apply_damage(150, BURN) //Give the AI a bit of damage from the "shock" of being suddenly shut down
INVOKE_ASYNC(AI, /mob/living/silicon.proc/death) //The damage is not enough to kill the AI, but to be 'corrupted files' in need of repair.
AI.forceMove(src) //Put the dead AI inside the wreckage for recovery
- add_overlay(mutable_appearance('icons/obj/projectiles.dmi', "green_laser")) //Overlay for the recovery beacon
+ add_overlay(mutable_appearance('icons/obj/guns/projectiles.dmi', "green_laser")) //Overlay for the recovery beacon
AI.controlled_mech = null
AI.remote_control = null
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
deleted file mode 100644
index f0789296895..00000000000
Binary files a/icons/obj/ammo.dmi and /dev/null differ
diff --git a/icons/obj/guns/ammo.dmi b/icons/obj/guns/ammo.dmi
new file mode 100644
index 00000000000..887c7730dd6
Binary files /dev/null and b/icons/obj/guns/ammo.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/ballistic.dmi
similarity index 100%
rename from icons/obj/guns/projectile.dmi
rename to icons/obj/guns/ballistic.dmi
diff --git a/icons/obj/projectiles.dmi b/icons/obj/guns/projectiles.dmi
similarity index 100%
rename from icons/obj/projectiles.dmi
rename to icons/obj/guns/projectiles.dmi
diff --git a/icons/obj/projectiles_impact.dmi b/icons/obj/guns/projectiles_impact.dmi
similarity index 100%
rename from icons/obj/projectiles_impact.dmi
rename to icons/obj/guns/projectiles_impact.dmi
diff --git a/icons/obj/projectiles_muzzle.dmi b/icons/obj/guns/projectiles_muzzle.dmi
similarity index 100%
rename from icons/obj/projectiles_muzzle.dmi
rename to icons/obj/guns/projectiles_muzzle.dmi
diff --git a/icons/obj/projectiles_tracer.dmi b/icons/obj/guns/projectiles_tracer.dmi
similarity index 100%
rename from icons/obj/projectiles_tracer.dmi
rename to icons/obj/guns/projectiles_tracer.dmi
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index 7eb3b82c7f0..6cf14bcc3e2 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ