Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into json_serialization2

code/game/objects/items/devices/camera_bug.dm

@@ -61,6 +61,7 @@
 		return null
 
 	var/turf/T = get_turf(user.loc)
+	// TODO: Tie into space manager
 	if(T.z != current.z || !current.can_use())
 		to_chat(user, "<span class='danger'>[src] has lost the signal.</span>")
 		current = null
@@ -225,6 +226,7 @@
 				to_chat(usr, "<span class='danger'>Something's wrong with that camera.  You can't get a feed.</span>")
 				return
 			var/turf/T = get_turf(loc)
+			// TODO: Tie into space manager
 			if(!T || C.z != T.z)
 				to_chat(usr, "<span class='danger'>You can't get a signal.</span>")
 				return
@@ -284,4 +286,4 @@
 
 #undef BUGMODE_LIST
 #undef BUGMODE_MONITOR
-#undef BUGMODE_TRACK
+#undef BUGMODE_TRACK

code/game/objects/items/devices/radio/intercom.dm

@@ -124,6 +124,7 @@
 		return -1
 	if(!(0 in level))
 		var/turf/position = get_turf(src)
+		// TODO: Tie into space manager
 		if(isnull(position) || !(position.z in level))
 			return -1
 	if(!src.listening)

code/game/objects/items/weapons/bee_briefcase.dm

@@ -64,6 +64,7 @@
 			//Play sound through the station intercomms, so everyone knows the doom you have wrought.
 			for(var/O in global_intercoms)
 				var/obj/item/device/radio/intercom/I = O
+				// TODO: Tie into space manager
 				if(I.z != ZLEVEL_STATION)	//Only broadcast to the station intercoms
 					continue
 				if(!I.on)					//Only broadcast to active intercoms (powered, switched on)
@@ -75,4 +76,4 @@
 			var/mob/living/simple_animal/hostile/poison/bees/syndi/B = new /mob/living/simple_animal/hostile/poison/bees/syndi(null)
 			B.master_and_friends = blood_list	//Doesn't automatically add the person who opens the case, so the bees will attack the user unless they gave their blood
 			B.forceMove(get_turf(user))			//RELEASE THE BEES!
-		bees_left -= 5
+		bees_left -= 5

code/game/objects/items/weapons/storage/backpack.dm

@@ -22,7 +22,7 @@
 
 /obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	playsound(src.loc, "rustle", 50, 1, -5)
-	..()
+	return ..()
 
 /*
  * Backpack Types

code/game/objects/items/weapons/storage/bags.dm

@@ -375,7 +375,7 @@
 	max_combined_w_class = 21
 	max_w_class = 3
 	w_class = 4 //Bigger than a book because physics
-	can_hold = list("/obj/item/weapon/book", "/obj/item/weapon/spellbook") //No bibles, consistent with bookcase
+	can_hold = list("/obj/item/weapon/book", "/obj/item/weapon/storage/bible", "/obj/item/weapon/tome", "/obj/item/weapon/spellbook")
 
 /*
  * Trays - Agouri

code/game/objects/items/weapons/teleportation.dm

@@ -48,6 +48,7 @@ Frequency:
 		return 1
 
 	var/turf/current_location = get_turf(usr)//What turf is the user on?
+	// TODO: Tie into space manager
 	if(!current_location ||( current_location.z in config.admin_levels))//If turf was not found or they're on z level 2.
 		to_chat(usr, "<span class='warning'>\The [src] is malfunctioning.</span>")
 		return 1
@@ -61,6 +62,7 @@ Frequency:
 
 			for(var/obj/item/device/radio/beacon/W in beacons)
 				if(W.frequency == frequency && !W.syndicate)
+					// TODO: Tie into space manager
 					if(W && W.z == z)
 						var/turf/TB = get_turf(W)
 						temp += "[W.code]: [TB.x], [TB.y], [TB.z]<BR>"
@@ -107,7 +109,8 @@ Frequency:
 
 /obj/item/weapon/hand_tele/attack_self(mob/user as mob)
 	var/turf/current_location = get_turf(user)//What turf is the user on?
-	if(!current_location||(current_location.z in config.admin_levels)||current_location.z>=7)//If turf was not found or they're on z level 2 or >7 which does not currently exist.
+	// TODO: Tie into space manager
+	if(!current_location||(current_location.z in config.admin_levels)||current_location.z>=ZLEVEL_EMPTY)//If turf was not found or they're on z level 2 or >7 which does not currently exist.
 		to_chat(user, "<span class='notice'>\The [src] is malfunctioning.</span>")
 		return
 	var/list/L = list(  )

code/game/objects/items/weapons/twohanded.dm

@@ -693,3 +693,55 @@
 				Z.ex_act(2)
 				charged = 3
 				playsound(user, 'sound/weapons/marauder.ogg', 50, 1)
+				
+// Energized Fire axe
+/obj/item/weapon/twohanded/energizedfireaxe
+	name = "energized fire axe"
+	desc = "Someone with a love for fire axes decided to turn one into a single-charge energy weapon. Seems excessive."
+	icon_state = "fireaxe0"
+	force = 5
+	throwforce = 15
+	sharp = 1
+	edge = 1
+	w_class = 5
+	armour_penetration = 20
+	slot_flags = SLOT_BACK
+	force_unwielded  = 5
+	force_wielded = 30
+	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
+	hitsound = 'sound/weapons/bladeslice.ogg'
+	var/charged = 1
+	
+/obj/item/weapon/twohanded/energizedfireaxe/update_icon()
+	if(wielded)
+		icon_state = "fireaxe2"
+	else
+		icon_state = "fireaxe0"
+
+/obj/item/weapon/twohanded/energizedfireaxe/afterattack(atom/A, mob/user, proximity)
+	if(!proximity) 
+		return
+	if(wielded)
+		if(istype(A, /mob/living))
+			var/mob/living/Z = A
+			if(charged)
+				charged--
+				Z.take_organ_damage(0,30)
+				user.visible_message("<span class='danger'>[user] slams the charged axe into [Z.name] with all their might!</span>")
+				playsound(loc, 'sound/magic/lightningbolt.ogg', 5, 1)
+				var/datum/effect/system/spark_spread/sparks = new /datum/effect/system/spark_spread
+				sparks.set_up(1, 1, src)
+				sparks.start()
+				
+		if(A && wielded && (istype(A, /obj/structure/window) || istype(A, /obj/structure/grille)))
+			if(istype(A, /obj/structure/window))
+				var/obj/structure/window/W = A
+				W.destroy()
+				if(prob(4))
+					charged++
+					user.visible_message("<span class='notice'>The axe starts to emit an electric buzz!</span>")
+			else
+				qdel(A)
+				if(prob(4))
+					charged++
+					user.visible_message("<span class='notice'>The axe starts to emit an electric buzz!</span>")

code/game/objects/structures/crates_lockers/closets.dm

@@ -192,6 +192,7 @@
 			return
 		var/obj/item/weapon/rcs/E = W
 		if(E.rcell && (E.rcell.charge >= E.chargecost))
+			// TODO: Tie into space manager
 			if(!(src.z in config.contact_levels))
 				to_chat(user, "<span class='warning'>The rapid-crate-sender can't locate any telepads!</span>")
 				return

code/game/objects/structures/crates_lockers/crates.dm

@@ -84,6 +84,7 @@
 	if(istype(W, /obj/item/weapon/rcs) && !src.opened)
 		var/obj/item/weapon/rcs/E = W
 		if(E.rcell && (E.rcell.charge >= E.chargecost))
+			// TODO: Tie into space manager
 			if(!(src.z in config.player_levels))
 				to_chat(user, "<span class='warning'>The rapid-crate-sender can't locate any telepads!</span>")
 				return