Merge branch 'master' into upstream-merge-37476

code/modules/events/pirates.dm

@@ -94,13 +94,13 @@
 	density = TRUE
 	anchored = TRUE
 	var/active = FALSE
-	var/obj/item/device/gps/gps
+	var/obj/item/gps/gps
 	var/credits_stored = 0
 	var/siphon_per_tick = 5
 
 /obj/machinery/shuttle_scrambler/Initialize(mapload)
 	. = ..()
-	gps = new/obj/item/device/gps/internal/pirate(src)
+	gps = new/obj/item/gps/internal/pirate(src)
 	gps.tracking = FALSE
 	update_icon()
 
@@ -174,7 +174,7 @@
 	QDEL_NULL(gps)
 	return ..()
 
-/obj/item/device/gps/internal/pirate
+/obj/item/gps/internal/pirate
 	gpstag = "Nautical Signal"
 	desc = "You can hear shanties over the static."
 

code/modules/events/shuttle_loan.dm

@@ -157,7 +157,7 @@
 					shuttle_spawns.Add(/mob/living/simple_animal/hostile/syndicate)
 
 			if(RUSKY_PARTY)
-				var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/organic/party]
+				var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/service/party]
 				pack.generate(pick_n_take(empty_shuttle_turfs))
 
 				shuttle_spawns.Add(/mob/living/simple_animal/hostile/russian)

code/modules/events/vent_clog.dm

@@ -1,9 +1,9 @@
 /datum/round_event_control/vent_clog
-	name = "Clogged Vents"
+	name = "Clogged Vents: Normal"
 	typepath = /datum/round_event/vent_clog
-	weight = 25
-	max_occurrences = 0
-	min_players = 50
+	weight = 10
+	max_occurrences = 3
+	min_players = 25
 
 /datum/round_event/vent_clog
 	announceWhen	= 1
@@ -11,10 +11,15 @@
 	endWhen			= 35
 	var/interval 	= 2
 	var/list/vents  = list()
+	var/randomProbability = 1
+	var/reagentsAmount = 100
+	var/list/saferChems = list("water","carbon","flour","cleaner","nutriment","condensedcapsaicin","mushroomhallucinogen","lube","pink_glitter",
+						 "plantbgone","blood","charcoal","space_drugs","morphine","holywater","ethanol","hot_coco","sacid","mindbreaker","rotatium","skewium",
+						 "pax","laughter","concentrated_barbers_aid","colorful_reagent","dizzysolution","tiresolution","salt","beer","hair_dye","sugar","white_glitter","growthserum")
+
 /datum/round_event/vent_clog/announce()
 	priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert")
 
-
 /datum/round_event/vent_clog/setup()
 	endWhen = rand(25, 100)
 	for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/temp_vent in GLOB.machines)
@@ -28,7 +33,10 @@
 		if(vent && vent.loc)
 			var/datum/reagents/R = new/datum/reagents(1000)
 			R.my_atom = vent
-			R.add_reagent(get_random_reagent_id(), 250)
+			if (prob(randomProbability))
+				R.add_reagent(get_random_reagent_id(), reagentsAmount)
+			else
+				R.add_reagent(pick(saferChems), reagentsAmount)
 
 			var/datum/effect_system/foam_spread/foam = new
 			foam.set_up(200, get_turf(vent), R)
@@ -39,3 +47,27 @@
 				new /mob/living/simple_animal/cockroach(get_turf(vent))
 				cockroaches--
 		CHECK_TICK
+
+/datum/round_event_control/vent_clog/threatening
+	name = "Clogged Vents: Threatening"
+	typepath = /datum/round_event/vent_clog/threatening
+	weight = 4
+	min_players = 35
+	max_occurrences = 1
+	earliest_start = 35 MINUTES
+
+/datum/round_event/vent_clog/threatening
+	randomProbability = 10
+	reagentsAmount = 200
+
+/datum/round_event_control/vent_clog/catastrophic
+	name = "Clogged Vents: Catastrophic"
+	typepath = /datum/round_event/vent_clog/catastrophic
+	weight = 2
+	min_players = 45
+	max_occurrences = 1
+	earliest_start = 45 MINUTES
+
+/datum/round_event/vent_clog/catastrophic
+	randomProbability = 30
+	reagentsAmount = 250