Merge branch 'master' into more_cooking2

code/modules/vending/_vending.dm

@@ -65,7 +65,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	var/scan_id = 1
 	var/obj/item/coin/coin
 	var/obj/item/stack/spacecash/bill
-	
+
 	var/global/vending_cache = list() //used for storing the icons of items being vended
 
 	var/dish_quants = list()  //used by the snack machine's custom compartment to count dishes.
@@ -306,10 +306,12 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	. = ..()
 
 /obj/machinery/vending/emag_act(mob/user)
+	. = ..()
 	if(obj_flags & EMAGGED)
 		return
 	obj_flags |= EMAGGED
 	to_chat(user, "<span class='notice'>You short out the product lock on [src].</span>")
+	return TRUE
 
 /obj/machinery/vending/_try_interact(mob/user)
 	if(seconds_electrified && !(stat & NOPOWER))

code/modules/vending/megaseed.dm

@@ -24,6 +24,7 @@
 					/obj/item/seeds/lime = 3,
 					/obj/item/seeds/onion = 3,
 					/obj/item/seeds/orange = 3,
+					/obj/item/seeds/peach = 3,
 					/obj/item/seeds/peanutseed = 3,
 					/obj/item/seeds/pineapple = 3,
 					/obj/item/seeds/potato = 3,

code/modules/vending/wardrobes.dm

@@ -321,6 +321,9 @@
 					/obj/item/clothing/suit/nun = 2,
 					/obj/item/clothing/head/nun_hood = 2,
 					/obj/item/clothing/suit/holidaypriest = 2,
+					/obj/item/clothing/suit/pharaoh = 2,
+					/obj/item/clothing/head/nemes = 1,
+					/obj/item/clothing/head/pharaoh = 1,
 					/obj/item/storage/fancy/candle_box = 3)
 	refill_canister = /obj/item/vending_refill/wardrobe/chap_wardrobe