Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into STILLALOTOFBLOOD

code/modules/events/blob.dm

@@ -7,8 +7,8 @@
 
 
 /datum/event/blob/announce()
-	command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name()]. Nanotrasen has issued a directive 7-10. The station is to be considered quarantined.", "Biohazard Alert", new_sound = 'sound/AI/blob_confirmed.ogg')
-		
+	command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name()]. Nanotrasen has issued a directive 7-10. The station is to be considered quarantined.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg')
+
 	for (var/mob/living/silicon/ai/aiPlayer in player_list)
 		if (aiPlayer.client)
 			var/law = "The station is under quarantine, prevent biological entities from leaving the station at all costs while minimizing collateral damage."
@@ -34,16 +34,16 @@
 	if(!Blob && !blob_cores.len)
 		kill()
 		return
-			
+
 /datum/event/blob/proc/announce_nuke()
 	var/nukecode = "ERROR"
 	for(var/obj/machinery/nuclearbomb/bomb in world)
 		if(bomb && bomb.r_code && (bomb.z in config.station_levels))
 			nukecode = bomb.r_code
-	
+
 	command_announcement.Announce("The biohazard has grown out of control and will soon reach critical mass. Activate the nuclear failsafe to maintain quarantine. The Nuclear Authentication Code is [nukecode] ", "Biohazard Alert")
 	set_security_level("gamma")
-	
+
 	var/obj/machinery/door/airlock/vault/V = locate(/obj/machinery/door/airlock/vault) in world
 	if(V && (V.z in config.station_levels))
 		V.locked = 0
@@ -55,16 +55,16 @@
 			aiPlayer.set_zeroth_law(law)
 			aiPlayer << "\red <b>You have detected a change in your laws information:</b>"
 			aiPlayer << "Laws Updated: [law]"
-		
-	spawn(10)	
+
+	spawn(10)
 		world << sound('sound/effects/siren.ogg')
-		
+
 /datum/event/blob/kill()
 	spawn(10)
 		if(Blob || blob_cores.len)
 			return
 		command_announcement.Announce("The level 7 biohazard aboard [station_name()] has been eliminated. Directive 7-10 has been lifted, and the station is no longer quarantined.", "Biohazard Update")
-		
+
 		for (var/mob/living/silicon/ai/aiPlayer in player_list)
 			if (aiPlayer.client)
 				aiPlayer.clear_zeroth_law()

code/modules/events/tgevents/brand_intelligence.dm

@@ -33,7 +33,7 @@
 
 
 /datum/event/brand_intelligence/tick()
-	if(!originMachine || originMachine.gc_destroyed || originMachine.shut_up || originMachine.wires.IsAllCut())	//if the original vending machine is missing or has it's voice switch flipped
+	if(!originMachine || !isnull(originMachine.gcDestroyed) || originMachine.shut_up || originMachine.wires.IsAllCut())	//if the original vending machine is missing or has it's voice switch flipped
 		for(var/obj/machinery/vending/saved in infectedMachines)
 			saved.shoot_inventory = 0
 		if(originMachine)
@@ -44,7 +44,7 @@
 
 	if(!vendingMachines.len)	//if every machine is infected
 		for(var/obj/machinery/vending/upriser in infectedMachines)
-			if(prob(70) && !upriser.gc_destroyed)
+			if(prob(70) && isnull(upriser.gcDestroyed))
 				var/mob/living/simple_animal/hostile/mimic/copy/M = new(upriser.loc, upriser, null, 1) // it will delete upriser on creation and override any machine checks
 				M.faction = list("profit")
 				M.speak = rampant_speeches.Copy()

code/modules/events/tgevents/vent_clog.dm

@@ -22,7 +22,7 @@
 
 		var/list/gunk = list("water","carbon","flour","radium","toxin","cleaner","nutriment","condensedcapsaicin","psilocybin","lube",
 							"atrazine","banana","charcoal","space_drugs","methamphetamine","holywater","ethanol","hot_coco","facid",
-							"blood","morphine","fluorine","mutadone","mutagen","hydrocodone","fuel",
+							"blood","morphine","ether","fluorine","mutadone","mutagen","hydrocodone","fuel",
 							"haloperidol","lsd","nanites","lipolicide","frostoil","salglu_solution","beepskysmash",
 							"omnizine", "amanitin", "adminordrazine", "neurotoxin", "synaptizine")
 		var/datum/reagents/R = new/datum/reagents(50)