Merge remote-tracking branch 'upstream/master' into remove-weapons

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/card/id/ID

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/handcuffs.dm

@@ -108,6 +108,18 @@
 	color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
 	..()
 
+/obj/item/restraints/handcuffs/cable/proc/cable_color(var/colorC)
+	if(colorC)
+		if(colorC == "rainbow")
+			colorC = color_rainbow()
+		color = colorC
+	else
+		color = COLOR_RED
+
+/obj/item/restraints/handcuffs/cable/proc/color_rainbow()
+	color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
+	return color
+
 /obj/item/restraints/handcuffs/alien
 	icon_state = "handcuffAlien"
 
@@ -143,6 +155,9 @@
 			if(!remove_item_from_storage(user))
 				user.unEquip(src)
 			qdel(src)
+	else if(istype(I, /obj/item/toy/crayon))
+		var/obj/item/toy/crayon/C = I
+		cable_color(C.colourName)
 
 /obj/item/restraints/handcuffs/cable/zipties
 	name = "zipties"

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

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