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
@@ -19,7 +19,7 @@
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
 	refill_canister = /obj/item/vending_refill/assist
 	resistance_flags = FIRE_PROOF
-	default_price = 125
+	default_price = 100
 	extra_price = 100
 	payment_department = NO_FREEBIES