Merge branch 'master' of https://github.com/Baystation12/Baystation12

Conflicts:
	code/datums/supplypacks.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	icons/mob/suit.dmi
	icons/obj/drinks.dmi

code/modules/admin/admin.dm

@@ -756,10 +756,16 @@ var/global/floorIsLava = 0
 
 /datum/admins/proc/delay()
 	set category = "Server"
-	set desc="Delay the game start"
+	set desc="Delay the game start/end"
 	set name="Delay"
 	if (!ticker || ticker.current_state != GAME_STATE_PREGAME)
-		return alert("Too late... The game has already started!", null, null, null, null, null)
+		if (src.rank in list("Badmin", "Game Admin", "Game Master"))
+			ticker.delay_end = !ticker.delay_end
+			log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
+			message_admins("\blue [key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1)
+		else
+			usr << "\red You are not a high enough rank."
+		return //alert("Round end delayed", null, null, null, null, null)
 	going = !( going )
 	if (!( going ))
 		world << "<b>The game start has been delayed.</b>"
@@ -1084,4 +1090,4 @@ proc/move_alien_ship()
 		alien_ship_location = 0
 	else
 		alien_ship_location = 1
-	return
+	return

code/modules/clothing/spacesuits/rig.dm

@@ -42,6 +42,7 @@
 	slowdown = 2
 	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 60)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
+	slowdown = 1.0
 
 
 //Chief Engineer's rig
@@ -56,6 +57,7 @@
 	icon_state = "rig-white"
 	name = "advanced hardsuit"
 	item_state = "ce_hardsuit"
+	slowdown = 1.0
 
 
 //Mining rig
@@ -69,6 +71,7 @@
 	icon_state = "rig-mining"
 	name = "mining hardsuit"
 	item_state = "mining_hardsuit"
+	slowdown = 1.0
 
 
 //Syndicate rig
@@ -78,6 +81,7 @@
 	item_state = "syndie_helm"
 	color = "syndi"
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
+	slowdown = 1.0
 
 /obj/item/clothing/suit/space/rig/syndi
 	icon_state = "rig-syndi"
@@ -88,6 +92,25 @@
 	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
 
+
+//Security rig
+/obj/item/clothing/head/helmet/space/rig/security
+	name = "security hardsuit helmet"
+	icon_state = "rig0-security"
+	color = "security"
+	armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10)
+
+/obj/item/clothing/suit/space/rig/security
+	name = "security hardsuit"
+	desc = "A suit specially designed for security to offer minor protection from environmental hazards, and greater protection from human hazards"
+	icon_state = "rig-security"
+	item_state = "rig-security"
+	slowdown = 1
+	armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10)
+	allowed = list(/obj/item/weapon/gun/energy/laser, /obj/item/weapon/gun/energy/pulse_rifle, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/gun/energy/taser, /obj/item/weapon/melee/baton)
+	slowdown = 1.0
+
+
 //Wizard Rig
 /obj/item/clothing/head/helmet/space/rig/wizard
 	name = "gem-encrusted hardsuit helmet"
@@ -106,6 +129,7 @@
 	unacidable = 1
 	armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60)
 	allowed = list(/obj/item/weapon/teleportation_scroll,/obj/item/weapon/tank/emergency_oxygen)
+	slowdown = 1.0
 
 
 //Medical Rig
@@ -139,12 +163,12 @@
 	icon_state = "rig0-atmos"
 	item_state = "atmos_helm"
 	color = "atmos"
-	armor = list(melee = 35, bullet = 5, laser = 15,energy = 5, bomb = 30, bio = 100, rad = 5)
+	armor = list(melee = 40, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 100, rad = 0)
 
 /obj/item/clothing/suit/space/rig/atmos
 	desc = "A special suit that protects against hazardous, low pressure environments. Has reduced radiation shielding to allow for greater mobility."
 	icon_state = "rig-atmos"
 	name = "atmos hardsuit"
 	item_state = "atmos_hardsuit"
-	armor = list(melee = 35, bullet = 5, laser = 15,energy = 5, bomb = 30, bio = 100, rad = 5)
+	armor = list(melee = 40, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 100, rad = 0)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen)

code/modules/mob/new_player/new_player.dm

@@ -319,10 +319,9 @@
 			if(job && IsJobAvailable(job.title))
 				var/active = 0
 				// Only players with the job assigned and AFK for less than 10 minutes count as active
-				for(var/mob/M in player_list)
-					if(M.mind && M.mind.assigned_job == job && M.client && M.client.inactivity <= 10 * 60 * 10)
-						active++
-				dat += "<a href='byond://?src=\ref[src];SelectedJob=[job.title]'>[job.title] ([job.current_positions]) (Active: [active])</a><br>"
+				for(var/mob/M in player_list) 
+					if(M.mind && M.client && M.mind.assigned_job == job && M.client.inactivity <= 10 * 60 * 10)
+						active++				dat += "<a href='byond://?src=\ref[src];SelectedJob=[job.title]'>[job.title] ([job.current_positions]) (Active: [active])</a><br>"
 
 		dat += "</center>"
 		src << browse(dat, "window=latechoices;size=300x640;can_close=1")

code/modules/reagents/Chemistry-Recipes.dm

@@ -479,6 +479,13 @@ datum
 				new /obj/item/stack/sheet/mineral/plasma(location)
 				return
 
+		condensedcapsaicin
+			name = "Condensed Capsaicin"
+			id = "condensedcapsaicin"
+			result = "condensedcapsaicin"
+			required_reagents = list("capsaicin" = 2)
+			required_catalysts = list("plasma" = 5)
+			result_amount = 1
 		virus_food
 			name = "Virus Food"
 			id = "virusfood"