Fixes merge conflicts from my big ass melee pr

_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm

@@ -1458,7 +1458,7 @@
 /turf/open/floor/plasteel/mono,
 /area/ruin/beach/complex)
 "wV" = (
-/obj/item/kitchen/knife/hunting{
+/obj/item/melee/knife/hunting{
 	name = "machete";
 	pixel_y = 8;
 	desc = "Space vines HATE this one simple trick!"

_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm

@@ -1232,7 +1232,7 @@
 /obj/machinery/atmospherics/components/unary/passive_vent{
 	dir = 1
 	},
-/obj/item/fireaxe{
+/obj/item/melee/axe/fire{
 	name = "rusty fire axe"
 	},
 /turf/open/floor/engine/airless,

_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm

@@ -204,7 +204,7 @@
 /obj/structure/closet/cabinet,
 /obj/item/pneumatic_cannon/speargun,
 /obj/item/storage/backpack/magspear_quiver,
-/obj/item/kitchen/knife/hunting,
+/obj/item/melee/knife/hunting,
 /turf/open/floor/wood,
 /area/ruin/beach)
 "kr" = (
@@ -529,7 +529,7 @@
 	dir = 6
 	},
 /obj/structure/table/reinforced,
-/obj/item/kitchen/knife/butcher,
+/obj/item/melee/knife/butcher,
 /turf/open/floor/plastic,
 /area/ruin/beach)
 "wg" = (
@@ -1032,7 +1032,7 @@
 "Os" = (
 /obj/structure/table/wood/reinforced,
 /obj/effect/turf_decal/corner/opaque/pink/diagonal,
-/obj/item/kitchen/knife{
+/obj/item/melee/knife/kitchen{
 	pixel_y = 12;
 	pixel_x = 9
 	},
@@ -1052,7 +1052,7 @@
 /obj/structure/closet/cabinet,
 /obj/item/pneumatic_cannon/speargun,
 /obj/item/storage/backpack/magspear_quiver,
-/obj/item/kitchen/knife/hunting,
+/obj/item/melee/knife/hunting,
 /obj/machinery/light/small/directional/east{
 	light_color = "#d8b1b1"
 	},
@@ -1244,7 +1244,6 @@
 /turf/open/water/beach/deep,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Vt" = (
-/obj/item/nullrod/carp,
 /obj/structure/bed/dogbed,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood/walnut,

_maps/RandomRuins/BeachRuins/beach_float_resort.dmm

@@ -193,7 +193,7 @@
 /turf/open/water/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "eZ" = (
-/obj/item/melee/roastingstick,
+/obj/item/roastingstick,
 /turf/open/floor/wood{
 	light_range = 2
 	},

_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm

@@ -1628,7 +1628,7 @@
 /obj/effect/turf_decal/weather/sand{
 	dir = 5
 	},
-/obj/item/melee/roastingstick,
+/obj/item/roastingstick,
 /obj/item/reagent_containers/food/snacks/sausage,
 /turf/open/floor/plating/dirt{
 	light_range = 2
@@ -2304,7 +2304,7 @@
 /obj/effect/turf_decal/weather/sand{
 	dir = 8
 	},
-/obj/item/melee/roastingstick,
+/obj/item/roastingstick,
 /turf/open/floor/plating/dirt{
 	light_range = 2
 	},

_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm

@@ -16,7 +16,7 @@
 /area/ruin/beach/piratecrash/storage)
 "af" = (
 /obj/structure/table/wood,
-/obj/item/kitchen/knife,
+/obj/item/melee/knife/kitchen,
 /obj/effect/turf_decal/corner/opaque/black/diagonal,
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
@@ -37,7 +37,7 @@
 	},
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/snacks/fishfry,
-/obj/item/kitchen/knife/shiv{
+/obj/item/melee/knife/shiv{
 	pixel_x = -6;
 	pixel_y = 5
 	},

_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm

@@ -887,7 +887,7 @@
 /area/ruin/unpowered/crashed_holemaker)
 "oC" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/kitchen/knife,
+/obj/item/melee/knife/kitchen,
 /turf/open/floor/wood{
 	icon_state = "wood-broken7"
 	},

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm

@@ -332,7 +332,7 @@
 /obj/item/restraints/legcuffs/beartrap,
 /obj/item/reagent_containers/glass/bottle/venom,
 /obj/item/reagent_containers/glass/bottle/curare,
-/obj/item/kitchen/knife/combat/survival,
+/obj/item/melee/knife/survival,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/reagent_containers/food/snacks/meat/slab/human,
 /obj/item/reagent_containers/food/snacks/meat/slab/human,
@@ -384,7 +384,7 @@
 /obj/effect/decal/cleanable/blood/gibs/torso,
 /obj/structure/safe,
 /obj/item/ammo_box/a12g/slug,
-/obj/item/kitchen/knife/combat,
+/obj/item/melee/knife/combat,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,

_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm

@@ -367,23 +367,6 @@
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/ruin/unpowered)
-"sf" = (
-/obj/structure/table/wood,
-/obj/item/nullrod{
-	block_chance = 50;
-	desc = "This massive chart appears to be the layout of a SolGov outpost. It's covered in marks, scribbles in a language you don't recognize, and several stains. It's unusually sturdy.";
-	icon_state = "blueprints";
-	item_state = "blueprints";
-	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi';
-	name = "facility blueprints";
-	pixel_y = 10;
-	righthand_file = 'icons/mob/inhands/items_righthand.dmi';
-	w_class = 5
-	},
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
-	},
-/area/ruin/unpowered)
 "si" = (
 /obj/structure/flora/rock/jungle,
 /obj/structure/flora/grass/jungle/b,
@@ -1248,13 +1231,6 @@
 	},
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/ruin/unpowered)
-"Zs" = (
-/obj/structure/table/wood,
-/obj/item/banhammer,
-/turf/open/floor/wood{
-	initial_gas_mix = "ICEMOON_ATMOS"
-	},
-/area/ruin/unpowered)
 
 (1,1,1) = {"
 aW
@@ -2252,7 +2228,7 @@ Hb
 aW
 WH
 jy
-Zs
+ib
 WH
 WH
 WH
@@ -2284,7 +2260,7 @@ Hb
 aW
 Br
 ib
-sf
+ib
 WH
 WH
 fB

_maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm

@@ -193,7 +193,7 @@
 	pixel_x = 6;
 	pixel_y = -6
 	},
-/obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag{
+/obj/item/gun/ballistic/automatic/pistol/ringneck/no_mag{
 	name = "bible gun";
 	pixel_x = -7;
 	pixel_y = -8;
@@ -3198,8 +3198,8 @@
 /obj/structure/closet/wardrobe/chaplain_black{
 	populate = 0
 	},
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /obj/structure/spacevine{
 	name = "vines"
 	},

_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm

@@ -5613,9 +5613,9 @@
 /obj/structure/closet,
 /obj/item/clothing/suit/armor/ngr/captain,
 /obj/item/clothing/under/syndicate/ngr/officer,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /turf/open/floor/wood{
 	icon_state = "wood-broken2"
 	},
@@ -5787,9 +5787,9 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "Nh" = (
 /obj/structure/filingcabinet,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/jungle/starport/tower)
 "Nj" = (

_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm

@@ -3173,7 +3173,7 @@
 /obj/structure/closet/cabinet,
 /obj/item/hatchet/wooden,
 /obj/item/ammo_box/a357,
-/obj/item/gun/ballistic/revolver/syndicate,
+/obj/item/gun/ballistic/revolver/viper,
 /turf/open/floor/wood,
 /area/ship/bridge)
 "VM" = (

_maps/RandomRuins/JungleRuins/jungle_paradise.dmm

@@ -798,7 +798,7 @@
 /area/ruin/jungle/paradise/construction)
 "eY" = (
 /obj/structure/table/reinforced,
-/obj/item/kitchen/knife/butcher,
+/obj/item/melee/knife/butcher,
 /obj/item/clothing/gloves/butchering,
 /turf/open/floor/pod/dark,
 /area/overmap_encounter/planetoid/cave/explored)

_maps/RandomRuins/JungleRuins/jungle_syndicate.dmm

@@ -308,7 +308,7 @@
 /turf/open/floor/plating/rust,
 /area/ruin/jungle/syndifort/jerry)
 "ik" = (
-/obj/item/kitchen/knife/combat{
+/obj/item/melee/knife/combat{
 	name = "bushcutter";
 	force = 18
 	},
@@ -627,7 +627,7 @@
 /area/ruin/jungle/syndifort/jerry)
 "ud" = (
 /obj/structure/table,
-/obj/item/kitchen/knife/combat{
+/obj/item/melee/knife/combat{
 	name = "bushcutter";
 	force = 18
 	},
@@ -1108,7 +1108,7 @@
 "Il" = (
 /obj/effect/decal/cleanable/cobweb,
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
 /turf/open/floor/plating,
 /area/ruin/jungle/syndifort)
 "Iv" = (
@@ -1220,8 +1220,8 @@
 /obj/structure/rack,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/small/directional/south,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
 /turf/open/floor/plating,
 /area/ruin/jungle/syndifort)
 "My" = (
@@ -1593,9 +1593,9 @@
 /area/ruin/jungle/syndifort)
 "WG" = (
 /obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/ballistic/automatic/smg/c20r,
-/obj/item/ammo_box/magazine/smgm45,
-/obj/item/ammo_box/magazine/smgm45,
+/obj/item/gun/ballistic/automatic/smg/cobra,
+/obj/item/ammo_box/magazine/m45_cobra,
+/obj/item/ammo_box/magazine/m45_cobra,
 /turf/open/floor/plating,
 /area/ruin/jungle/syndifort/jerry)
 "WT" = (

_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm

@@ -1115,10 +1115,10 @@
 /turf/open/floor/plating,
 /area/ruin/unpowered/listening_post)
 "te" = (
-/obj/item/gun/ballistic/automatic/smg/c20r{
+/obj/item/gun/ballistic/automatic/smg/cobra{
 	spawnwithmagazine = 0
 	},
-/obj/item/ammo_box/magazine/smgm45{
+/obj/item/ammo_box/magazine/m45_cobra{
 	start_empty = 1
 	},
 /obj/structure/guncloset,
@@ -1324,7 +1324,7 @@
 /obj/item/cutting_board{
 	anchored = 1
 	},
-/obj/item/kitchen/knife,
+/obj/item/melee/knife/kitchen,
 /obj/effect/turf_decal/siding/thinplating/dark,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ruin/unpowered/listening_post/canteen)
@@ -2345,8 +2345,8 @@
 /area/ruin/unpowered/listening_post)
 "TM" = (
 /obj/structure/closet/cabinet,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/gun/ballistic/automatic/pistol/syndicate,
+/obj/item/ammo_box/magazine/m10mm_ringneck,
+/obj/item/gun/ballistic/automatic/pistol/ringneck,
 /obj/effect/turf_decal/siding/wood{
 	dir = 6
 	},

_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm

@@ -637,7 +637,7 @@
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/directional/east,
-/obj/item/kitchen/knife{
+/obj/item/melee/knife/kitchen{
 	pixel_x = 7;
 	pixel_y = 10
 	},

_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm

@@ -1072,7 +1072,7 @@
 "qj" = (
 /obj/effect/turf_decal/corner/opaque/solgovblue/diagonal,
 /obj/structure/table/wood,
-/obj/item/kitchen/knife,
+/obj/item/melee/knife/kitchen,
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered/winter_biodome/living_quarters)
 "qr" = (

_maps/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm

@@ -1807,7 +1807,7 @@
 /area/ruin/unpowered/buried_shrine)
 "UF" = (
 /obj/structure/stone_tile/block,
-/obj/item/claymore/bone{
+/obj/item/melee/sword/bone{
 	pixel_x = 8;
 	pixel_y = 21
 	},
@@ -1823,7 +1823,7 @@
 /area/ruin/unpowered/buried_shrine)
 "VG" = (
 /obj/structure/table/wood,
-/obj/item/kitchen/knife/combat/bone,
+/obj/item/melee/knife/bone,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "Wd" = (

_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm

@@ -254,7 +254,7 @@
 /turf/open/floor/plating/asteroid/basalt/wasteland,
 /area/ruin/unpowered/elephant_graveyard)
 "bk" = (
-/obj/item/kitchen/knife/combat/bone,
+/obj/item/melee/knife/bone,
 /obj/item/organ/tongue,
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/plating/asteroid/basalt/wasteland,