Merge branch 'CC-expansion' of https://github.com/GrrrKitten/cmss13 i…

…nto CC-expansion

code/game/machinery/vending/vendor_types/crew/combat_correspondent.dm

@@ -1,6 +1,9 @@
 //------------ CC CLOTHING VENDOR---------------
 
 GLOBAL_LIST_INIT(cm_vending_clothing_combat_correspondent, list(
+		list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
+		list("Essential Reporter's Set", 0, /obj/effect/essentials_set/cc, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
+		list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
 
 		list("UNIFORM (CHOOSE 1)", 0, null, null, null),
 		list("Black Uniform", 0, /obj/item/clothing/under/marine/reporter/black, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
@@ -19,10 +22,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_combat_correspondent, list(
 		list("Combat Correspondent's Cap", 0, /obj/item/clothing/head/cmcap/reporter, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
 		list("Fedora", 0, /obj/item/clothing/head/fedora, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
 
-		list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
-		list("Essential Reporter's Set", 0, /obj/effect/essentials_set/cc, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY),
-		list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR),
-
 		list("REFILLS", 0, null, null, null),
 		list("Camera", 10, /obj/item/device/camera, null, VENDOR_ITEM_REGULAR),
 		list("Camera Film", 5, /obj/item/device/camera_film, null, VENDOR_ITEM_REGULAR),

code/modules/gear_presets/uscm_ship.dm

@@ -138,8 +138,6 @@
 	new_human.equip_to_slot_or_del(new /obj/item/device/camera(new_human), WEAR_WAIST)
 	new_human.equip_to_slot_or_del(new /obj/item/device/fax_backpack(new_human), WEAR_BACK)
 
-
-
 /datum/equipment_preset/uscm_ship/reporter_uscm
 	name = "Combat Correspondent"
 	flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE