Merge branch 'quotefox:master' into master

code/game/gamemodes/dynamic/dynamic_rulesets_events.dm

@@ -717,7 +717,7 @@
 	typepath = /datum/round_event/camera_failure
 	requirements = list(0,0,0,0,0,0,0,0,0,0)
 	high_population_requirement = 0
-	weight = 100
+	weight = 8
 	cost = 2
 	repeatable_weight_decrease = 2 //Slightly drop the weight each time it is called to keep the pool from getting too diluted as the round goes on.
 	repeatable = TRUE
@@ -726,12 +726,14 @@
 /datum/dynamic_ruleset/event/filler
 	name = "Filler"
 	typepath = /datum/round_event/filler
+	requirements = list(0,0,0,0,0,0,0,0,0,0)
+	high_population_requirement = 0
 	chaos_max = 3
+	weight = 9
 	cost = 1
-	weight = 200
 	repeatable_weight_decrease = 0
 	repeatable = TRUE
-	occurances_max = 35
+	occurances_max = 250 //Testing with this number for now
 
 /datum/dynamic_ruleset/event/disease_outbreak
 	name = "Disease Outbreak"
@@ -772,8 +774,8 @@
 	typepath = /datum/round_event/mass_hallucination
 	requirements = list(0,0,0,0,0,0,0,0,0,0)
 	high_population_requirement = 0
-	weight = 4
-	cost = 2
+	weight = 1
+	cost = 4
 	repeatable_weight_decrease = 5
 	repeatable = TRUE
 	occurances_max = 2
@@ -810,7 +812,7 @@
 	requirements = list(101,101,0,0,0,0,0,0,0,0)
 	high_population_requirement = 0
 	weight = 5
-	cost = 2 //STOP ROLLING SO MUCH YOU MENACE
+	cost = 10 //STOP ROLLING SO MUCH YOU MENACE
 	repeatable_weight_decrease = 1
 
 /datum/dynamic_ruleset/event/shuttle_loan

code/game/objects/items/defib.dm

@@ -673,7 +673,7 @@
 		primetime = 10
 		return TRUE
 	if(istype(I, /obj/item/disk/medical/defib_decay))
-		if(!timedeath == initial(timedeath))
+		if(timedeath != initial(timedeath))
 			to_chat(user, "<span class='notice'>This unit is already upgraded with this disk!</span>")
 			return TRUE
 		to_chat(user, "<span class='notice'>You upgrade the unit with Longer Decay upgrade disk!</span>")