Merge Conflict Resolved

code/game/objects/items/control_wand.dm

@@ -9,6 +9,7 @@
 	name = "control wand"
 	desc = "Remotely controls airlocks."
 	w_class = WEIGHT_CLASS_TINY
+	flags = NOBLUDGEON
 	var/mode = WAND_OPEN
 	var/region_access = 1 //See access.dm
 	var/obj/item/weapon/card/id/ID

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

@@ -77,6 +77,7 @@ var/global/list/default_medbay_channels = list(
 		radio_controller.remove_object(src, frequency)
 		for(var/ch_name in channels)
 			radio_controller.remove_object(src, radiochannels[ch_name])
+	radio_connection = null
 	global_radios -= src
 	follow_target = null
 	return ..()

code/game/objects/items/stacks/stack.dm

@@ -13,6 +13,7 @@
 	var/list/recipes = list() // /datum/stack_recipe
 	var/singular_name
 	var/amount = 1
+	var/to_transfer = 0
 	var/max_amount //also see stack recipes initialisation, param "max_res_amount" must be equal to this max_amount
 	var/merge_type = null // This path and its children should merge with this stack, defaults to src.type
 
@@ -231,6 +232,9 @@
 /obj/item/stack/proc/get_max_amount()
 	return max_amount
 
+/obj/item/stack/proc/get_amount_transferred()
+	return to_transfer
+
 /obj/item/stack/proc/split(mob/user, amt)
 	var/obj/item/stack/F = new type(loc, amt)
 	F.copy_evidences(src)
@@ -257,7 +261,6 @@
 		if(S.amount >= max_amount)
 			return 1
 
-		var/to_transfer
 		if(user.is_in_inactive_hand(src))
 			var/desired = input("How much would you like to transfer from this stack?", "How much?", 1) as null|num
 			if(!desired)

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

@@ -829,6 +829,26 @@
 				return
 	return ..()
 
+
+/obj/item/weapon/storage/box/centcomofficer
+	name = "officer kit"
+
+/obj/item/weapon/storage/box/centcomofficer/New()
+	..()
+	contents = list()
+	new /obj/item/clothing/mask/breath(src)
+	new /obj/item/weapon/tank/emergency_oxygen/double/full(src)
+	new /obj/item/device/flashlight/seclite(src)
+	new /obj/item/weapon/kitchen/knife/combat(src)
+
+	new /obj/item/device/radio/centcom(src)
+	new /obj/item/weapon/door_remote/omni(src)
+	new /obj/item/weapon/implanter/death_alarm(src)
+
+	new /obj/item/weapon/reagent_containers/hypospray/combat/nanites(src)
+	new /obj/item/weapon/pinpointer/advpinpointer(src)
+
+
 #undef NODESIGN
 #undef NANOTRASEN
 #undef SYNDI

code/game/objects/items/weapons/tanks/jetpack.dm

@@ -96,6 +96,14 @@
 	..()
 	air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
 
+/obj/item/weapon/tank/jetpack/void/grey
+	name = "Void Jetpack (Oxygen)"
+	icon_state = "jetpack-void-grey"
+
+/obj/item/weapon/tank/jetpack/void/gold
+	name = "Retro Jetpack (Oxygen)"
+	icon_state = "jetpack-void-gold"
+
 
 /obj/item/weapon/tank/jetpack/oxygen
 	name = "Jetpack (Oxygen)"

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

@@ -9,8 +9,7 @@
 	..()
 	new /obj/item/weapon/tank/jetpack/void(src)
 	new /obj/item/clothing/mask/breath(src)
-	new /obj/item/clothing/head/helmet/space/nasavoid(src)
-	new /obj/item/clothing/suit/space/nasavoid(src)
+	new /obj/effect/nasavoidsuitspawner(src)
 	new /obj/item/weapon/crowbar(src)
 	new /obj/item/weapon/stock_parts/cell(src)
 	new /obj/item/device/multitool(src)