merge conflict and job/dept discounts support.

2020-05-03 02:11:05 +02:00
parent 94f014589d c1d1e4f0c0
commit a194d7dafe
308 changed files with 6846 additions and 9140 deletions
@@ -33,6 +33,11 @@
 					/obj/item/storage/box/matches = 10,
 					/obj/item/lighter/greyscale = 4,
 					/obj/item/storage/fancy/rollingpapers = 5)
+	payment_department = NO_FREEBIES
+
+/obj/machinery/vending/cigarette/syndicate/Initialize()
+	. = ..()
+	cost_multiplier_per_dept = list("[ACCESS_SYNDICATE]" = 0)

 /obj/machinery/vending/cigarette/beach //Used in the lavaland_biodome_beach.dmm ruin
 	name = "\improper ShadyCigs Ultra"