From ef98e7f4ea2c57cc6a215452edba8ddf36c572f7 Mon Sep 17 00:00:00 2001
From: Raeschen <rycoop29@gmail.com>
Date: Wed, 21 Jun 2023 08:26:10 +0200
Subject: [PATCH] Fix a few chomp-specific typepaths and a marge conflict

---
 .../items/weapons/circuitboards/frame.dm      |    2 +-
 .../wilderness/leopardmanderden.dmm           | 1033 -----------------
 .../living/silicon/robot/drone/drone_items.dm |    2 +-
 3 files changed, 2 insertions(+), 1035 deletions(-)

diff --git a/code/game/objects/items/weapons/circuitboards/frame.dm b/code/game/objects/items/weapons/circuitboards/frame.dm
index 1db8b10130..3d0e3d9cd2 100644
--- a/code/game/objects/items/weapons/circuitboards/frame.dm
+++ b/code/game/objects/items/weapons/circuitboards/frame.dm
@@ -183,7 +183,7 @@
 //	origin_tech = list(TECH_DATA = 2, TECH_BLUESPACE = 4)
 //CHOMPedit Balance
 	req_components = list(
-							/obj/item/weapon/ore/bluespace_crystal = 2,
+							/obj/item/weapon/bluespace_crystal = 2,
 							/obj/item/weapon/stock_parts/capacitor = 2,
 							/obj/item/weapon/stock_parts/scanning_module = 2,
 							/obj/item/weapon/stock_parts/micro_laser =2,
diff --git a/maps/submaps/surface_submaps/wilderness/leopardmanderden.dmm b/maps/submaps/surface_submaps/wilderness/leopardmanderden.dmm
index b7fdac2b85..d9b2527084 100644
--- a/maps/submaps/surface_submaps/wilderness/leopardmanderden.dmm
+++ b/maps/submaps/surface_submaps/wilderness/leopardmanderden.dmm
@@ -1,1035 +1,3 @@
-<<<<<<< HEAD
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aK" = (
-/obj/item/weapon/ore/silver,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"aT" = (
-/obj/structure/table/bench/sifwooden/padded,
-/mob/living/simple_mob/animal/sif/siffet{
-	faction = "neutral"
-	},
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"bj" = (
-/obj/item/weapon/ore/bluespace_crystal,
-/turf/simulated/floor/outdoors/grass/sif,
-/area/submap/LeopardmanderDen)
-"bO" = (
-/obj/item/stack/material/gold,
-/turf/simulated/floor/outdoors/grass/sif,
-/area/submap/LeopardmanderDen)
-"cu" = (
-/turf/simulated/floor/outdoors/rocks{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"dA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/simple_door/sifwood,
-/turf/simulated/floor/outdoors/rocks{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"eD" = (
-/obj/structure/railing/grey{
-	dir = 4
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"eF" = (
-/obj/structure/ledge/ledge_stairs,
-/turf/simulated/floor/outdoors/rocks{
-	outdoors = 0
-	},
-/area/template_noop)
-"fe" = (
-/obj/item/weapon/coin/diamond,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"fQ" = (
-/obj/effect/landmark/loot_spawn/low,
-/obj/item/weapon/ore/gold,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"gg" = (
-/obj/random/obstruction,
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"gC" = (
-/obj/item/weapon/flame/lighter/zippo/gold,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"gD" = (
-/obj/structure/flora/smallbould,
-/turf/simulated/floor/outdoors/rocks{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"gP" = (
-/obj/structure/cliff/automatic,
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"gU" = (
-/obj/item/weapon/coin/gold,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"hi" = (
-/obj/structure/sign/warning/falling,
-/turf/simulated/wall/gold,
-/area/submap/LeopardmanderDen)
-"hr" = (
-/obj/structure/flora/rocks1,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"hw" = (
-/obj/structure/cliff/automatic{
-	dir = 9
-	},
-/obj/structure/railing/grey{
-	dir = 1
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"iV" = (
-/obj/structure/cliff/automatic/corner{
-	dir = 6
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"jb" = (
-/obj/machinery/crystal/ice,
-/turf/template_noop,
-/area/template_noop)
-"jE" = (
-/obj/structure/cliff/automatic{
-	dir = 8
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"ki" = (
-/obj/structure/table/bench/sifwooden/padded,
-/obj/item/clothing/head/pin/flower/violet,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"kx" = (
-/obj/item/stack/material/gold,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"kO" = (
-/obj/structure/cliff/automatic{
-	dir = 6
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"lb" = (
-/obj/structure/cliff/automatic{
-	dir = 10
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"ll" = (
-/obj/structure/cliff/automatic/corner{
-	dir = 10
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"mi" = (
-/obj/structure/cliff/automatic/ramp{
-	dir = 9
-	},
-/obj/structure/railing/grey{
-	dir = 8
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"mu" = (
-/obj/structure/flora/rocks2,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"mW" = (
-/obj/structure/railing/grey,
-/obj/structure/railing/grey{
-	dir = 4
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"nw" = (
-/turf/simulated/floor/water/ocean{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"nG" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"nR" = (
-/mob/living/simple_mob/animal/sif/sakimm,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"oD" = (
-/obj/fiftyspawner/silver,
-/turf/simulated/floor/outdoors/grass/sif,
-/area/submap/LeopardmanderDen)
-"pQ" = (
-/obj/structure/cliff/automatic/corner,
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"qa" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/outdoors/grass/sif,
-/area/submap/LeopardmanderDen)
-"qg" = (
-/obj/structure/bed/chair/oldsofa/right{
-	dir = 8
-	},
-/turf/simulated/floor/outdoors/rocks{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"rn" = (
-/turf/template_noop,
-/area/template_noop)
-"ro" = (
-/obj/structure/flora/lily3,
-/turf/simulated/floor/water/ocean{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"rD" = (
-/obj/structure/flora/ausbushes/brflowers,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"rG" = (
-/obj/structure/flora/pottedplant/flower,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"sl" = (
-/obj/machinery/crystal/ice,
-/obj/structure/railing/grey{
-	dir = 4
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"sN" = (
-/mob/living/simple_mob/otie/red/chubby{
-	desc = "Seems this ominous looking longdog has been infused with wicked infernal forces. What an absolute unit. It has a collar around one of its ankles that reads 'Tawny'.";
-	name = "Tawny"
-	},
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"sY" = (
-/mob/living/simple_mob/animal/sif/sakimm{
-	faction = "neutral"
-	},
-/turf/template_noop,
-/area/template_noop)
-"tP" = (
-/mob/living/simple_mob/animal/sif/sakimm{
-	faction = "neutral"
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"uw" = (
-/obj/structure/ledge/ledge_stairs{
-	dir = 4
-	},
-/turf/simulated/floor/outdoors/rocks{
-	outdoors = 0
-	},
-/area/template_noop)
-"uz" = (
-/obj/structure/cliff/automatic{
-	dir = 8
-	},
-/obj/structure/railing/grey{
-	dir = 8
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"vk" = (
-/mob/living/simple_mob/animal/sif/tymisian{
-	faction = "neutral"
-	},
-/turf/template_noop,
-/area/template_noop)
-"xf" = (
-/turf/simulated/floor/outdoors/grass/sif,
-/area/submap/LeopardmanderDen)
-"xg" = (
-/obj/item/weapon/ore/silver,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"xL" = (
-/obj/random/outcrop,
-/turf/simulated/floor/outdoors/rocks{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"yl" = (
-/turf/simulated/wall/golddiamond,
-/area/submap/LeopardmanderDen)
-"yz" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/water/ocean{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"zJ" = (
-/mob/living/simple_mob/animal/sif/siffet{
-	faction = "neutral"
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"zW" = (
-/obj/structure/cliff/automatic/corner{
-	dir = 9
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"Ah" = (
-/obj/structure/flora/grass/green,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"AF" = (
-/turf/simulated/floor/water/ocean,
-/area/submap/LeopardmanderDen)
-"AP" = (
-/obj/structure/bed/chair/oldsofa/right{
-	dir = 4
-	},
-/turf/simulated/floor/outdoors/rocks{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"BE" = (
-/obj/item/stack/material/diamond,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/outdoors/grass/sif,
-/area/submap/LeopardmanderDen)
-"DI" = (
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"DJ" = (
-/obj/structure/flora/log1,
-/turf/simulated/floor/water/ocean{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"Ez" = (
-/obj/structure/flora/bboulder2,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"EH" = (
-/obj/structure/ledge/ledge_stairs,
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"Gl" = (
-/obj/structure/cliff/automatic{
-	dir = 9
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"Gw" = (
-/obj/item/weapon/ore/gold,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"Hx" = (
-/obj/structure/sign/warning/falling,
-/turf/simulated/wall/sifwood,
-/area/template_noop)
-"HV" = (
-/obj/structure/bed/chair/oldsofa/left{
-	dir = 4
-	},
-/turf/simulated/floor/outdoors/rocks{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"Ih" = (
-/obj/random/obstruction,
-/turf/template_noop,
-/area/template_noop)
-"IQ" = (
-/turf/simulated/mineral/ignore_mapgen,
-/area/submap/LeopardmanderDen)
-"Jk" = (
-/turf/simulated/floor/outdoors/rocks{
-	outdoors = 0
-	},
-/area/template_noop)
-"Kd" = (
-/obj/structure/cliff/automatic,
-/obj/structure/railing/grey{
-	dir = 1
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"Kv" = (
-/obj/random/outcrop,
-/turf/template_noop,
-/area/template_noop)
-"KT" = (
-/obj/structure/flora/ausbushes/brflowers,
-/obj/structure/flora/tree/winter,
-/turf/simulated/floor/outdoors/grass/sif/forest,
-/area/submap/LeopardmanderDen)
-"Lb" = (
-/obj/structure/cliff/automatic{
-	dir = 5
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"Ls" = (
-/obj/structure/cliff/automatic{
-	dir = 2
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"MQ" = (
-/obj/machinery/crystal/ice,
-/obj/structure/railing/grey{
-	dir = 8
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"NS" = (
-/obj/structure/cliff/automatic{
-	dir = 10
-	},
-/obj/structure/railing/grey,
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"Pc" = (
-/obj/item/stack/material/diamond,
-/turf/simulated/floor/outdoors/grass/sif,
-/area/submap/LeopardmanderDen)
-"Pr" = (
-/turf/unsimulated/wall/bronze,
-/area/submap/LeopardmanderDen)
-"PO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/flora/rocks2,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"Qa" = (
-/obj/machinery/crystal/ice,
-/turf/simulated/floor/outdoors/rocks{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"QQ" = (
-/obj/item/stack/material/gold,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"RA" = (
-/obj/fiftyspawner/gold,
-/turf/simulated/floor/outdoors/grass/sif,
-/area/submap/LeopardmanderDen)
-"Sk" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/flora/rocks1,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"Sm" = (
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"SM" = (
-/obj/structure/flora/log2,
-/turf/simulated/floor/water/ocean{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"Te" = (
-/obj/item/weapon/coin/silver,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"Tj" = (
-/mob/living/simple_mob/animal/sif/tymisian{
-	faction = "neutral"
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"Tt" = (
-/obj/structure/flora/ausbushes/brflowers,
-/obj/item/weapon/coin/iron,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"TF" = (
-/obj/structure/bed/chair/oldsofa/left{
-	dir = 8
-	},
-/turf/simulated/floor/outdoors/rocks{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"Uc" = (
-/obj/item/weapon/ore/diamond,
-/turf/simulated/floor/outdoors/grass/sif,
-/area/submap/LeopardmanderDen)
-"Ul" = (
-/obj/item/weapon/ore/gold,
-/turf/simulated/floor/outdoors/grass/sif,
-/area/submap/LeopardmanderDen)
-"UA" = (
-/obj/structure/flora/ausbushes/brflowers,
-/obj/item/weapon/coin/gold,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"Vi" = (
-/obj/structure/flora/lily2,
-/turf/simulated/floor/water/ocean{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"Vp" = (
-/obj/effect/map_effect/interval/effect_emitter/steam,
-/turf/simulated/floor/water/ocean{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"VM" = (
-/turf/simulated/wall/gold,
-/area/submap/LeopardmanderDen)
-"VV" = (
-/obj/structure/flora/lily1,
-/turf/simulated/floor/water/ocean{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"WB" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/outdoors/rocks{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"Xt" = (
-/mob/living/simple_mob/vore/leopardmander,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"XR" = (
-/obj/effect/map_effect/interval/effect_emitter/steam,
-/turf/simulated/floor/water/ocean,
-/area/submap/LeopardmanderDen)
-"Yq" = (
-/obj/structure/cliff/automatic{
-	dir = 4
-	},
-/turf/simulated/floor/outdoors/dirt,
-/area/template_noop)
-"YJ" = (
-/obj/item/weapon/ore/diamond,
-/turf/simulated/floor/outdoors/grass/sif/forest{
-	outdoors = 0
-	},
-/area/submap/LeopardmanderDen)
-"Zj" = (
-/mob/living/simple_mob/animal/sif/tymisian{
-	faction = "neutral"
-	},
-/turf/simulated/floor/outdoors/grass/sif,
-/area/submap/LeopardmanderDen)
-
-(1,1,1) = {"
-rn
-Ih
-iV
-Yq
-Yq
-Yq
-Yq
-Yq
-Yq
-Yq
-pQ
-Sm
-Sm
-Sm
-Sm
-rn
-rn
-rn
-rn
-rn
-"}
-(2,1,1) = {"
-rn
-iV
-kO
-IQ
-IQ
-IQ
-IQ
-IQ
-IQ
-IQ
-Lb
-Yq
-Yq
-Yq
-pQ
-Sm
-sY
-rn
-Sm
-rn
-"}
-(3,1,1) = {"
-iV
-kO
-IQ
-IQ
-Qa
-yl
-IQ
-IQ
-IQ
-IQ
-IQ
-IQ
-IQ
-IQ
-Lb
-Yq
-pQ
-Sm
-Ih
-rn
-"}
-(4,1,1) = {"
-Ls
-IQ
-IQ
-cu
-xf
-bj
-Pc
-xf
-IQ
-Pr
-IQ
-IQ
-IQ
-IQ
-IQ
-IQ
-Lb
-pQ
-Sm
-rn
-"}
-(5,1,1) = {"
-Ls
-IQ
-IQ
-xL
-BE
-DI
-PO
-DI
-kx
-gU
-DI
-Uc
-xL
-cu
-IQ
-IQ
-IQ
-Lb
-Yq
-pQ
-"}
-(6,1,1) = {"
-Ls
-IQ
-IQ
-xf
-fe
-Xt
-nw
-Vi
-YJ
-yz
-Ah
-xg
-Zj
-Qa
-cu
-IQ
-IQ
-IQ
-IQ
-gP
-"}
-(7,1,1) = {"
-Ls
-IQ
-IQ
-RA
-DI
-nw
-SM
-nw
-nw
-ro
-nw
-nR
-DI
-Pc
-xL
-IQ
-IQ
-IQ
-IQ
-gP
-"}
-(8,1,1) = {"
-Ls
-IQ
-Pr
-xf
-mu
-nw
-nw
-AF
-UA
-XR
-nw
-DJ
-hr
-YJ
-Uc
-IQ
-Qa
-IQ
-IQ
-gP
-"}
-(9,1,1) = {"
-Ls
-IQ
-IQ
-IQ
-QQ
-nw
-nw
-rD
-KT
-Tt
-nw
-nw
-AF
-fQ
-xf
-IQ
-HV
-AP
-IQ
-gP
-"}
-(10,1,1) = {"
-Ls
-IQ
-IQ
-cu
-gC
-nG
-nw
-Vp
-Ez
-VV
-AF
-nw
-ki
-Gw
-bO
-cu
-cu
-cu
-IQ
-gP
-"}
-(11,1,1) = {"
-Ls
-IQ
-IQ
-cu
-xL
-DI
-DI
-AF
-nw
-nw
-nw
-nw
-aT
-Ul
-qa
-VM
-qg
-TF
-IQ
-gP
-"}
-(12,1,1) = {"
-ll
-lb
-IQ
-IQ
-VM
-Qa
-sN
-aK
-Te
-DJ
-Ah
-rG
-Sk
-qa
-oD
-IQ
-IQ
-IQ
-IQ
-gP
-"}
-(13,1,1) = {"
-rn
-ll
-lb
-IQ
-IQ
-IQ
-IQ
-Qa
-DI
-hr
-DI
-xf
-xf
-xL
-cu
-IQ
-IQ
-IQ
-IQ
-gP
-"}
-(14,1,1) = {"
-rn
-gg
-Ls
-IQ
-IQ
-IQ
-IQ
-IQ
-IQ
-IQ
-xf
-cu
-cu
-Qa
-Pr
-IQ
-IQ
-IQ
-Gl
-zW
-"}
-(15,1,1) = {"
-rn
-Sm
-ll
-jE
-lb
-IQ
-IQ
-IQ
-IQ
-IQ
-gD
-cu
-WB
-IQ
-IQ
-IQ
-IQ
-Gl
-zW
-rn
-"}
-(16,1,1) = {"
-rn
-Sm
-gg
-Sm
-ll
-lb
-IQ
-IQ
-IQ
-IQ
-IQ
-hi
-dA
-VM
-IQ
-Gl
-jE
-zW
-rn
-Kv
-"}
-(17,1,1) = {"
-rn
-rn
-tP
-rn
-Sm
-ll
-jE
-jE
-jE
-jE
-jE
-NS
-uw
-hw
-jE
-zW
-Sm
-jb
-zJ
-rn
-"}
-(18,1,1) = {"
-rn
-Sm
-Sm
-Sm
-Tj
-Sm
-Sm
-Hx
-Sm
-sl
-eD
-mW
-uw
-Kd
-Sm
-vk
-tP
-rn
-rn
-rn
-"}
-(19,1,1) = {"
-rn
-rn
-Sm
-rn
-Sm
-tP
-Sm
-zJ
-Sm
-EH
-eF
-eF
-Jk
-Kd
-Sm
-Ih
-rn
-rn
-rn
-rn
-"}
-(20,1,1) = {"
-rn
-rn
-rn
-rn
-rn
-Sm
-Sm
-Sm
-Sm
-MQ
-mi
-uz
-uz
-zW
-rn
-rn
-rn
-rn
-rn
-rn
-"}
-=======
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aK" = (
 /obj/item/weapon/ore/silver,
@@ -2074,4 +1042,3 @@ rn
 rn
 rn
 "}
->>>>>>> 9269498d12... Merge pull request #15056 from Runa-Dacino/bugfixes2
diff --git a/modular_chomp/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/modular_chomp/code/modules/mob/living/silicon/robot/drone/drone_items.dm
index d9ad755156..ac9a9f28b2 100644
--- a/modular_chomp/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+++ b/modular_chomp/code/modules/mob/living/silicon/robot/drone/drone_items.dm
@@ -23,7 +23,7 @@
 		/obj/item/weapon/circuitboard,
 		/obj/item/weapon/smes_coil,
 		/obj/item/weapon/fuel_assembly,
-		/obj/item/weapon/ore/bluespace_crystal
+		/obj/item/weapon/bluespace_crystal
 		) // CHOMPEdit - Buffing the gripper to allow bluespace crystal use for telesci building.
 
 	var/obj/item/wrapped = null // Item currently being held.