Merge remote-tracking branch 'citadel/master' into clickcd_experimental

code/modules/cargo/exports/organs_robotics.dm

@@ -144,7 +144,7 @@
 /datum/export/robotics/surgery_gear_basic
 	cost = 10
 	unit_name = "surgery tool"
-	export_types = list(/obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw, /obj/item/surgical_drapes)
+	export_types = list(/obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw, /obj/item/bonesetter, /obj/item/surgical_drapes)
 
 /datum/export/robotics/mech_weapon_laser
 	cost = 300 //Sadly just metal and glass

code/modules/cargo/packs/goodies.dm

@@ -75,3 +75,9 @@
 	desc = "The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen"
 	cost = 200
 	contains = list(/obj/item/toy/beach_ball)
+
+/datum/supply_pack/goody/hell_single
+	name = "Hellgun Single-Pack"
+	desc = "Contains one hellgun, an old pattern of laser gun infamous for its ability to horribly disfigure targets with burns. Technically violates the Space Geneva Convention when used on humanoids."
+	cost = 1500
+	contains = list(/obj/item/gun/energy/laser/hellgun)

code/modules/cargo/packs/medical.dm

@@ -114,7 +114,9 @@
 					/obj/item/storage/box/medsprays,
 					/obj/item/storage/box/syringes,
 					/obj/item/storage/box/bodybags,
-					/obj/item/storage/pill_bottle/stimulant)
+					/obj/item/storage/pill_bottle/stimulant,
+					/obj/item/stack/medical/bone_gel,
+					/obj/item/stack/medical/bone_gel)
 	crate_name = "medical supplies crate"
 
 /datum/supply_pack/medical/adv_surgery_tools