Merge pull request #22 from Alphas00/master

2nd Bartender Slow, Dumbbell fix

GainStation13/code/modules/gym/gym.dm

@@ -22,7 +22,7 @@
 	if(!using)
 		using = TRUE
 		to_chat(user, "<span>You do a rep with the [src]. YEEEEEAH!!!</span>")
-		if(do_after(usr, CLICK_CD_RESIST-reps, 0, usr, 1))
+		if(do_after(usr, CLICK_CD_RESIST-reps, usr))
 			if(iscarbon(user))
 				var/mob/living/carbon/U = user
 				U.adjust_fatness(-10, FATTENING_TYPE_WEIGHT_LOSS)

code/modules/jobs/job_types/bartender.dm

@@ -4,7 +4,7 @@
 	department_head = list("Head of Personnel")
 	department_flag = CIVILIAN
 	faction = "Station"
-	total_positions = 1
+	total_positions = 2
 	spawn_positions = 1
 	supervisors = "the head of personnel"
 	selection_color = "#bbe291"