Merge branch 'master' into glassware

code/modules/cargo/packs/engine.dm

@@ -27,7 +27,7 @@
 
 /datum/supply_pack/engine/am_shielding
 	name = "Antimatter Shielding Crate"
-	desc = "Contains ten Antimatter shields, somehow crammed into a crate."
+	desc = "Contains nine Antimatter shields, somehow crammed into a crate."
 	cost = 2500
 	contains = list(/obj/item/am_shielding_container,
 					/obj/item/am_shielding_container,
@@ -37,8 +37,7 @@
 					/obj/item/am_shielding_container,
 					/obj/item/am_shielding_container,
 					/obj/item/am_shielding_container,
-					/obj/item/am_shielding_container,
-					/obj/item/am_shielding_container) //10 shields: 3x3 containment and a core
+					/obj/item/am_shielding_container) //9 shields: 3x3 containment and a core
 	crate_name = "antimatter shielding crate"
 
 /datum/supply_pack/engine/emitter

code/modules/cargo/packs/organic.dm

@@ -47,7 +47,6 @@
 					/obj/item/storage/fancy/donut_box)
 	crate_name = "candy crate"
 
-
 /datum/supply_pack/organic/randomised/candy/fill(obj/structure/closet/crate/C)
 	var/list/L = contains.Copy()
 	for(var/i in 1 to num_contained)

code/modules/cargo/supplypod_beacon.dm

@@ -76,12 +76,14 @@
 	to_chat(user, "<span class='notice'>[src] linked to [C].</span>")
 
 /obj/item/supplypod_beacon/AltClick(mob/user)
+	. = ..()
 	if (!user.canUseTopic(src, !issilicon(user)))
 		return
 	if (express_console)
 		unlink_console()
 	else
 		to_chat(user, "<span class='notice'>There is no linked console!</span>")
+	return TRUE
 
 /obj/item/supplypod_beacon/attackby(obj/item/W, mob/user)
 	if(istype(W, /obj/item/pen)) //give a tag that is visible from the linked express console