diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index 5681313f065..92f498ec907 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -17,6 +17,8 @@
 #define CLICK_CD_TKSTRANGLE 10
 #define CLICK_CD_POINT 10
 #define CLICK_CD_RESIST 20
+#define CLICK_CD_CLICK_ABILITY 6
+#define CLICK_CD_RAPID 2
 
 //Sizes of mobs, used by mob/living/var/mob_size
 #define MOB_SIZE_TINY 0
diff --git a/code/datums/spell.dm b/code/datums/spell.dm
index 7772cb6b6e0..6aaedf5bd68 100644
--- a/code/datums/spell.dm
+++ b/code/datums/spell.dm
@@ -3,9 +3,53 @@
 
 /obj/effect/proc_holder
 	var/panel = "Debug"//What panel the proc holder needs to go on.
+	var/active = FALSE //Used by toggle based abilities.
+	var/ranged_mousepointer
 
 var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin verb for now
 
+/obj/effect/proc_holder/proc/InterceptClickOn(mob/living/user, params, atom/A)
+	if(user.ranged_ability != src)
+		to_chat(user, "<span class='warning'><b>[user.ranged_ability.name]</b> has been disabled.")
+		user.ranged_ability.remove_ranged_ability(user)
+		return TRUE //TRUE for failed, FALSE for passed.
+	user.next_click = world.time + CLICK_CD_CLICK_ABILITY
+	user.face_atom(A)
+	return FALSE
+
+/obj/effect/proc_holder/proc/add_ranged_ability(mob/living/user, var/msg)
+	if(!user || !user.client)
+		return
+	if(user.ranged_ability && user.ranged_ability != src)
+		to_chat(user, "<span class='warning'><b>[user.ranged_ability.name]</b> has been replaced by <b>[name]</b>.")
+		user.ranged_ability.remove_ranged_ability(user)
+	user.ranged_ability = src
+	user.client.click_intercept = user.ranged_ability
+	add_mousepointer(user.client)
+	active = TRUE
+	if(msg)
+		to_chat(user, msg)
+	update_icon()
+
+/obj/effect/proc_holder/proc/add_mousepointer(client/C)
+	if(C && ranged_mousepointer && C.mouse_pointer_icon == initial(C.mouse_pointer_icon))
+		C.mouse_pointer_icon = ranged_mousepointer
+
+/obj/effect/proc_holder/proc/remove_mousepointer(client/C)
+	if(C && ranged_mousepointer && C.mouse_pointer_icon == ranged_mousepointer)
+		C.mouse_pointer_icon = initial(C.mouse_pointer_icon)
+
+/obj/effect/proc_holder/proc/remove_ranged_ability(mob/living/user, var/msg)
+	if(!user || !user.client || (user.ranged_ability && user.ranged_ability != src)) //To avoid removing the wrong ability
+		return
+	user.ranged_ability = null
+	user.client.click_intercept = null
+	remove_mousepointer(user.client)
+	active = FALSE
+	if(msg)
+		to_chat(user, msg)
+	update_icon()
+
 /obj/effect/proc_holder/spell
 	name = "Spell"
 	desc = "A wizard spell"
@@ -178,7 +222,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 	if(prob(critfailchance))
 		critfail(targets)
 	else
-		cast(targets)
+		cast(targets, user = user)
 	after_cast(targets)
 
 /obj/effect/proc_holder/spell/proc/before_cast(list/targets)
@@ -224,7 +268,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 				smoke.set_up(smoke_amt, 0, location) // same here
 				smoke.start()
 
-/obj/effect/proc_holder/spell/proc/cast(list/targets)
+/obj/effect/proc_holder/spell/proc/cast(list/targets, mob/user = usr)
 	return
 
 /obj/effect/proc_holder/spell/proc/critfail(list/targets)
diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm
index fec73a18f8b..d08af293415 100644
--- a/code/datums/spells/wizard.dm
+++ b/code/datums/spells/wizard.dm
@@ -252,7 +252,7 @@
 	duration = 300
 	sound="sound/magic/Blind.ogg"
 
-/obj/effect/proc_holder/spell/dumbfire/fireball
+/obj/effect/proc_holder/spell/fireball
 	name = "Fireball"
 	desc = "This spell fires a fireball at a target and does not require wizard garb."
 
@@ -263,30 +263,64 @@
 	invocation_type = "shout"
 	range = 20
 	cooldown_min = 20 //10 deciseconds reduction per rank
-
-	proj_icon_state = "fireball"
-	proj_name = "a fireball"
-	proj_type = "/obj/effect/proc_holder/spell/turf/fireball"
-
-	proj_lifespan = 200
-	proj_step_delay = 1
-
-	action_icon_state = "fireball"
+	var/fireball_type = /obj/item/projectile/magic/fireball
+	action_icon_state = "fireball0"
 	sound = "sound/magic/Fireball.ogg"
 
-/obj/effect/proc_holder/spell/turf/fireball/cast(var/turf/T)
-	explosion(T, -1, 0, 2, 3, 0, flame_range = 2)
+	active = FALSE
 
+/obj/effect/proc_holder/spell/fireball/Click()
+	var/mob/living/user = usr
+	if(!istype(user))
+		return
 
-/obj/effect/proc_holder/spell/targeted/inflict_handler/fireball
-	amt_dam_brute = 20
-	amt_dam_fire = 25
+	var/msg
 
-/obj/effect/proc_holder/spell/targeted/explosion/fireball
-	ex_severe = -1
-	ex_heavy = -1
-	ex_light = 2
-	ex_flash = 5
+	if(!can_cast(user))
+		msg = "<span class='warning'>You can no longer cast Fireball.</span>"
+		remove_ranged_ability(user, msg)
+		return
+
+	if(active)
+		msg = "<span class='notice'>You extinguish your fireball...for now.</span>"
+		remove_ranged_ability(user, msg)
+	else
+		msg = "<span class='notice'>Your prepare to cast your fireball spell! <B>Left-click to cast at a target!</B></span>"
+		add_ranged_ability(user, msg)
+
+/obj/effect/proc_holder/spell/fireball/update_icon()
+	if(!action)
+		return
+	action.button_icon_state = "fireball[active]"
+	action.UpdateButtonIcon()
+
+/obj/effect/proc_holder/spell/fireball/InterceptClickOn(mob/living/user, params, atom/target)
+	if(..())
+		return FALSE
+
+	if(!cast_check(0, user))
+		remove_ranged_ability(user)
+		return FALSE
+
+	var/list/targets = list(target)
+	perform(targets,user = user)
+
+	return TRUE
+
+/obj/effect/proc_holder/spell/fireball/cast(list/targets, mob/living/user = usr)
+	var/target = targets[1] //There is only ever one target for fireball
+	var/turf/T = user.loc
+	var/turf/U = get_step(user, user.dir) // Get the tile infront of the move, based on their direction
+	if(!isturf(U) || !isturf(T))
+		return 0
+
+	var/obj/item/projectile/magic/fireball/FB = new fireball_type(user.loc)
+	FB.current = get_turf(user)
+	FB.preparePixelProjectile(target, get_turf(target), user)
+	FB.fire()
+	user.newtonian_move(get_dir(U, T))
+
+	return 1
 
 /obj/effect/proc_holder/spell/aoe_turf/repulse
 	name = "Repulse"
@@ -303,8 +337,7 @@
 	action_icon_state = "repulse"
 	sound = 'sound/magic/Repulse.ogg'
 
-/obj/effect/proc_holder/spell/aoe_turf/repulse/cast(list/targets)
-	var/mob/user = usr
+/obj/effect/proc_holder/spell/aoe_turf/repulse/cast(list/targets, mob/user = usr)
 	var/list/thrownatoms = list()
 	var/atom/throwtarget
 	var/distfromcaster
diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
index 59ca735f843..49b64064dbe 100644
--- a/code/game/area/Space Station 13 areas.dm	
+++ b/code/game/area/Space Station 13 areas.dm	
@@ -58,6 +58,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 	var/tele_proof = 0
 	var/no_teleportlocs = 0
+	
+	var/outdoors = 0 //For space, the asteroid, lavaland, etc. Used with blueprints to determine if we are adding a new area (vs editing a station room)
 
 /*Adding a wizard area teleport list because motherfucking lag -- Urist*/
 /*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/
@@ -121,6 +123,7 @@ var/list/ghostteleportlocs = list()
 	power_light = 0
 	power_equip = 0
 	power_environ = 0
+	outdoors = 1
 	ambientsounds = list('sound/ambience/ambispace.ogg','sound/music/title2.ogg','sound/music/space.ogg','sound/music/traitor.ogg')
 
 /area/space/atmosalert()
@@ -551,6 +554,7 @@ var/list/ghostteleportlocs = list()
 	name = "\improper Asteroid - Underground"
 	icon_state = "cave"
 	requires_power = 0
+	outdoors = 1
 
 /area/asteroid/artifactroom
 	name = "\improper Asteroid - Artifact"
diff --git a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
index 83c29ed9109..a9899b33462 100644
--- a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
+++ b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
@@ -7,7 +7,6 @@
 	helptext = "Grants us thermal vision or flash protection. We will become a lot more vulnerable to flash-based devices while thermal vision is active."
 	chemical_cost = 0
 	dna_cost = 2 //Would be 1 without thermal vision
-	var/active = 0 //Whether or not vision is enhanced
 
 /obj/effect/proc_holder/changeling/augmented_eyesight/sting_action(mob/living/carbon/human/user)
 	if(!istype(user))
diff --git a/code/game/gamemodes/changeling/powers/strained_muscles.dm b/code/game/gamemodes/changeling/powers/strained_muscles.dm
index 92cf9ad7fdf..28884c2653a 100644
--- a/code/game/gamemodes/changeling/powers/strained_muscles.dm
+++ b/code/game/gamemodes/changeling/powers/strained_muscles.dm
@@ -9,11 +9,11 @@
 	dna_cost = 1
 	req_human = 1
 	var/stacks = 0 //Increments every 5 seconds; damage increases over time
-	var/active = 0 //Whether or not you are a hedgehog
+	var/enabled = 0 //Whether or not you are a hedgehog
 
 /obj/effect/proc_holder/changeling/strained_muscles/sting_action(var/mob/living/carbon/user)
-	active = !active
-	if(active)
+	enabled = !enabled
+	if(enabled)
 		to_chat(user, "<span class='notice'>Our muscles tense and strengthen.</span>")
 	else
 		user.status_flags &= ~GOTTAGOFAST
@@ -23,10 +23,10 @@
 			user.Weaken(3)
 			user.emote("gasp")
 
-	while(active)
+	while(enabled)
 		user.status_flags |= GOTTAGOFAST
 		if(user.stat || user.staminaloss >= 90)
-			active = 0 //Let's use something exact instead of !active where we can.
+			enabled = 0 //Let's use something exact instead of !enabled where we can.
 			to_chat(user, "<span class='notice'>Our muscles relax without the energy to strengthen them.</span>")
 			user.status_flags &= ~GOTTAGOFAST
 			user.Weaken(2)
@@ -42,7 +42,7 @@
 
 		sleep(40)
 
-	while(!active) //Damage stacks decrease fairly rapidly while not in sanic mode
+	while(!enabled) //Damage stacks decrease fairly rapidly while not in sanic mode
 		if(stacks >= 1)
 			stacks--
 		sleep(20)
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index 34886dde2e0..8db8000c7fe 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -60,7 +60,7 @@
 				switch(href_list["school"])
 					if("destruction")
 						M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(null))
-						M.mind.AddSpell(new /obj/effect/proc_holder/spell/dumbfire/fireball(null))
+						M.mind.AddSpell(new /obj/effect/proc_holder/spell/fireball(null))
 						to_chat(M, "<B>Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned powerful, destructive spells. You are able to cast magic missile and fireball.")
 					if("bluespace")
 						M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(null))
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index 0177cc8cec8..024865807bf 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -103,7 +103,7 @@
 
 /datum/spellbook_entry/fireball
 	name = "Fireball"
-	spell_type = /obj/effect/proc_holder/spell/dumbfire/fireball
+	spell_type = /obj/effect/proc_holder/spell/fireball
 	log_name = "FB"
 
 /datum/spellbook_entry/magicm
@@ -714,7 +714,7 @@
 	return
 
 /obj/item/weapon/spellbook/oneuse/fireball
-	spell = /obj/effect/proc_holder/spell/dumbfire/fireball
+	spell = /obj/effect/proc_holder/spell/fireball
 	spellname = "fireball"
 	icon_state ="bookfireball"
 	desc = "This book feels warm to the touch."
diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
index 42b19e71edc..7fd6cb0946f 100644
--- a/code/game/objects/effects/overlays.dm
+++ b/code/game/objects/effects/overlays.dm
@@ -18,6 +18,33 @@
 		..()
 		spawn(10) 
 			qdel(src)
+			
+/obj/effect/overlay/palmtree_r
+	name = "Palm tree"
+	icon = 'icons/misc/beach2.dmi'
+	icon_state = "palm1"
+	density = 1
+	layer = 5
+	anchored = 1
+
+/obj/effect/overlay/palmtree_l
+	name = "Palm tree"
+	icon = 'icons/misc/beach2.dmi'
+	icon_state = "palm2"
+	density = 1
+	layer = 5
+	anchored = 1
+
+/obj/effect/overlay/coconut
+	name = "Coconuts"
+	icon = 'icons/misc/beach.dmi'
+	icon_state = "coconuts"
+
+/obj/effect/overlay/adminoverlay
+	name = "adminoverlay"
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "admin"
+	layer = 4.1
 
 /obj/effect/overlay/temp
 	anchored = 1
@@ -55,7 +82,6 @@
 /obj/effect/overlay/temp/guardian/phase/out
 	icon_state = "phaseout"
 	
-
 /obj/effect/overlay/temp/emp
 	name = "emp sparks"
 	icon = 'icons/effects/effects.dmi'
@@ -63,9 +89,22 @@
 
 /obj/effect/overlay/temp/emp/pulse
 	name = "emp pulse"
-	icon_state = "emp pulse"
+	icon_state = "emppulse"
 	duration = 8
 	randomdir = 0
+	
+/obj/effect/overlay/temp/heal //color is white by default, set to whatever is needed
+	name = "healing glow"
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "heal"
+	duration = 15
+
+/obj/effect/overlay/temp/heal/New(loc, colour)
+	..()
+	pixel_x = rand(-12, 12)
+	pixel_y = rand(-9, 0)
+	if(colour)
+		color = colour
 
 /obj/effect/overlay/temp/kinetic_blast
 	name = "kinetic explosion"
@@ -73,34 +112,6 @@
 	icon_state = "kinetic_blast"
 	layer = 4.1
 	duration = 4
-
-/obj/effect/overlay/palmtree_r
-	name = "Palm tree"
-	icon = 'icons/misc/beach2.dmi'
-	icon_state = "palm1"
-	density = 1
-	layer = 5
-	anchored = 1
-
-/obj/effect/overlay/palmtree_l
-	name = "Palm tree"
-	icon = 'icons/misc/beach2.dmi'
-	icon_state = "palm2"
-	density = 1
-	layer = 5
-	anchored = 1
-
-/obj/effect/overlay/coconut
-	name = "Coconuts"
-	icon = 'icons/misc/beach.dmi'
-	icon_state = "coconuts"
-
-/obj/effect/overlay/adminoverlay
-	name = "adminoverlay"
-	icon = 'icons/effects/effects.dmi'
-	icon_state = "admin"
-	layer = 4.1
-
 	
 /obj/effect/overlay/temp/decoy
 	desc = "It's a decoy!"
@@ -118,8 +129,17 @@
 /obj/effect/overlay/temp/decoy/fading/New(loc, atom/mimiced_atom)
 	..()
 	animate(src, alpha = 0, time = duration)
-	
 
+/obj/effect/overlay/temp/cult
+	icon = 'icons/effects/effects.dmi'
+	randomdir = 0
+	duration = 10
+
+/obj/effect/overlay/temp/cult/sparks
+	randomdir = 1
+	name = "blood sparks"
+	icon_state = "bloodsparkles"	
+	
 /obj/effect/overlay/temp/dir_setting
 	randomdir = FALSE
 
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index 198c6ce45aa..07c7e54bb3c 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -153,7 +153,7 @@
 
 
 /obj/item/areaeditor/proc/get_area_type(var/area/A = get_area())
-	if(istype(A,/area/space))
+	if(A.outdoors)
 		return AREA_SPACE
 	var/list/SPECIALS = list(
 		/area/shuttle,
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 11a0bae8849..4d03bfcdb27 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -36,6 +36,14 @@
 	..()
 	icon_state = "tree_[rand(1, 6)]"
 
+/obj/structure/flora/tree/palm
+	icon = 'icons/misc/beach2.dmi'
+	icon_state = "palm1"
+
+/obj/structure/flora/tree/palm/New()
+	..()
+	icon_state = pick("palm1","palm2")
+	pixel_x = 0	
 
 //grass
 /obj/structure/flora/grass
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index a328769d8dc..cb8f693b5a5 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -43,7 +43,35 @@
 		new /obj/item/weapon/ore/glass(src)
 		new /obj/item/weapon/ore/glass(src) //Make some sand if you shovel grass
 		to_chat(user, "<span class='notice'>You shovel the grass.</span>")
+		playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1)
 		make_plating()
+		
+// NEEDS TO BE UPDATED
+/turf/simulated/floor/basalt //By your powers combined, I am captain planet
+	name = "volcanic floor"
+	icon = 'icons/turf/floors.dmi'
+	icon_state = "basalt0"
+	oxygen = 14
+	nitrogen = 23
+	temperature = 300
+	
+/turf/simulated/floor/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/weapon/shovel))
+		new /obj/item/weapon/ore/glass/basalt(src)
+		new /obj/item/weapon/ore/glass/basalt(src)
+		user.visible_message("<span class='notice'>[user] digs up [src].</span>", "<span class='notice'>You uproot [src].</span>")
+		playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1)
+		make_plating()
+	else
+		return
+
+/turf/simulated/floor/basalt/New()
+	..()
+	if(prob(15))
+		icon_state = "basalt[rand(0, 12)]"
+		switch(icon_state)
+			if("basalt1", "basalt2", "basalt3")
+				set_light(1, 1)
 
 /turf/simulated/floor/carpet
 	name = "Carpet"
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index c6f7e54a003..fa4dcfaf851 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -192,14 +192,17 @@
 *   Item Adding
 ********************/
 
+/obj/machinery/smartfridge/default_deconstruction_screwdriver(mob/user, obj/item/weapon/screwdriver/S)
+	. = ..(user, icon_state, icon_state, S)
+	
+	overlays.Cut()
+	if(panel_open)
+		overlays += image(icon, "[initial(icon_state)]-panel")
+	
+	return .
+
 /obj/machinery/smartfridge/attackby(var/obj/item/O as obj, var/mob/user as mob)
-	if(istype(O, /obj/item/weapon/screwdriver) && anchored)
-		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
-		panel_open = !panel_open
-		to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.")
-		overlays.Cut()
-		if(panel_open)
-			overlays += image(icon, "[initial(icon_state)]-panel")
+	if(default_deconstruction_screwdriver(user, O))
 		return
 
 	if(exchange_parts(user, O))
diff --git a/code/modules/mining/lavaland/colossus_loot.dm b/code/modules/mining/lavaland/colossus_loot.dm
new file mode 100644
index 00000000000..6e18a4831e3
--- /dev/null
+++ b/code/modules/mining/lavaland/colossus_loot.dm
@@ -0,0 +1,491 @@
+//Black Box
+
+/obj/machinery/smartfridge/black_box
+	name = "black box"
+	desc = "A completely indestructible chunk of crystal, rumoured to predate the start of this universe. It looks like you could store things inside it."
+	icon = 'icons/obj/lavaland/artefacts.dmi'
+	icon_state = "blackbox"
+	icon_on = "blackbox"
+	icon_off = "blackbox"
+	luminosity = 8
+	max_n_of_items = INFINITY
+	unacidable = 1
+	pixel_y = -4
+	use_power = 0
+	var/memory_saved = FALSE
+	var/list/stored_items = list()
+	var/static/list/blacklist = typecacheof(list(/obj/item/weapon/spellbook))
+
+/obj/machinery/smartfridge/black_box/update_icon()
+	return
+
+/obj/machinery/smartfridge/black_box/accept_check(obj/item/O)
+	if(!istype(O))
+		return FALSE
+	if(is_type_in_typecache(O, blacklist))
+		return FALSE
+	return TRUE
+
+/obj/machinery/smartfridge/black_box/New()
+	var/static/obj/machinery/smartfridge/black_box/current
+	if(current && current != src)
+		qdel(src, force=TRUE)
+		return
+	current = src
+	ReadMemory()
+	. = ..()
+
+/obj/machinery/smartfridge/black_box/process()
+	..()
+	if(!memory_saved && ticker.current_state == GAME_STATE_FINISHED)
+		WriteMemory()
+
+/obj/machinery/smartfridge/black_box/proc/WriteMemory()
+	var/savefile/S = new /savefile("data/npc_saves/Blackbox.sav")
+	stored_items = list()
+
+	for(var/obj/O in (contents-component_parts))
+		stored_items += O.type
+
+	S["stored_items"]				<< stored_items
+	memory_saved = TRUE
+
+/obj/machinery/smartfridge/black_box/proc/ReadMemory()
+	var/savefile/S = new /savefile("data/npc_saves/Blackbox.sav")
+	S["stored_items"] 		>> stored_items
+
+	if(isnull(stored_items))
+		stored_items = list()
+
+	for(var/item in stored_items)
+		create_item(item)
+
+//in it's own proc to avoid issues with items that nolonger exist in the code base.
+//try catch doesn't always prevent byond runtimes from halting a proc,
+/obj/machinery/smartfridge/black_box/proc/create_item(item_type)
+	new item_type(src)
+
+/obj/machinery/smartfridge/black_box/Destroy(force = FALSE)
+	if(force)
+		for(var/thing in src)
+			qdel(thing)
+		return ..()
+	else
+		return QDEL_HINT_LETMELIVE
+
+
+//No taking it apart
+
+/obj/machinery/smartfridge/black_box/default_deconstruction_screwdriver()
+	return
+
+/obj/machinery/smartfridge/black_box/exchange_parts()
+	return
+
+/obj/machinery/smartfridge/black_box/default_unfasten_wrench()
+	return
+
+/obj/machinery/smartfridge/black_box/default_deconstruction_crowbar()
+	return
+
+///Anomolous Crystal///
+
+/obj/machinery/anomalous_crystal
+	name = "anomalous crystal"
+	desc = "A strange chunk of crystal, being in the presence of it fills you with equal parts excitement and dread."
+	icon = 'icons/obj/lavaland/artefacts.dmi'
+	icon_state = "anomaly_crystal"
+	luminosity = 8
+	use_power = 0
+	density = 1
+	unacidable = 1
+	var/activation_method = "touch"
+	var/activation_damage_type = null
+	var/last_use_timer = 0
+	var/cooldown_add = 30
+	var/list/affected_targets = list()
+	var/activation_sound = 'sound/effects/break_stone.ogg'
+
+/obj/machinery/anomalous_crystal/New()
+	activation_method = pick("touch","laser","bullet","energy","bomb","mob_bump","weapon","speech") // "heat" removed due to lack of is_hot()
+	..()
+
+/obj/machinery/anomalous_crystal/hear_talk(mob/speaker, message)
+	..()
+	if(isliving(speaker) && message)
+		ActivationReaction(speaker, "speech")
+
+/obj/machinery/anomalous_crystal/attack_hand(mob/user)
+	..()
+	ActivationReaction(user,"touch")
+
+/obj/machinery/anomalous_crystal/attackby(obj/item/I, mob/user, params)
+	ActivationReaction(user,"weapon")
+	..()
+
+/obj/machinery/anomalous_crystal/bullet_act(obj/item/projectile/P, def_zone)
+	..()
+	if(istype(P, /obj/item/projectile/magic))
+		ActivationReaction(P.firer, "magic", P.damage_type)
+		return
+	ActivationReaction(P.firer, P.flag, P.damage_type)
+
+/obj/machinery/anomalous_crystal/proc/ActivationReaction(mob/user, method, damtype)
+	if(world.time < last_use_timer)
+		return 0
+	if(activation_damage_type && activation_damage_type != damtype)
+		return 0
+	if(method != activation_method)
+		return 0
+	last_use_timer = (world.time + cooldown_add)
+	playsound(user, activation_sound, 100, 1)
+	return 1
+
+/obj/machinery/anomalous_crystal/Bumped(atom/AM as mob|obj)
+	..()
+	if(ismob(AM))
+		ActivationReaction(AM,"mob_bump")
+
+/obj/machinery/anomalous_crystal/ex_act()
+	ActivationReaction(null,"bomb")
+
+/obj/machinery/anomalous_crystal/random/New()//Just a random crysal spawner for loot
+	var/random_crystal = pick(typesof(/obj/machinery/anomalous_crystal) - /obj/machinery/anomalous_crystal/random - /obj/machinery/anomalous_crystal)
+	new random_crystal(loc)
+	qdel(src)
+
+/obj/machinery/anomalous_crystal/honk //Strips and equips you as a clown. I apologize for nothing
+	activation_method = "mob_bump"
+	activation_sound = 'sound/items/bikehorn.ogg'
+
+/obj/machinery/anomalous_crystal/honk/ActivationReaction(mob/user)
+	if(..() && ishuman(user) && !(user in affected_targets))
+		var/mob/living/carbon/human/H = user
+		for(var/obj/item/W in H)
+			H.unEquip(W)
+		var/datum/job/clown/C = new /datum/job/clown()
+		C.equip(H)
+		qdel(C)
+		affected_targets.Add(H)
+
+/obj/machinery/anomalous_crystal/honk/New()
+	..()
+	activation_method = pick("mob_bump","speech")
+
+/obj/machinery/anomalous_crystal/theme_warp //Warps the area you're in to look like a new one
+	activation_method = "touch"
+	cooldown_add = 200
+	var/terrain_theme = "winter"
+	var/NewTerrainFloors
+	var/NewTerrainWalls
+	var/NewTerrainChairs
+	var/NewTerrainTables
+	var/list/NewFlora = list()
+	var/florachance = 8
+
+/obj/machinery/anomalous_crystal/theme_warp/New()
+	..()
+	terrain_theme = pick("lavaland","winter","jungle","alien")
+	switch(terrain_theme)
+		if("lavaland")//Depressurizes the place... and free cult metal, I guess.
+			NewTerrainFloors = /turf/simulated/floor/basalt // Needs to be updated after turf update
+			NewTerrainWalls = /turf/simulated/wall/cult
+			NewFlora = list(/mob/living/simple_animal/hostile/asteroid/goldgrub)
+			florachance = 1
+		if("winter") //Snow terrain is slow to move in and cold! Get the assistants to shovel your driveway.
+			NewTerrainFloors = /turf/simulated/floor/snow // Needs to be updated after turf update
+			NewTerrainWalls = /turf/simulated/wall/mineral/wood
+			NewTerrainChairs = /obj/structure/stool/bed/chair/wood/normal
+			NewTerrainTables = /obj/structure/table/glass
+			NewFlora = list(/obj/structure/flora/grass/green, /obj/structure/flora/grass/brown, /obj/structure/flora/grass/both)
+		if("jungle") //Beneficial due to actually having breathable air. Plus, monkeys and bows and arrows.
+			NewTerrainFloors = /turf/simulated/floor/grass
+			NewTerrainWalls = /turf/simulated/wall/mineral/sandstone
+			NewTerrainChairs = /obj/structure/stool/bed/chair/wood/normal
+			NewTerrainTables = /obj/structure/table/woodentable
+			NewFlora = list(/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/fernybush, /obj/structure/flora/ausbushes/leafybush,
+							/obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/tree/palm, /mob/living/carbon/human/monkey,
+							/obj/item/weapon/gun/projectile/bow, /obj/item/weapon/storage/backpack/quiver/full)
+			florachance = 20
+		if("alien") //Beneficial, turns stuff into alien alloy which is useful to cargo and research. Also repairs atmos.
+			NewTerrainFloors = /turf/simulated/floor/mineral/abductor
+			NewTerrainWalls = /turf/simulated/wall/mineral/abductor
+			NewTerrainChairs = /obj/structure/stool/bed/abductor //ayys apparently don't have chairs. An entire species of people who only recline.
+			NewTerrainTables = /obj/machinery/optable/abductor
+
+/obj/machinery/anomalous_crystal/theme_warp/ActivationReaction(mob/user, method)
+	if(..())
+		var/area/A = get_area(src)
+		if(!A.outdoors && !(A in affected_targets))
+			for(var/atom/Stuff in A)
+				if(isturf(Stuff))
+					var/turf/T = Stuff
+					if((isspaceturf(T) || isfloorturf(T)) && NewTerrainFloors)
+						var/turf/simulated/O = T.ChangeTurf(NewTerrainFloors)
+						if(O.air)
+							var/datum/gas_mixture/G = O.air
+							G.copy_from(O.air)
+						if(prob(florachance) && NewFlora.len && !is_blocked_turf(O))
+							var/atom/Picked = pick(NewFlora)
+							new Picked(O)
+						continue
+					if(iswallturf(T) && NewTerrainWalls)
+						T.ChangeTurf(NewTerrainWalls)
+						continue
+				if(istype(Stuff, /obj/structure/stool/bed/chair) && NewTerrainChairs)
+					var/obj/structure/stool/bed/chair/Original = Stuff
+					var/obj/structure/stool/bed/chair/C = new NewTerrainChairs(Original.loc)
+					C.dir = Original.dir
+					qdel(Stuff)
+					continue
+				if(istype(Stuff, /obj/structure/table) && NewTerrainTables)
+					new NewTerrainTables(Stuff.loc)
+					qdel(Stuff)
+					continue
+			affected_targets += A
+
+/obj/machinery/anomalous_crystal/emitter //Generates a projectile when interacted with
+	activation_method = "touch"
+	cooldown_add = 50
+	var/generated_projectile = /obj/item/projectile/beam/emitter
+
+/obj/machinery/anomalous_crystal/emitter/New()
+	..()
+	generated_projectile = pick(/obj/item/projectile/magic/fireball/infernal,/obj/item/projectile/magic/spellblade,
+								 /obj/item/projectile/bullet/meteorshot, /obj/item/projectile/beam/xray, /obj/item/projectile/colossus)
+
+/obj/machinery/anomalous_crystal/emitter/ActivationReaction(mob/user, method)
+	if(..())
+		var/obj/item/projectile/P = new generated_projectile(get_turf(src))
+		P.dir = dir
+		switch(dir)
+			if(NORTH)
+				P.yo = 20
+				P.xo = 0
+			if(EAST)
+				P.yo = 0
+				P.xo = 20
+			if(WEST)
+				P.yo = 0
+				P.xo = -20
+			else
+				P.yo = -20
+				P.xo = 0
+		P.fire()
+
+/obj/machinery/anomalous_crystal/dark_reprise //Revives anyone nearby, but turns them into shadowpeople and renders them uncloneable, so the crystal is your only hope of getting up again if you go down.
+	activation_method = "touch"
+	activation_sound = 'sound/hallucinations/growl1.ogg'
+
+/obj/machinery/anomalous_crystal/dark_reprise/ActivationReaction(mob/user, method)
+	if(..())
+		for(var/i in range(1, src))
+			if(isturf(i))
+				PoolOrNew(/obj/effect/overlay/temp/cult/sparks, i)
+				continue
+			if(ishuman(i))
+				var/mob/living/carbon/human/H = i
+				if(H.stat == DEAD)
+					H.set_species("Shadow")
+					H.revive()
+					H.disabilities |= NOCLONE //Free revives, but significantly limits your options for reviving except via the crystal
+					H.grab_ghost(force = TRUE)
+
+/obj/machinery/anomalous_crystal/helpers //Lets ghost spawn as helpful creatures that can only heal people slightly. Incredibly fragile and they can't converse with humans
+	activation_method = "touch"
+	var/ready_to_deploy = 0
+
+/obj/machinery/anomalous_crystal/helpers/ActivationReaction(mob/user, method)
+	if(..() && !ready_to_deploy)
+		ready_to_deploy = 1
+		notify_ghosts("An anomalous crystal has been activated in [get_area(src)]! This crystal can always be used by ghosts hereafter.", enter_link = "<a href=?src=\ref[src];ghostjoin=1>(Click to enter)</a>", source = src, action = NOTIFY_ATTACK)
+
+/obj/machinery/anomalous_crystal/helpers/attack_ghost(mob/dead/observer/user)
+	..()
+	if(ready_to_deploy)
+		var/be_helper = alert("Become a Lightgeist? (Warning, You can no longer be cloned!)",,"Yes","No")
+		if(be_helper == "No")
+			return
+		var/mob/living/simple_animal/hostile/lightgeist/W = new /mob/living/simple_animal/hostile/lightgeist(get_turf(loc))
+		W.key = user.key
+
+/obj/machinery/anomalous_crystal/helpers/Topic(href, href_list)
+	if(href_list["ghostjoin"])
+		var/mob/dead/observer/ghost = usr
+		if(istype(ghost))
+			attack_ghost(ghost)
+
+/mob/living/simple_animal/hostile/lightgeist
+	name = "lightgeist"
+	desc = "This small floating creature is a completely unknown form of life... being near it fills you with a sense of tranquility."
+	icon_state = "lightgeist"
+	icon_living = "lightgeist"
+	icon_dead = "butterfly_dead"
+	turns_per_move = 1
+	response_help = "waves away"
+	response_disarm = "brushes aside"
+	response_harm = "disrupts"
+	speak_emote = list("oscillates")
+	maxHealth = 2
+	health = 2
+	harm_intent_damage = 1
+	friendly = "mends"
+	density = 0
+	flying = 1
+	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
+	ventcrawler = 2
+	mob_size = MOB_SIZE_TINY
+	gold_core_spawnable = 0
+	speak_emote = list("warps")
+	damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
+	luminosity = 4
+	faction = list("neutral")
+	universal_understand = 1
+	del_on_death = 1
+	unsuitable_atmos_damage = 0
+	flying = 1
+	minbodytemp = 0
+	maxbodytemp = 1500
+	environment_smash = 0
+	AIStatus = AI_OFF
+	stop_automated_movement = 1
+	var/heal_power = 5
+
+/mob/living/simple_animal/hostile/lightgeist/New()
+	..()
+	verbs -= /mob/living/verb/pulled
+	verbs -= /mob/verb/me_verb
+	var/datum/atom_hud/medsensor = huds[DATA_HUD_MEDICAL_ADVANCED]
+	medsensor.add_hud_to(src)
+
+/mob/living/simple_animal/hostile/lightgeist/AttackingTarget()
+	..()
+	if(isliving(target) && target != src)
+		var/mob/living/L = target
+		if(L.stat < DEAD)
+			L.heal_overall_damage(heal_power, heal_power)
+			PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(target), "#80F5FF"))
+
+/mob/living/simple_animal/hostile/lightgeist/ghostize()
+	if(..())
+		death()
+
+/obj/machinery/anomalous_crystal/refresher //Deletes and recreates a copy of the item, "refreshing" it.
+	activation_method = "touch"
+	cooldown_add = 50
+	activation_sound = 'sound/magic/TIMEPARADOX2.ogg'
+	var/list/banned_items_typecache = list(/obj/item/weapon/storage, /obj/item/weapon/implant, /obj/item/weapon/implanter, /obj/item/weapon/disk/nuclear, /obj/item/projectile, /obj/item/weapon/spellbook)
+
+/obj/machinery/anomalous_crystal/refresher/New()
+	..()
+	banned_items_typecache = typecacheof(banned_items_typecache)
+
+
+/obj/machinery/anomalous_crystal/refresher/ActivationReaction(mob/user, method)
+	if(..())
+		var/list/L = list()
+		var/turf/T = get_step(src, dir)
+		PoolOrNew(/obj/effect/overlay/temp/emp/pulse,T)
+		for(var/i in T)
+			if(istype(i, /obj/item) && !is_type_in_typecache(i, banned_items_typecache))
+				var/obj/item/W = i
+				if(!W.admin_spawned)
+					L += W
+		if(L.len)
+			var/obj/item/CHOSEN = pick(L)
+			new CHOSEN.type(T)
+			qdel(CHOSEN)
+
+/obj/machinery/anomalous_crystal/possessor //Allows you to bodyjack small animals, then exit them at your leisure, but you can only do this once per activation. Because they blow up. Also, if the bodyjacked animal dies, SO DO YOU.
+	activation_method = "touch"
+
+/obj/machinery/anomalous_crystal/possessor/ActivationReaction(mob/user, method)
+	if(..())
+		if(ishuman(user))
+			var/mobcheck = 0
+			for(var/mob/living/simple_animal/A in range(1, src))
+				if(A.melee_damage_upper > 5 || A.mob_size >= MOB_SIZE_LARGE || A.ckey || A.stat)
+					break
+				var/obj/structure/closet/stasis/S = new /obj/structure/closet/stasis(A)
+				user.forceMove(S)
+				mobcheck = 1
+				break
+			if(!mobcheck)
+				new /mob/living/simple_animal/cockroach(get_step(src,dir)) //Just in case there aren't any animals on the station, this will leave you with a terrible option to possess if you feel like it
+
+/obj/structure/closet/stasis
+	name = "quantum entanglement stasis warp field"
+	desc = "You can hardly comprehend this thing... which is why you can't see it."
+	icon_state = null //This shouldn't even be visible, so if it DOES show up, at least nobody will notice
+	density = 1
+	anchored = 1
+	var/mob/living/simple_animal/holder_animal
+
+/obj/structure/closet/stasis/process()
+	if(holder_animal)
+		if(holder_animal.stat == DEAD && !qdeleted(holder_animal))
+			dump_contents()
+			holder_animal.gib()
+			return
+
+/obj/structure/closet/stasis/New()
+	..()
+	if(isanimal(loc))
+		holder_animal = loc
+	processing_objects.Add(src)
+
+/obj/structure/closet/stasis/Entered(atom/A)
+	if(isliving(A) && holder_animal)
+		var/mob/living/L = A
+		L.notransform = 1
+		L.disabilities |= MUTE
+		L.status_flags |= GODMODE
+		L.mind.transfer_to(holder_animal)
+		var/obj/effect/proc_holder/spell/targeted/exit_possession/P = new /obj/effect/proc_holder/spell/targeted/exit_possession
+		holder_animal.mind.AddSpell(P)
+		holder_animal.verbs -= /mob/living/verb/pulled
+
+/obj/structure/closet/stasis/dump_contents(var/kill = 1)
+	processing_objects.Remove(src)
+	for(var/mob/living/L in src)
+		L.disabilities &= ~MUTE
+		L.status_flags &= ~GODMODE
+		L.notransform = 0
+		if(holder_animal && !qdeleted(holder_animal))
+			holder_animal.mind.transfer_to(L)
+			L.mind.RemoveSpell(/obj/effect/proc_holder/spell/targeted/exit_possession)
+		if(kill || !isanimal(loc))
+			L.death(0)
+	..()
+
+/obj/structure/closet/stasis/emp_act()
+	return
+
+/obj/structure/closet/stasis/ex_act()
+	return
+
+/obj/effect/proc_holder/spell/targeted/exit_possession
+	name = "Exit Possession"
+	desc = "Exits the body you are possessing"
+	charge_max = 60
+	clothes_req = 0
+	invocation_type = "none"
+	max_targets = 1
+	range = -1
+	include_user = 1
+	selection_type = "view"
+	action_icon_state = "exit_possession"
+	sound = null
+
+/obj/effect/proc_holder/spell/targeted/exit_possession/cast(list/targets, mob/user = usr)
+	if(!isfloorturf(user.loc))
+		return
+	var/datum/mind/target_mind = user.mind
+	for(var/i in user)
+		if(istype(i, /obj/structure/closet/stasis))
+			var/obj/structure/closet/stasis/S = i
+			S.dump_contents(0)
+			qdel(S)
+			break
+	user.gib()
+	target_mind.RemoveSpell(/obj/effect/proc_holder/spell/targeted/exit_possession)
diff --git a/code/modules/mining/mine_areas.dm b/code/modules/mining/mine_areas.dm
index 96ef9d3104b..e07d779c9a8 100644
--- a/code/modules/mining/mine_areas.dm
+++ b/code/modules/mining/mine_areas.dm
@@ -13,6 +13,7 @@
 	power_environ = 0
 	power_equip = 0
 	power_light = 0
+	outdoors = 1
 	ambientsounds = list('sound/ambience/ambimine.ogg')
 
 /area/mine/dangerous/unexplored
@@ -25,6 +26,7 @@
 	power_environ = 0
 	power_equip = 0
 	power_light = 0
+	outdoors = 1
 	ambientsounds = list('sound/ambience/ambimine.ogg')
 
 /area/mine/lobby
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 72cc4789779..e52d0a71cac 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1,7 +1,15 @@
 
 /mob/living/Destroy()
+	if(ranged_ability)
+		ranged_ability.remove_ranged_ability(src)
 	..()
 	return QDEL_HINT_HARDDEL_NOW
+	
+/mob/living/ghostize(can_reenter_corpse = 1)
+	var/prev_client = client
+	if(..())
+		if(ranged_ability && prev_client)
+			ranged_ability.remove_mousepointer(prev_client)
 
 /mob/living/proc/OpenCraftingMenu()
 	return
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index c142c8d28d1..62dc4f26f3a 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -53,3 +53,5 @@
 	var/list/surgeries = list()	//a list of surgery datums. generally empty, they're added when the player wants them.
 
 	var/gene_stability = DEFAULT_GENE_STABILITY
+	
+	var/obj/effect/proc_holder/ranged_ability //Any ranged ability the mob has, as a click override
diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm
index a64126db27a..a2fc8e934cb 100644
--- a/code/modules/mob/living/login.dm
+++ b/code/modules/mob/living/login.dm
@@ -9,6 +9,10 @@
 	//Vents
 	if(ventcrawler)
 		to_chat(src, "<span class='notice'>You can ventcrawl! Use alt+click on vents to quickly travel about the station.</span>")
+
+	if(ranged_ability)
+		ranged_ability.add_ranged_ability(src, "<span class='notice'>You currently have <b>[ranged_ability]</b> active!</span>")		
+		
 	//Should update regardless of if we can ventcrawl, since we can end up in pipes in other ways.
 	update_pipe_vision()
 
diff --git a/code/modules/mob/living/logout.dm b/code/modules/mob/living/logout.dm
index 71e26e60858..90a640187e1 100644
--- a/code/modules/mob/living/logout.dm
+++ b/code/modules/mob/living/logout.dm
@@ -1,4 +1,6 @@
 /mob/living/Logout()
+	if(ranged_ability && client)
+		ranged_ability.remove_mousepointer(client)
 	..()
 	if(mind)
 		if(!key) //key and mind have become seperated. I believe this is for when a staff member aghosts.
diff --git a/code/modules/mob/living/simple_animal/friendly/cockroach.dm b/code/modules/mob/living/simple_animal/friendly/cockroach.dm
new file mode 100644
index 00000000000..13a226553de
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/friendly/cockroach.dm
@@ -0,0 +1,53 @@
+/mob/living/simple_animal/cockroach
+	name = "cockroach"
+	desc = "This station is just crawling with bugs."
+	icon_state = "cockroach"
+	icon_dead = "cockroach"
+	health = 1
+	maxHealth = 1
+	turns_per_move = 5
+	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)
+	minbodytemp = 270
+	maxbodytemp = INFINITY
+	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
+	mob_size = MOB_SIZE_TINY
+	response_help  = "pokes"
+	response_disarm = "shoos"
+	response_harm   = "splats"
+	density = 0
+	ventcrawler = 2
+	gold_core_spawnable = 2
+	var/squish_chance = 50
+	loot = list(/obj/effect/decal/cleanable/deadcockroach)
+	del_on_death = 1
+
+/mob/living/simple_animal/cockroach/death(gibbed)
+	if(ticker.cinematic) //If the nuke is going off, then cockroaches are invincible. Keeps the nuke from killing them, cause cockroaches are immune to nukes.
+		return
+	..()
+
+/mob/living/simple_animal/cockroach/Crossed(var/atom/movable/AM)
+	if(ismob(AM))
+		if(isliving(AM))
+			var/mob/living/A = AM
+			if(A.mob_size > MOB_SIZE_SMALL)
+				if(prob(squish_chance))
+					A.visible_message("<span class='notice'>\The [A] squashed \the [name].</span>", "<span class='notice'>You squashed \the [name].</span>")
+					death()
+				else
+					visible_message("<span class='notice'>\The [name] avoids getting crushed.</span>")
+	else
+		if(isobj(AM))
+			if(istype(AM,/obj/structure))
+				visible_message("<span class='notice'>As \the [AM] moved over \the [name], it was crushed.</span>")
+				death()
+
+/mob/living/simple_animal/cockroach/ex_act() //Explosions are a terrible way to handle a cockroach.
+	return
+
+/obj/effect/decal/cleanable/deadcockroach
+	name = "cockroach guts"
+	desc = "One bug squashed. Four more will rise in its place."
+	icon = 'icons/effects/blood.dmi'
+	icon_state = "xfloor1"
+	random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
new file mode 100644
index 00000000000..132655bc923
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -0,0 +1,266 @@
+
+#define MEDAL_PREFIX "Colossus"
+/*
+
+COLOSSUS
+
+The colossus spawns randomly wherever a lavaland creature is able to spawn. It is powerful, ancient, and extremely deadly.
+The colossus has a degree of sentience, proving this in speech during its attacks.
+
+It acts as a melee creature, chasing down and attacking its target while also using different attacks to augment its power that increase as it takes damage.
+
+The colossus' true danger lies in its ranged capabilities. It fires immensely damaging death bolts that penetrate all armor in a variety of ways:
+ 1. The colossus fires death bolts in alternating patterns: the cardinal directions and the diagonal directions.
+ 2. The colossus fires death bolts in a shotgun-like pattern, instantly downing anything unfortunate enough to be hit by all of them.
+ 3. The colossus fires a spiral of death bolts.
+At 33% health, the colossus gains an additional attack:
+ 4. The colossus fires two spirals of death bolts, spinning in opposite directions.
+
+When a colossus dies, it leaves behind a chunk of glowing crystal known as a black box. Anything placed inside will carry over into future rounds.
+For instance, you could place a bag of holding into the black box, and then kill another colossus next round and retrieve the bag of holding from inside.
+
+Difficulty: Very Hard
+
+*/
+
+/mob/living/simple_animal/hostile/megafauna/colossus
+	name = "colossus"
+	desc = "A monstrous creature protected by heavy shielding."
+	health = 2500
+	maxHealth = 2500
+	attacktext = "judges"
+	attack_sound = 'sound/magic/ratvar_attack.ogg'
+	icon_state = "eva"
+	icon_living = "eva"
+	icon_dead = "dragon_dead"
+	friendly = "stares down"
+	icon = 'icons/mob/lavaland/96x96megafauna.dmi'
+	speak_emote = list("roars")
+	armour_penetration = 40
+	melee_damage_lower = 40
+	melee_damage_upper = 40
+	speed = 1
+	move_to_delay = 10
+	ranged = 1
+	pixel_x = -32
+	del_on_death = 1
+	medal_type = MEDAL_PREFIX
+	score_type = COLOSSUS_SCORE
+	loot = list(/obj/machinery/anomalous_crystal/random)
+	butcher_results = list(/obj/item/weapon/ore/diamond = 5, /obj/item/stack/sheet/sinew = 5, /obj/item/stack/sheet/animalhide/ashdrake = 10, /obj/item/stack/sheet/bone = 30)
+	deathmessage = "disintegrates, leaving a glowing core in its wake."
+	death_sound = 'sound/misc/demon_dies.ogg'
+
+/mob/living/simple_animal/hostile/megafauna/colossus/devour(mob/living/L)
+	visible_message("<span class='colossus'>[src] disintegrates [L]!</span>")
+	L.dust()
+
+/mob/living/simple_animal/hostile/megafauna/colossus/OpenFire()
+	anger_modifier = Clamp(((maxHealth - health)/50),0,20)
+	ranged_cooldown = world.time + 120
+
+	if(enrage(target))
+		if(move_to_delay == initial(move_to_delay))
+			visible_message("<span class='colossus'>\"<b>You can't dodge.</b>\"</span>")
+		ranged_cooldown = world.time + 30
+		telegraph()
+		dir_shots(alldirs)
+		move_to_delay = 3
+		return
+	else
+		move_to_delay = initial(move_to_delay)
+
+	if(prob(20+anger_modifier)) //Major attack
+		telegraph()
+
+		if(health < maxHealth/3)
+			double_spiral()
+		else
+			visible_message("<span class='colossus'>\"<b>Judgement.</b>\"</span>")
+			spawn(0)
+				spiral_shoot(rand(0, 1))
+
+	else if(prob(20))
+		ranged_cooldown = world.time + 30
+		random_shots()
+	else
+		if(prob(70))
+			ranged_cooldown = world.time + 20
+			blast()
+		else
+			ranged_cooldown = world.time + 40
+			spawn(0)
+				alternating_dir_shots()
+
+
+/mob/living/simple_animal/hostile/megafauna/colossus/New()
+	..()
+	internal_gps = new/obj/item/device/gps/internal/colossus(src)
+
+/obj/effect/overlay/temp/at_shield
+	name = "anti-toolbox field"
+	desc = "A shimmering forcefield protecting the colossus."
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "at_shield2"
+	layer = FLY_LAYER
+	luminosity = 2
+	duration = 8
+	var/target
+
+/obj/effect/overlay/temp/at_shield/New(new_loc, new_target)
+	..()
+	target = new_target
+	spawn(0)
+		orbit(target, 0, FALSE, 0, 0, FALSE, TRUE)
+
+/mob/living/simple_animal/hostile/megafauna/colossus/bullet_act(obj/item/projectile/P)
+	if(!stat)
+		var/obj/effect/overlay/temp/at_shield/AT = PoolOrNew(/obj/effect/overlay/temp/at_shield, src.loc, src)
+		var/random_x = rand(-32, 32)
+		AT.pixel_x += random_x
+
+		var/random_y = rand(0, 72)
+		AT.pixel_y += random_y
+	..()
+
+/mob/living/simple_animal/hostile/megafauna/colossus/proc/enrage(mob/living/L)
+	if(ishuman(L))
+		var/mob/living/carbon/human/H = L
+		if(H.martial_art && prob(H.martial_art.deflection_chance))
+			. = TRUE
+
+/mob/living/simple_animal/hostile/megafauna/colossus/proc/alternating_dir_shots()
+	dir_shots(diagonals)
+	sleep(10)
+	dir_shots(cardinal)
+	sleep(10)
+	dir_shots(diagonals)
+	sleep(10)
+	dir_shots(cardinal)
+
+/mob/living/simple_animal/hostile/megafauna/colossus/proc/double_spiral()
+	visible_message("<span class='colossus'>\"<b>Die.</b>\"</span>")
+
+	sleep(10)
+	spawn(0)
+		spiral_shoot()
+	spawn(0)
+		spiral_shoot(1)
+
+/mob/living/simple_animal/hostile/megafauna/colossus/proc/spiral_shoot(negative = 0, counter_start = 1)
+	var/counter = counter_start
+	var/turf/marker
+	for(var/i in 1 to 80)
+		switch(counter)
+			if(1)
+				marker = locate(x, y - 2, z)
+			if(2)
+				marker = locate(x - 1, y - 2, z)
+			if(3)
+				marker = locate(x - 2, y - 2, z)
+			if(4)
+				marker = locate(x - 2, y - 1, z)
+			if(5)
+				marker = locate(x - 2, y, z)
+			if(6)
+				marker = locate(x - 2, y + 1, z)
+			if(7)
+				marker = locate(x - 2, y + 2, z)
+			if(8)
+				marker = locate(x - 1, y + 2, z)
+			if(9)
+				marker = locate(x, y + 2, z)
+			if(10)
+				marker = locate(x + 1, y + 2, z)
+			if(11)
+				marker = locate(x + 2, y + 2, z)
+			if(12)
+				marker = locate(x + 2, y + 1, z)
+			if(13)
+				marker = locate(x + 2, y, z)
+			if(14)
+				marker = locate(x + 2, y - 1, z)
+			if(15)
+				marker = locate(x + 2, y - 2, z)
+			if(16)
+				marker = locate(x + 1, y - 2, z)
+
+		if(negative)
+			counter--
+		else
+			counter++
+		if(counter > 16)
+			counter = 1
+		if(counter < 1)
+			counter = 16
+		shoot_projectile(marker)
+		playsound(get_turf(src), 'sound/magic/invoke_general.ogg', 20, 1)
+		sleep(1)
+
+/mob/living/simple_animal/hostile/megafauna/colossus/proc/shoot_projectile(turf/marker)
+	if(!marker || marker == loc)
+		return
+	var/turf/startloc = get_turf(src)
+	var/obj/item/projectile/P = new /obj/item/projectile/colossus(startloc)
+	P.current = startloc
+	P.starting = startloc
+	P.firer = src
+	P.yo = marker.y - startloc.y
+	P.xo = marker.x - startloc.x
+	if(target)
+		P.original = target
+	else
+		P.original = marker
+	P.fire()
+
+/mob/living/simple_animal/hostile/megafauna/colossus/proc/random_shots()
+	var/turf/U = get_turf(src)
+	playsound(U, 'sound/magic/invoke_general.ogg', 300, 1, 5)
+	for(var/T in RANGE_TURFS(12, U) - U)
+		if(prob(5))
+			shoot_projectile(T)
+
+/mob/living/simple_animal/hostile/megafauna/colossus/proc/blast()
+	playsound(get_turf(src), 'sound/magic/invoke_general.ogg', 200, 1, 2)
+	var/turf/T = get_turf(target)
+	newtonian_move(get_dir(T, targets_from))
+	for(var/turf/turf in range(1, T))
+		shoot_projectile(turf)
+
+/mob/living/simple_animal/hostile/megafauna/colossus/proc/dir_shots(list/dirs)
+	if(!islist(dirs))
+		dirs = alldirs.Copy()
+	playsound(get_turf(src), 'sound/magic/invoke_general.ogg', 200, 1, 2)
+	for(var/d in dirs)
+		var/turf/E = get_step(src, d)
+		shoot_projectile(E)
+
+/mob/living/simple_animal/hostile/megafauna/colossus/proc/telegraph()
+	for(var/mob/M in range(10,src))
+		if(M.client)
+			flash_color(M.client, rgb(200, 0, 0), 1)
+			shake_camera(M, 4, 3)
+	playsound(get_turf(src),'sound/magic/narsie_attack.ogg', 200, 1)
+
+/obj/item/projectile/colossus
+	name ="death bolt"
+	icon_state= "chronobolt"
+	damage = 25
+	armour_penetration = 100
+	speed = 2
+	eyeblur = 0
+	damage_type = BRUTE
+	pass_flags = PASSTABLE
+
+/obj/item/projectile/colossus/on_hit(atom/target, blocked = 0)
+	. = ..()
+	if(isturf(target) || isobj(target))
+		target.ex_act(2)
+
+/obj/item/device/gps/internal/colossus
+	icon_state = null
+	gpstag = "Angelic Signal"
+	desc = "Get in the fucking robot."
+	invisibility = 100
+
+#undef MEDAL_PREFIX
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index 8188eccafc4..f46d3c74365 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -601,7 +601,7 @@ Difficulty: Hard
 	if(prob(50))
 		icon_state = "hierophant2"
 
-/turf/unsimulated/indestructible/riveted/hierophant
+/turf/simulated/indestructible/riveted/hierophant
 	name = "wall"
 	desc = "A wall made out of smooth, cold stone."
 	icon = 'icons/turf/walls/hierophant_wall.dmi'
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm
new file mode 100644
index 00000000000..3e6d98afd95
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm
@@ -0,0 +1,78 @@
+/mob/living/simple_animal/hostile/asteroid/goldgrub
+	name = "goldgrub"
+	desc = "A worm that grows fat from eating everything in its sight. Seems to enjoy precious metals and other shiny things, hence the name."
+	icon = 'icons/mob/animal.dmi'
+	icon_state = "Goldgrub"
+	icon_living = "Goldgrub"
+	icon_aggro = "Goldgrub_alert"
+	icon_dead = "Goldgrub_dead"
+	icon_gib = "syndicate_gib"
+	vision_range = 2
+	aggro_vision_range = 9
+	idle_vision_range = 2
+	move_to_delay = 5
+	friendly = "harmlessly rolls into"
+	maxHealth = 45
+	health = 45
+	harm_intent_damage = 5
+	melee_damage_lower = 0
+	melee_damage_upper = 0
+	attacktext = "barrels into"
+	attack_sound = 'sound/weapons/punch1.ogg'
+	a_intent = I_HELP
+	speak_emote = list("screeches")
+	throw_message = "sinks in slowly, before being pushed out of "
+	status_flags = CANPUSH
+	search_objects = 1
+	wanted_objects = list(/obj/item/weapon/ore/diamond, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/silver,
+						  /obj/item/weapon/ore/uranium)
+
+	var/chase_time = 100
+	var/will_burrow = TRUE
+
+/mob/living/simple_animal/hostile/asteroid/goldgrub/New()
+	..()
+	var/i = rand(1,3)
+	while(i)
+		loot += pick(/obj/item/weapon/ore/silver, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/uranium, /obj/item/weapon/ore/diamond)
+		i--
+
+/mob/living/simple_animal/hostile/asteroid/goldgrub/GiveTarget(new_target)
+	target = new_target
+	if(target != null)
+		if(istype(target, /obj/item/weapon/ore) && loot.len < 10)
+			visible_message("<span class='notice'>The [src.name] looks at [target.name] with hungry eyes.</span>")
+		else if(isliving(target))
+			Aggro()
+			visible_message("<span class='danger'>The [src.name] tries to flee from [target.name]!</span>")
+			retreat_distance = 10
+			minimum_distance = 10
+			if(will_burrow)
+				spawn(chase_time)
+					Burrow()
+
+/mob/living/simple_animal/hostile/asteroid/goldgrub/AttackingTarget()
+	if(istype(target, /obj/item/weapon/ore))
+		EatOre(target)
+		return
+	..()
+
+/mob/living/simple_animal/hostile/asteroid/goldgrub/proc/EatOre(var/atom/targeted_ore)
+	for(var/obj/item/weapon/ore/O in targeted_ore.loc)
+		if(loot.len < 10)
+			loot += O.type
+			qdel(O)
+	visible_message("<span class='notice'>The ore was swallowed whole!</span>")
+
+/mob/living/simple_animal/hostile/asteroid/goldgrub/proc/Burrow()//Begin the chase to kill the goldgrub in time
+	if(!stat)
+		visible_message("<span class='danger'>The [src.name] buries into the ground, vanishing from sight!</span>")
+		qdel(src)
+
+/mob/living/simple_animal/hostile/asteroid/goldgrub/bullet_act(obj/item/projectile/P)
+	visible_message("<span class='danger'>The [P.name] was repelled by [src.name]'s girth!</span>")
+	return
+
+/mob/living/simple_animal/hostile/asteroid/goldgrub/adjustHealth(damage)
+	idle_vision_range = 9
+	. = ..()
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
index ceac9068e79..9284372f1ef 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
@@ -103,107 +103,6 @@
 		if(3.0)
 			adjustBruteLoss(110)
 
-/mob/living/simple_animal/hostile/asteroid/goldgrub
-	name = "goldgrub"
-	desc = "A worm that grows fat from eating everything in its sight. Seems to enjoy precious metals and other shiny things, hence the name."
-	icon = 'icons/mob/animal.dmi'
-	icon_state = "Goldgrub"
-	icon_living = "Goldgrub"
-	icon_aggro = "Goldgrub_alert"
-	icon_dead = "Goldgrub_dead"
-	icon_gib = "syndicate_gib"
-	vision_range = 2
-	aggro_vision_range = 9
-	idle_vision_range = 2
-	move_to_delay = 5
-	friendly = "harmlessly rolls into"
-	maxHealth = 45
-	health = 45
-	harm_intent_damage = 5
-	melee_damage_lower = 0
-	melee_damage_upper = 0
-	attacktext = "barrels into"
-	attack_sound = 'sound/weapons/punch1.ogg'
-	a_intent = I_HELP
-	speak_emote = list("screeches")
-	throw_message = "sinks in slowly, before being pushed out of "
-	status_flags = CANPUSH
-	search_objects = 1
-	wanted_objects = list(/obj/item/weapon/ore/diamond, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/silver,
-						  /obj/item/weapon/ore/uranium)
-
-	var/list/ore_types_eaten = list()
-	var/alerted = 0
-	var/ore_eaten = 1
-	var/chase_time = 100
-	var/will_burrow = 1
-
-/mob/living/simple_animal/hostile/asteroid/goldgrub/New()
-	..()
-	ore_types_eaten += pick(/obj/item/weapon/ore/silver, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/uranium, /obj/item/weapon/ore/diamond)
-	ore_eaten = rand(1,3)
-
-/mob/living/simple_animal/hostile/asteroid/goldgrub/GiveTarget(var/new_target)
-	target = new_target
-	if(target != null)
-		if(istype(target, /obj/item/weapon/ore))
-			visible_message("<span class='notice'>The [src.name] looks at [target.name] with hungry eyes.</span>")
-		else if(isliving(target))
-			Aggro()
-			visible_message("<span class='danger'>The [src.name] tries to flee from [target.name]!</span>")
-			retreat_distance = 10
-			minimum_distance = 10
-			Burrow()
-
-/mob/living/simple_animal/hostile/asteroid/goldgrub/AttackingTarget()
-	if(istype(target, /obj/item/weapon/ore))
-		EatOre(target)
-		return
-	..()
-
-/mob/living/simple_animal/hostile/asteroid/goldgrub/proc/EatOre(var/atom/targeted_ore)
-	for(var/obj/item/weapon/ore/O in targeted_ore.loc)
-		ore_eaten++
-		if(!(O.type in ore_types_eaten))
-			ore_types_eaten += O.type
-		qdel(O)
-	if(ore_eaten > 10)//Limit the scope of the reward you can get, or else things might get silly
-		ore_eaten = 10
-	visible_message("<span class='notice'>The ore was swallowed whole!</span>")
-
-/mob/living/simple_animal/hostile/asteroid/goldgrub/proc/Burrow()//Begin the chase to kill the goldgrub in time
-	if(!alerted && will_burrow)
-		alerted = 1
-		spawn(chase_time)
-		if(alerted)
-			visible_message("<span class='danger'>The [src.name] buries into the ground, vanishing from sight!</span>")
-			qdel(src)
-
-/mob/living/simple_animal/hostile/asteroid/goldgrub/proc/Reward()
-	if(!ore_eaten || ore_types_eaten.len == 0)
-		return
-	visible_message("<span class='danger'>[src] spits up the contents of its stomach before dying!</span>")
-	var/counter
-	for(var/R in ore_types_eaten)
-		for(counter=0, counter < ore_eaten, counter++)
-			new R(src.loc)
-	ore_types_eaten.Cut()
-	ore_eaten = 0
-
-
-/mob/living/simple_animal/hostile/asteroid/goldgrub/bullet_act(var/obj/item/projectile/P)
-	visible_message("<span class='danger'>The [P.name] was repelled by [src.name]'s girth!</span>")
-	return
-
-/mob/living/simple_animal/hostile/asteroid/goldgrub/death(gibbed)
-	alerted = 0
-	Reward()
-	..()
-
-/mob/living/simple_animal/hostile/asteroid/goldgrub/adjustHealth(damage)
-	idle_vision_range = 9
-	..()
-
 /mob/living/simple_animal/hostile/asteroid/goliath
 	name = "goliath"
 	desc = "A massive beast that uses long tentacles to ensare its prey, threatening them is not advised under any conditions."
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index b5a990dec69..cbbe43cd32c 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -188,3 +188,9 @@
 //Behavior for magazines
 /obj/item/ammo_box/magazine/proc/ammo_count()
 	return stored_ammo.len
+
+/obj/item/ammo_box/magazine/proc/empty_magazine()
+	var/turf_mag = get_turf(src)
+	for(var/obj/item/ammo in stored_ammo)
+		ammo.forceMove(turf_mag)
+		stored_ammo -= ammo	
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/projectile/bow.dm b/code/modules/projectiles/guns/projectile/bow.dm
new file mode 100644
index 00000000000..e985b9a9605
--- /dev/null
+++ b/code/modules/projectiles/guns/projectile/bow.dm
@@ -0,0 +1,98 @@
+/obj/item/weapon/gun/projectile/bow
+	name = "bow"
+	desc = "A sturdy bow made out of wood and reinforced with iron."
+	icon_state = "bow_unloaded"
+	item_state = "bow"
+	fire_sound = 'sound/weapons/grenadelaunch.ogg'
+	mag_type = /obj/item/ammo_box/magazine/internal/bow
+	flags = HANDSLOW
+	weapon_weight = WEAPON_HEAVY
+	var/draw_sound = 'sound/weapons/draw_bow.ogg'
+	var/ready_to_fire = 0
+	var/slowdown_when_ready = 2
+
+/obj/item/weapon/gun/projectile/bow/update_icon()
+	if(magazine.ammo_count() && !ready_to_fire)
+		icon_state = "bow_loaded"
+	else if(ready_to_fire)
+		icon_state = "bow_firing"
+		slowdown = slowdown_when_ready
+	else
+		icon_state = initial(icon_state)
+		slowdown = initial(slowdown)
+
+/obj/item/weapon/gun/projectile/bow/dropped(mob/user)
+	if(magazine && magazine.ammo_count())
+		magazine.empty_magazine()
+		ready_to_fire = FALSE
+		update_icon()
+
+/obj/item/weapon/gun/projectile/bow/attack_self(mob/living/user)
+	if(!ready_to_fire && magazine.ammo_count())
+		ready_to_fire = TRUE
+		playsound(user, draw_sound, 100, 1)
+		update_icon()
+	else
+		ready_to_fire = FALSE
+		update_icon()
+
+/obj/item/weapon/gun/projectile/bow/attackby(obj/item/A, mob/user, params)
+	var/num_loaded = magazine.attackby(A, user, params, 1)
+	if(num_loaded)
+		user << "<span class='notice'>You ready \the [A] into \the [src].</span>"
+		update_icon()
+		chamber_round()
+
+/obj/item/weapon/gun/projectile/bow/can_shoot()
+	. = ..()
+	if(!ready_to_fire)
+		return FALSE
+
+/obj/item/weapon/gun/projectile/bow/shoot_with_empty_chamber(mob/living/user as mob|obj)
+	return
+
+/obj/item/weapon/gun/projectile/bow/process_chamber(eject_casing = 0, empty_chamber = 1)
+	. = ..()
+	ready_to_fire = FALSE
+	update_icon()
+
+// ammo
+/obj/item/ammo_box/magazine/internal/bow
+	name = "bow internal magazine"
+	ammo_type = /obj/item/ammo_casing/caseless/arrow
+	caliber = "arrow"
+	max_ammo = 1
+
+
+/obj/item/projectile/bullet/reusable/arrow
+	name = "arrow"
+	icon_state = "arrow"
+	ammo_type = /obj/item/ammo_casing/caseless/arrow
+	range = 10
+	damage = 25
+	damage_type = BRUTE
+
+/obj/item/ammo_casing/caseless/arrow
+	name = "arrow"
+	desc = "Stab, stab, stab."
+	icon_state = "arrow"
+	force = 10
+	sharp = 1
+	projectile_type = /obj/item/projectile/bullet/reusable/arrow
+	caliber = "arrow"
+
+//quiver
+/obj/item/weapon/storage/backpack/quiver
+	name = "quiver"
+	desc = "A quiver for holding arrows."
+	icon_state = "quiver"
+	item_state = "quiver"
+	storage_slots = 20
+	can_hold = list(
+		/obj/item/ammo_casing/caseless/arrow
+		)
+
+/obj/item/weapon/storage/backpack/quiver/full/New()
+	..()
+	for(var/i in 1 to storage_slots)
+		new /obj/item/ammo_casing/caseless/arrow(src)
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index bdf040ecd9b..c79a37dc9c5 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -20,15 +20,26 @@
 	damage = 10
 	damage_type = BRUTE
 	nodamage = 0
+	
+	//explosion values
+	var/exp_heavy = 0
+	var/exp_light = 2
+	var/exp_flash = 3
+	var/exp_fire = 2
 
 /obj/item/projectile/magic/fireball/Range()
 	var/turf/T1 = get_step(src,turn(dir, -45))
 	var/turf/T2 = get_step(src,turn(dir, 45))
+	var/turf/T3 = get_step(src,dir)
 	var/mob/living/L = locate(/mob/living) in T1 //if there's a mob alive in our front right diagonal, we hit it.
 	if(L && L.stat != DEAD)
 		Bump(L) //Magic Bullet #teachthecontroversy
 		return
 	L = locate(/mob/living) in T2
+	if(L && L.stat != DEAD)
+		Bump(L)
+		return
+	L = locate(/mob/living) in T3
 	if(L && L.stat != DEAD)
 		Bump(L)
 		return
@@ -41,6 +52,14 @@
 	if(ismob(target)) //multiple flavors of pain
 		var/mob/living/M = target
 		M.take_overall_damage(0,10) //between this 10 burn, the 10 brute, the explosion brute, and the onfire burn, your at about 65 damage if you stop drop and roll immediately
+		
+
+/obj/item/projectile/magic/fireball/infernal
+	name = "infernal fireball"
+	exp_heavy = -1
+	exp_light = -1
+	exp_flash = 4
+	exp_fire= 5
 
 /obj/item/projectile/magic/resurrection
 	name = "bolt of resurrection"
diff --git a/icons/effects/blood.dmi b/icons/effects/blood.dmi
index 1679443bd14..28e2fd791ff 100644
Binary files a/icons/effects/blood.dmi and b/icons/effects/blood.dmi differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index a6d1511f604..8e7ea6571d4 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/mob/actions.dmi b/icons/mob/actions.dmi
index 9da31cf8814..a745dd9f1f3 100644
Binary files a/icons/mob/actions.dmi and b/icons/mob/actions.dmi differ
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
index 4b839a4bf66..da4e17bfa29 100644
Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index 78679aa378b..f5384886dd0 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi
index 3088c274007..cc5330db825 100644
Binary files a/icons/mob/inhands/guns_lefthand.dmi and b/icons/mob/inhands/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi
index ea22f2728b1..359045c25e0 100644
Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 26f288f8625..059a948d7dd 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index f91eb60ca15..547e0db4a8b 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index a7db164c0fc..07c0c1aedab 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index cd1eed09f02..cc1a4214348 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ
diff --git a/icons/obj/lavaland/artefacts.dmi b/icons/obj/lavaland/artefacts.dmi
new file mode 100644
index 00000000000..45927256e35
Binary files /dev/null and b/icons/obj/lavaland/artefacts.dmi differ
diff --git a/icons/obj/lavaland/dragonboat.dmi b/icons/obj/lavaland/dragonboat.dmi
new file mode 100644
index 00000000000..13b6509fcd7
Binary files /dev/null and b/icons/obj/lavaland/dragonboat.dmi differ
diff --git a/icons/obj/lavaland/spawners.dmi b/icons/obj/lavaland/spawners.dmi
new file mode 100644
index 00000000000..42fdc988add
Binary files /dev/null and b/icons/obj/lavaland/spawners.dmi differ
diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi
index d37f90321d3..afdddf46abc 100644
Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 055817c0ac7..5a1c5846e4e 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 661db4f09bb..581b345b5ec 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/paradise.dme b/paradise.dme
index f790f4a4d2e..46856b46cb3 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1418,6 +1418,7 @@
 #include "code\modules\mining\laborcamp\laborshuttle.dm"
 #include "code\modules\mining\laborcamp\laborstacker.dm"
 #include "code\modules\mining\lavaland\ash_flora.dm"
+#include "code\modules\mining\lavaland\colossus_loot.dm"
 #include "code\modules\mining\lavaland\necropolis_chests.dm"
 #include "code\modules\mob\abilities.dm"
 #include "code\modules\mob\death.dm"
@@ -1617,6 +1618,7 @@
 #include "code\modules\mob\living\simple_animal\bot\secbot.dm"
 #include "code\modules\mob\living\simple_animal\friendly\butterfly.dm"
 #include "code\modules\mob\living\simple_animal\friendly\cat.dm"
+#include "code\modules\mob\living\simple_animal\friendly\cockroach.dm"
 #include "code\modules\mob\living\simple_animal\friendly\corgi.dm"
 #include "code\modules\mob\living\simple_animal\friendly\corgi_powers.dm"
 #include "code\modules\mob\living\simple_animal\friendly\crab.dm"
@@ -1656,10 +1658,12 @@
 #include "code\modules\mob\living\simple_animal\hostile\tree.dm"
 #include "code\modules\mob\living\simple_animal\hostile\winter_mobs.dm"
 #include "code\modules\mob\living\simple_animal\hostile\megafauna\bubblegum.dm"
+#include "code\modules\mob\living\simple_animal\hostile\megafauna\colossus.dm"
 #include "code\modules\mob\living\simple_animal\hostile\megafauna\dragon.dm"
 #include "code\modules\mob\living\simple_animal\hostile\megafauna\hierophant.dm"
 #include "code\modules\mob\living\simple_animal\hostile\megafauna\legion.dm"
 #include "code\modules\mob\living\simple_animal\hostile\megafauna\megafauna.dm"
+#include "code\modules\mob\living\simple_animal\hostile\mining\goldgrub.dm"
 #include "code\modules\mob\living\simple_animal\hostile\mining\hivelord.dm"
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\clown.dm"
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\drone.dm"
@@ -1812,6 +1816,7 @@
 #include "code\modules\projectiles\guns\magic\staff.dm"
 #include "code\modules\projectiles\guns\magic\wand.dm"
 #include "code\modules\projectiles\guns\projectile\automatic.dm"
+#include "code\modules\projectiles\guns\projectile\bow.dm"
 #include "code\modules\projectiles\guns\projectile\launchers.dm"
 #include "code\modules\projectiles\guns\projectile\pistol.dm"
 #include "code\modules\projectiles\guns\projectile\revolver.dm"
diff --git a/sound/magic/invoke_general.ogg b/sound/magic/invoke_general.ogg
new file mode 100644
index 00000000000..6f0c0dd097a
Binary files /dev/null and b/sound/magic/invoke_general.ogg differ
diff --git a/sound/magic/narsie_attack.ogg b/sound/magic/narsie_attack.ogg
new file mode 100644
index 00000000000..89fac778058
Binary files /dev/null and b/sound/magic/narsie_attack.ogg differ
diff --git a/sound/magic/ratvar_attack.ogg b/sound/magic/ratvar_attack.ogg
new file mode 100644
index 00000000000..1c17fe10510
Binary files /dev/null and b/sound/magic/ratvar_attack.ogg differ
diff --git a/sound/weapons/draw_bow.ogg b/sound/weapons/draw_bow.ogg
new file mode 100644
index 00000000000..01f1393bc84
Binary files /dev/null and b/sound/weapons/draw_bow.ogg differ