diff --git a/_maps/RandomRuins/SpaceRuins/dragoontomb.dmm b/_maps/RandomRuins/SpaceRuins/dragoontomb.dmm
deleted file mode 100644
index 94d7274849..0000000000
--- a/_maps/RandomRuins/SpaceRuins/dragoontomb.dmm
+++ /dev/null
@@ -1,1888 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
-/turf/template_noop,
-/area/template_noop)
-"b" = (
-/turf/open/floor/plating/asteroid/airless,
-/area/ruin/unpowered/no_grav)
-"c" = (
-/turf/closed/mineral/volcanic/lava_land_surface{
-	baseturf = /turf/open/floor/plating/asteroid
-	},
-/area/ruin/unpowered/no_grav)
-"d" = (
-/mob/living/simple_animal/hostile/flan/water,
-/turf/open/floor/plating/asteroid/airless,
-/area/ruin/unpowered/no_grav)
-"e" = (
-/mob/living/simple_animal/hostile/flan/fire,
-/turf/open/floor/plating/asteroid/airless,
-/area/ruin/unpowered/no_grav)
-"f" = (
-/obj/structure/lattice,
-/turf/template_noop,
-/area/template_noop)
-"g" = (
-/obj/item/weapon/bikehorn,
-/turf/open/floor/plating/asteroid/airless,
-/area/ruin/unpowered/no_grav)
-"h" = (
-/turf/closed/wall/mineral/iron,
-/area/ruin/unpowered/no_grav)
-"i" = (
-/obj/structure/rack,
-/obj/item/weapon/kitchen/knife/combat/survival,
-/turf/open/floor/plating/astplate{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/ruin/unpowered/no_grav)
-"j" = (
-/turf/open/floor/plating/astplate{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/ruin/unpowered/no_grav)
-"k" = (
-/obj/structure/rack,
-/obj/item/weapon/twohanded/spear,
-/turf/open/floor/plating/astplate{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/ruin/unpowered/no_grav)
-"l" = (
-/obj/structure/rack,
-/obj/item/weapon/relic,
-/turf/open/floor/plating/astplate{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/ruin/unpowered/no_grav)
-"m" = (
-/obj/structure/mineral_door/wood,
-/turf/open/floor/plating/astplate{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/ruin/unpowered/no_grav)
-"n" = (
-/obj/structure/rack,
-/obj/item/weapon/dice/d4,
-/turf/open/floor/plating/astplate{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/ruin/unpowered/no_grav)
-"o" = (
-/obj/structure/rack,
-/obj/item/weapon/dice/d8,
-/turf/open/floor/plating/astplate{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/ruin/unpowered/no_grav)
-"p" = (
-/obj/structure/rack,
-/obj/item/weapon/dice/d12,
-/turf/open/floor/plating/astplate{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/ruin/unpowered/no_grav)
-"q" = (
-/obj/structure/rack,
-/obj/item/weapon/dice/d00,
-/turf/open/floor/plating/astplate{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/ruin/unpowered/no_grav)
-"r" = (
-/obj/structure/rack,
-/obj/item/weapon/dice/d20,
-/turf/open/floor/plating/astplate{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/ruin/unpowered/no_grav)
-"s" = (
-/obj/structure/statue/silver/sec,
-/turf/open/floor/mineral/silver,
-/area/ruin/unpowered/no_grav)
-"t" = (
-/obj/structure/statue/silver/md,
-/turf/open/floor/mineral/silver,
-/area/ruin/unpowered/no_grav)
-"u" = (
-/obj/structure/table/wood/fancy,
-/obj/item/weapon/twohanded/skybulge,
-/turf/open/floor/mineral/silver,
-/area/ruin/unpowered/no_grav)
-"v" = (
-/turf/open/floor/mineral/silver,
-/area/ruin/unpowered/no_grav)
-"w" = (
-/obj/structure/mineral_door/silver,
-/turf/open/floor/mineral/silver,
-/area/ruin/unpowered/no_grav)
-"x" = (
-/obj/structure/closet/coffin,
-/obj/item/stack/sheet/bone,
-/turf/open/floor/mineral/silver,
-/area/ruin/unpowered/no_grav)
-"y" = (
-/mob/living/simple_animal/hostile/flan/fire,
-/turf/open/floor/plating/astplate{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/ruin/unpowered/no_grav)
-"z" = (
-/obj/structure/statue/silver/secborg,
-/turf/open/floor/mineral/silver,
-/area/ruin/unpowered/no_grav)
-"A" = (
-/obj/structure/statue/silver/medborg,
-/turf/open/floor/mineral/silver,
-/area/ruin/unpowered/no_grav)
-"B" = (
-/obj/structure/table/wood/fancy,
-/obj/item/weapon/reagent_containers/food/snacks/donkpocket,
-/turf/open/floor/mineral/silver,
-/area/ruin/unpowered/no_grav)
-"C" = (
-/obj/effect/turf_decal/stripes/asteroid/line{
-	dir = 8
-	},
-/turf/open/floor/plating/astplate{
-	icon_state = "astplate_warn";
-	initial_gas_mix = "TEMP=2.7";
-	tag = "icon-astplate_warn (WEST)"
-	},
-/area/ruin/unpowered/no_grav)
-"D" = (
-/obj/effect/turf_decal/stripes/asteroid/line{
-	dir = 4
-	},
-/turf/open/floor/plating/astplate{
-	icon_state = "astplate_warn";
-	initial_gas_mix = "TEMP=2.7";
-	tag = "icon-astplate_warn (EAST)"
-	},
-/area/ruin/unpowered/no_grav)
-"E" = (
-/obj/item/weapon/dice/d10,
-/turf/open/floor/plating/asteroid/airless,
-/area/ruin/unpowered/no_grav)
-"F" = (
-/obj/structure/grille,
-/turf/template_noop,
-/area/ruin/unpowered/no_grav)
-"G" = (
-/obj/item/weapon/dice/d100,
-/turf/open/floor/plating/asteroid/airless,
-/area/ruin/unpowered/no_grav)
-"H" = (
-/obj/effect/turf_decal/stripes/asteroid/line{
-	dir = 10
-	},
-/turf/open/floor/plating/astplate{
-	icon_state = "astplate_warn";
-	initial_gas_mix = "TEMP=2.7";
-	tag = "icon-astplate_warn (SOUTHWEST)"
-	},
-/area/ruin/unpowered/no_grav)
-"I" = (
-/obj/effect/turf_decal/stripes/asteroid/line{
-	dir = 6
-	},
-/turf/open/floor/plating/astplate{
-	icon_state = "astplate_warn";
-	initial_gas_mix = "TEMP=2.7";
-	tag = "icon-astplate_warn (SOUTHEAST)"
-	},
-/area/ruin/unpowered/no_grav)
-"J" = (
-/obj/item/weapon/crowbar/red,
-/turf/open/floor/plating/asteroid/airless,
-/area/ruin/unpowered/no_grav)
-"K" = (
-/obj/item/weapon/dice/d1,
-/turf/open/floor/plating/asteroid/airless,
-/area/ruin/unpowered/no_grav)
-"L" = (
-/turf/open/floor/mineral/silver{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/ruin/unpowered/no_grav)
-
-(1,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(2,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(3,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-b
-b
-c
-c
-c
-c
-a
-a
-a
-a
-c
-c
-c
-c
-c
-b
-b
-b
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(4,1,1) = {"
-a
-a
-a
-a
-a
-a
-b
-b
-b
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-b
-b
-b
-c
-c
-c
-a
-a
-a
-a
-c
-c
-c
-a
-a
-a
-"}
-(5,1,1) = {"
-a
-a
-a
-a
-a
-a
-b
-b
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-a
-a
-a
-"}
-(6,1,1) = {"
-a
-a
-a
-a
-a
-b
-b
-b
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-b
-c
-c
-c
-c
-c
-c
-c
-c
-c
-b
-b
-b
-b
-c
-c
-c
-c
-c
-a
-a
-"}
-(7,1,1) = {"
-a
-a
-a
-a
-b
-b
-b
-b
-b
-b
-b
-c
-b
-c
-c
-c
-c
-c
-b
-b
-c
-c
-b
-b
-c
-c
-c
-b
-c
-b
-c
-c
-b
-c
-c
-c
-c
-c
-a
-a
-"}
-(8,1,1) = {"
-a
-b
-b
-b
-b
-b
-c
-c
-b
-b
-b
-b
-b
-d
-c
-c
-c
-c
-b
-b
-c
-c
-c
-b
-b
-c
-b
-b
-c
-c
-c
-c
-c
-c
-b
-c
-c
-a
-a
-a
-"}
-(9,1,1) = {"
-a
-a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-b
-c
-c
-c
-b
-b
-b
-b
-c
-c
-c
-b
-b
-b
-c
-c
-c
-c
-b
-c
-c
-b
-c
-c
-c
-a
-a
-"}
-(10,1,1) = {"
-a
-a
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-c
-b
-c
-c
-c
-b
-b
-b
-b
-c
-c
-c
-b
-d
-c
-c
-c
-c
-b
-b
-c
-c
-b
-c
-c
-c
-c
-a
-"}
-(11,1,1) = {"
-a
-a
-a
-c
-c
-c
-c
-c
-b
-b
-b
-c
-c
-b
-b
-c
-c
-c
-c
-b
-E
-c
-b
-c
-b
-c
-c
-c
-c
-b
-b
-c
-c
-b
-b
-c
-c
-c
-a
-a
-"}
-(12,1,1) = {"
-a
-a
-a
-c
-c
-c
-c
-b
-d
-b
-b
-c
-c
-b
-b
-b
-c
-c
-c
-c
-c
-c
-G
-c
-b
-c
-c
-c
-b
-b
-c
-c
-c
-b
-b
-c
-c
-b
-b
-a
-"}
-(13,1,1) = {"
-a
-a
-a
-c
-c
-c
-c
-b
-b
-b
-e
-b
-c
-c
-b
-b
-b
-b
-c
-c
-c
-c
-c
-c
-b
-b
-c
-c
-b
-b
-c
-c
-c
-c
-c
-c
-c
-b
-a
-a
-"}
-(14,1,1) = {"
-a
-a
-a
-c
-c
-c
-c
-b
-b
-c
-b
-b
-b
-c
-c
-c
-c
-b
-b
-b
-b
-b
-c
-c
-c
-b
-b
-c
-b
-c
-c
-c
-c
-c
-c
-b
-b
-a
-a
-a
-"}
-(15,1,1) = {"
-a
-a
-a
-c
-c
-c
-c
-c
-b
-c
-c
-b
-g
-c
-c
-c
-c
-c
-b
-b
-b
-b
-c
-c
-c
-b
-b
-c
-b
-c
-c
-c
-c
-c
-c
-b
-b
-a
-a
-a
-"}
-(16,1,1) = {"
-a
-a
-a
-c
-c
-c
-c
-c
-c
-c
-c
-b
-b
-b
-b
-c
-c
-c
-c
-c
-b
-b
-c
-b
-b
-c
-b
-c
-b
-c
-c
-b
-b
-b
-b
-b
-b
-a
-a
-a
-"}
-(17,1,1) = {"
-a
-a
-a
-a
-c
-c
-c
-c
-c
-c
-b
-d
-b
-b
-c
-c
-c
-c
-c
-c
-c
-b
-b
-b
-c
-c
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-b
-a
-a
-a
-"}
-(18,1,1) = {"
-a
-a
-a
-a
-c
-c
-c
-c
-c
-b
-b
-c
-c
-c
-c
-f
-c
-c
-c
-c
-c
-b
-b
-c
-c
-b
-b
-b
-d
-b
-c
-c
-c
-c
-b
-b
-b
-a
-a
-a
-"}
-(19,1,1) = {"
-a
-a
-a
-a
-c
-c
-c
-c
-c
-c
-c
-c
-a
-a
-a
-f
-a
-a
-f
-a
-a
-c
-b
-b
-c
-b
-b
-b
-b
-b
-b
-c
-c
-c
-c
-b
-b
-a
-a
-a
-"}
-(20,1,1) = {"
-a
-a
-a
-a
-b
-b
-c
-c
-c
-c
-a
-a
-h
-h
-h
-h
-h
-h
-h
-h
-f
-c
-c
-b
-b
-b
-b
-c
-c
-b
-b
-c
-c
-c
-c
-c
-b
-a
-a
-a
-"}
-(21,1,1) = {"
-a
-a
-a
-a
-b
-b
-b
-b
-c
-c
-c
-f
-h
-i
-j
-h
-n
-j
-j
-h
-a
-f
-c
-c
-b
-b
-b
-c
-c
-c
-b
-b
-c
-c
-c
-c
-b
-b
-a
-a
-"}
-(22,1,1) = {"
-a
-a
-a
-a
-a
-b
-b
-b
-c
-c
-c
-a
-h
-j
-j
-m
-j
-j
-j
-h
-F
-F
-c
-c
-J
-b
-c
-c
-c
-c
-c
-b
-c
-c
-c
-c
-c
-c
-a
-a
-"}
-(23,1,1) = {"
-a
-a
-a
-a
-a
-b
-b
-b
-c
-c
-a
-a
-h
-k
-j
-h
-o
-j
-j
-C
-C
-C
-H
-b
-b
-b
-c
-b
-b
-b
-c
-b
-c
-c
-c
-c
-c
-a
-a
-a
-"}
-(24,1,1) = {"
-a
-a
-a
-a
-a
-a
-b
-b
-c
-c
-c
-a
-h
-h
-h
-h
-p
-j
-y
-D
-D
-D
-I
-b
-b
-d
-c
-c
-b
-b
-c
-b
-c
-c
-c
-c
-c
-a
-a
-a
-"}
-(25,1,1) = {"
-a
-a
-a
-a
-a
-a
-b
-b
-b
-c
-c
-f
-h
-l
-j
-h
-q
-j
-j
-h
-F
-F
-c
-b
-b
-c
-c
-c
-b
-K
-c
-b
-c
-c
-c
-c
-c
-c
-a
-a
-"}
-(26,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-b
-b
-c
-c
-a
-h
-j
-j
-m
-j
-j
-j
-h
-f
-c
-c
-b
-b
-c
-b
-c
-c
-c
-c
-b
-c
-b
-c
-c
-c
-c
-a
-a
-"}
-(27,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-b
-b
-c
-c
-f
-h
-k
-j
-h
-r
-L
-j
-h
-a
-c
-b
-b
-c
-c
-b
-c
-c
-c
-c
-c
-c
-b
-c
-c
-b
-b
-a
-a
-"}
-(28,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-b
-b
-c
-a
-f
-h
-h
-h
-h
-h
-w
-h
-h
-a
-c
-b
-c
-c
-b
-b
-c
-c
-b
-c
-c
-c
-b
-d
-b
-b
-b
-a
-a
-"}
-(29,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-b
-b
-c
-a
-f
-a
-a
-a
-h
-s
-v
-z
-h
-f
-c
-b
-c
-b
-b
-c
-c
-c
-b
-c
-c
-c
-b
-c
-c
-c
-a
-a
-a
-"}
-(30,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-b
-c
-c
-c
-c
-f
-f
-h
-h
-v
-h
-h
-a
-c
-c
-c
-b
-d
-c
-b
-c
-b
-c
-c
-c
-b
-c
-c
-b
-b
-a
-a
-"}
-(31,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-c
-c
-c
-c
-a
-a
-h
-t
-v
-A
-h
-a
-a
-c
-c
-c
-b
-c
-b
-c
-b
-b
-b
-b
-b
-c
-c
-b
-a
-a
-a
-"}
-(32,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-c
-c
-c
-c
-c
-a
-h
-h
-v
-h
-h
-f
-f
-f
-c
-b
-b
-c
-c
-c
-c
-b
-b
-c
-c
-c
-c
-c
-a
-a
-a
-"}
-(33,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-c
-c
-c
-c
-f
-h
-u
-v
-B
-h
-a
-a
-c
-c
-b
-b
-b
-c
-c
-c
-b
-c
-c
-c
-c
-c
-c
-c
-a
-a
-"}
-(34,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-c
-c
-c
-a
-h
-h
-x
-h
-h
-a
-a
-c
-c
-c
-b
-b
-c
-b
-b
-b
-c
-c
-c
-c
-c
-c
-c
-a
-a
-"}
-(35,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-c
-c
-c
-h
-h
-h
-f
-a
-c
-c
-c
-c
-c
-b
-b
-b
-c
-c
-c
-c
-c
-c
-c
-c
-a
-a
-a
-"}
-(36,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-c
-c
-c
-a
-f
-c
-c
-c
-c
-b
-b
-b
-b
-c
-c
-c
-c
-c
-c
-c
-a
-a
-a
-a
-a
-"}
-(37,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-c
-c
-c
-c
-c
-c
-b
-b
-b
-b
-b
-b
-b
-c
-c
-c
-c
-c
-a
-a
-a
-a
-a
-a
-"}
-(38,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-c
-c
-b
-b
-b
-b
-a
-a
-a
-a
-b
-b
-c
-c
-c
-a
-a
-a
-a
-a
-a
-a
-"}
-(39,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-b
-b
-a
-a
-a
-a
-a
-a
-a
-b
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
-(40,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-"}
diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm
index 36883c59fe..c7912c4c6c 100644
--- a/code/datums/ruins/space.dm
+++ b/code/datums/ruins/space.dm
@@ -241,10 +241,4 @@
 	id = "miracle"
 	suffix = "miracle.dmm"
 	name = "Ordinary Space Tile"
-	description = "Absolutely nothing strange going on here please move along, plenty more space to see right this way!"
-
-/datum/map_template/ruin/space/dragoon
-	id = "dragoon"
-	suffix = "dragoontomb.dmm"
-	name = "Sky Bulge Tomb"
-	description = "A tomb of a dice-loving dragoon in space. Turns out he got too good and jumped too high. Contains the Sky Bulge, which when thrown, warps the thrower."
+	description = "Absolutely nothing strange going on here please move along, plenty more space to see right this way!"
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index baf65fd084..0fad89dec5 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -698,56 +698,4 @@
 	sharpness = IS_SHARP
 
 /obj/item/weapon/twohanded/bonespear/update_icon()
-	icon_state = "bone_spear[wielded]"
-
-/*
- * Sky Bulge (Gae Bolg, tradtional dragoon lance from many FF games.)
- */
-/obj/item/weapon/twohanded/skybulge	//Copy+paste job from bonespear because no explosions.
-	icon_state = "sky_bulge0"
-	name = "Sky Bulge"
-	desc = "A legendary stick with a very pointy tip. Looks to be used for throwing. And jumping. Can be stubborn if you throw too much." //TODO: Be funnier.
-	force = 10 //This thing aint for robusting.
-	w_class = WEIGHT_CLASS_BULKY
-	slot_flags = SLOT_BACK
-	force_unwielded = 10
-	force_wielded = 18					//Same as regular spear. This is a utility weapon.
-	throwforce = 24						//And that utility is throwing. 24 so it takes 5 hits instead of 4.
-	throw_speed = 4
-	embedded_impact_pain_multiplier = 0	//If you somehow embed this, it's not going to hurt.
-	armour_penetration = 15				//Same as Bone Spear
-	embed_chance = 0					//Would ruin the whole theme of the thing.
-	hitsound = 'sound/weapons/bladeslice.ogg'
-	attack_verb = list("attacked", "poked", "jabbed", "torn", "gored", "lanced") //Added lanced for flavour.
-	sharpness = IS_SHARP
-	var/maxdist = 16
-	var/throw_cooldown = 0				//Should equate to half a second. Not supposed to be varedited.
-
-/obj/item/weapon/twohanded/skybulge/update_icon()
-	icon_state = "sky_bulge[wielded]"
-
-/obj/item/weapon/twohanded/skybulge/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback)  //Throw cooldown and offhand-proofing.
-	if(throw_cooldown > world.time)
-		var/mob/user = thrownby
-		user.put_in_hands(src)
-		return
-	unwield(src)
-	..()
-
-/obj/item/weapon/twohanded/skybulge/throw_impact(atom/target) //Praise be the ratvar spear for showing me how to use this proc.
-	var/turf/turfhit = get_turf(target)
-	var/mob/user = thrownby
-	var/turf/source = get_turf(thrownby)
-
-	if(source.z == ZLEVEL_STATION && get_dist(turfhit, source) < maxdist || source.z != ZLEVEL_STATION)
-		..()
-		if(do_after_mob(user, src, 5, uninterruptible = 1, progress = 0))
-			if(QDELETED(src))
-				return
-			var/turf/landing = get_turf(src)
-			if (loc != landing)
-				return
-			user.forceMove(landing)
-	throw_cooldown = world.time + 5				//Half a second between throws.
-	user.put_in_hands(src)
-	playsound(src, 'sound/weapons/laser2.ogg', 20, 1)
+	icon_state = "bone_spear[wielded]"
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/flan.dm b/code/modules/mob/living/simple_animal/hostile/flan.dm
deleted file mode 100644
index cb581b6ec5..0000000000
--- a/code/modules/mob/living/simple_animal/hostile/flan.dm
+++ /dev/null
@@ -1,89 +0,0 @@
-//Will probably eventually be expanded to fit multiple types of Flan because I am a nerd.
-
-/mob/living/simple_animal/hostile/flan
-	name = "Flan"
-	desc = "Definitely not a dessert."
-	var/casting = 0
-	icon_state = "flan"								//Required for the inheritance of casting animations.
-	icon_living = "flan"
-	icon_dead = "flan_dead"
-	turns_per_move = 5
-	environment_smash = ENVIRONMENT_SMASH_NONE
-	speed = -2
-	maxHealth = 50
-	health = 50
-	harm_intent_damage = 5
-	damage_coeff = list(BRUTE = 0.75, BURN = 1.5, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
-	melee_damage_lower = 5
-	melee_damage_upper = 10
-	attacktext = "headbutts"
-	attack_sound = 'sound/weapons/punch1.ogg'
-	a_intent = INTENT_HARM
-	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
-	unsuitable_atmos_damage = 0
-	ranged = 1
-	retreat_distance = 2
-	minimum_distance = 4
-	AIStatus = AI_IDLE
-	ranged_message = "begins to cast something"
-	ranged_cooldown_time = 15
-	var/spellname = "a generic spell!"
-	var/spellsound = 'sound/effects/spray3.ogg'
-	var/spellanimation = ATTACK_EFFECT_SMASH		//More in defines/misc.dm
-	var/spelldamagetype = BRUTE
-	var/spelldamage = 15
-	var/spellcasttime = 15							//if you varedit this also varedit ranged_cooldown_time else the mob will attack again before the spell hits, looking weird but still working
-
-/mob/living/simple_animal/hostile/flan/Initialize()		//Required for the inheritance of casting animations.
-	..()
-	casting = 0
-	icon_state = "[initial(icon_state)][casting]"
-
-/mob/living/simple_animal/hostile/flan/proc/spellaftereffects(mob/living/A)	//Inherit and override. Allows for spells that stun and do basically anything you'd want.
-	return
-
-/mob/living/simple_animal/hostile/flan/OpenFire(mob/living/A)		//Spellcasting!
-	if(isliving(A))				//A is originally an atom, this is here to prevent that from fucking this up.
-		visible_message("<span class='danger'><b>[src]</b> [ranged_message] at [A]!</span>")
-		casting = 1
-		icon_state = "[initial(icon_state)][casting]"
-		if(do_after_mob(src, A, spellcasttime, uninterruptible = 1, progress = 0))		//Break LOS to dodge.
-			if(QDELETED(src))
-				return
-			if((A in view(src)))
-				A.do_attack_animation(A, spellanimation)
-				playsound(A, spellsound, 20, 1)
-				A.apply_damage(damage = spelldamage,damagetype = spelldamagetype, def_zone = null, blocked = 0)
-				visible_message("<span class='danger'><b>[A]</b> has been hit by [spellname]</span>")
-				spellaftereffects(A,src)
-		ranged_cooldown = world.time + ranged_cooldown_time
-		casting = 0
-		icon_state = "[initial(icon_state)][casting]"
-
-/mob/living/simple_animal/hostile/flan/fire
-	name = "Flame Flan"
-	desc = "You'd think they'd be spicy, but nobody has ever tried."
-	icon_state = "fireflan"
-	icon_living = "fireflan"
-	icon_dead = "fireflan_dead"
-	damage_coeff = list(BRUTE = 1.5, BURN = 0.75, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
-	spellname = "a Fire spell!"
-	spellsound = 'sound/effects/fuse.ogg'
-	spelldamagetype = BURN
-	spellcasttime = 20
-
-/mob/living/simple_animal/hostile/flan/fire/spellaftereffects(mob/living/A)
-	A.adjust_fire_stacks(2)
-	A.IgniteMob()
-
-/mob/living/simple_animal/hostile/flan/water
-	name = "Water Flan"
-	desc = "Is pretty likely to dampen your spirits."
-	icon_state = "flan"
-	icon_living = "flan"
-	icon_dead = "flan_dead"
-	spellname = "a Water spell!"
-	spelldamage = 10			//Basic flan, learn the dance with em.
-
-/mob/living/simple_animal/hostile/flan/water/spellaftereffects(mob/living/A)
-	A.ExtinguishMob()
\ No newline at end of file
diff --git a/tgstation.dme b/tgstation.dme
index a5d9cc06b9..2e2f6c5e7e 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1741,7 +1741,6 @@
 #include "code\modules\mob\living\simple_animal\hostile\creature.dm"
 #include "code\modules\mob\living\simple_animal\hostile\eyeballs.dm"
 #include "code\modules\mob\living\simple_animal\hostile\faithless.dm"
-#include "code\modules\mob\living\simple_animal\hostile\flan.dm"
 #include "code\modules\mob\living\simple_animal\hostile\giant_spider.dm"
 #include "code\modules\mob\living\simple_animal\hostile\headcrab.dm"
 #include "code\modules\mob\living\simple_animal\hostile\hivebot.dm"