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
@@ -80,7 +80,7 @@ SLIME SCANNER
 	var/mode = 1
 	var/scanmode = 0
 	var/advanced = FALSE
-	custom_price = 300
+	custom_price = 100

 /obj/item/healthanalyzer/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins to analyze [user.p_them()]self with [src]! The display shows that [user.p_theyre()] dead!</span>")