merge conflict and job/dept discounts support.

code/modules/vending/engivend.dm

@@ -3,7 +3,6 @@
 	desc = "Spare tool vending. What? Did you expect some witty description?"
 	icon_state = "engivend"
 	icon_deny = "engivend-deny"
-	req_access = list(ACCESS_ENGINE_EQUIP)
 	products = list(/obj/item/clothing/glasses/meson/engine = 5,
 					/obj/item/clothing/glasses/welding = 5,
 					/obj/item/multitool = 5,
@@ -33,6 +32,7 @@
 	default_price = 450
 	extra_price = 500
 	payment_department = ACCOUNT_ENG
+	cost_multiplier_per_dept = list(ACCOUNT_ENG = 0)
 
 /obj/item/vending_refill/engivend
 	icon_state = "refill_engi"