Big toxins lab update! It's now way better, with two burn chambers and a

mixing and filtration room, along with a bigger observatory and an
'office' for plasma researchers, i.e. a table layout similar to the one
in chemistry. Instead of a chemical vendor, plasma researchers now got
their own custom vendor with assembly parts for bombastic bombs. The
maintenance tunnel's still kept between a double set of airlocks.

There is a problem with the vents and scrubbers of the office and burn
chamber room not being detected, though. (Miniature, Hawk, take a look
at it.)

code/ATMOSPHERICS/components/trinary_devices/filter.dm

@@ -7,6 +7,8 @@ obj/machinery/atmospherics/trinary/filter
 
 	req_access = list(access_atmospherics)
 
+	var/locked = 1 // If it's not locked, no need for an access check.
+
 	var/on = 0
 	var/temp = null // -- TLE
 
@@ -159,7 +161,7 @@ obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
 	if(..())
 		return
 
-	if(!src.allowed(user))
+	if(src.locked && !src.allowed(user))
 		user << "\red Access denied."
 		return
 
@@ -167,7 +169,7 @@ obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
 	var/current_filter_type
 	switch(filter_type)
 		if(0)
-			current_filter_type = "Carbon Molecules"
+			current_filter_type = "Carbon Molecules (e.g. Plasma)"
 		if(1)
 			current_filter_type = "Oxygen"
 		if(2)
@@ -185,7 +187,7 @@ obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
 			<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
 			<b>Filtering: </b>[current_filter_type]<br><HR>
 			<h4>Set Filter Type:</h4>
-			<A href='?src=\ref[src];filterset=0'>Carbon Molecules</A><BR>
+			<A href='?src=\ref[src];filterset=0'>Carbon Molecules (e.g Plasma)</A><BR>
 			<A href='?src=\ref[src];filterset=1'>Oxygen</A><BR>
 			<A href='?src=\ref[src];filterset=2'>Nitrogen</A><BR>
 			<A href='?src=\ref[src];filterset=3'>Carbon Dioxide</A><BR>
@@ -230,5 +232,3 @@ obj/machinery/atmospherics/trinary/filter/Topic(href, href_list) // -- TLE
 			src.attack_hand(M)
 */
 	return
-
-

code/defines/area/Space Station 13 areas.dm

@@ -970,25 +970,33 @@ proc/process_ghost_teleport_locs()
 //Toxins
 
 /area/toxins/lab
-	name = "Toxin Lab"
-	icon_state = "toxlab"
+	name = "Research Lab"
+	icon_state = "researchlab"
 
 /area/toxins/xenobiology
 	name = "Xenobiology Lab"
+	icon_state = "xenolab"
+
+/area/toxins/gasstorage
+	name = "R&D Gas Storage"
+	icon_state = "gasstorage"
+
+/area/toxins/toxinslab
+	name = "Toxins Lab"
 	icon_state = "toxlab"
 
-/area/toxins/storage
-	name = "Toxin Storage"
-	icon_state = "toxstorage"
-
 /area/toxins/test_area
-	name = "Toxin Test Area"
+	name = "Toxins Lab Test Area"
 	icon_state = "toxtest"
 
 /area/toxins/mixing
-	name = "Toxin Mixing Room"
+	name = "Toxins Lab Mixing Room"
 	icon_state = "toxmix"
 
+/area/toxins/observatory
+	name = "Toxins Lab Observatory"
+	icon_state = "toxobserv"
+
 /area/toxins/server
 	name = "Server Room"
 	icon_state = "server"

code/defines/obj/supplypacks.dm

@@ -183,6 +183,12 @@
 	contains = list("/obj/item/weapon/vending_charge/hydroponics")
 	containername = "Hydroponics charge crate"
 
+/datum/supply_packs/charge/tl
+	name = "Toxins Lab Charge"
+	contains = list("/obj/item/weapon/vending_charge/toxinslab")
+	containername = "Toxins Lab charge crate"
+
+
 /datum/supply_packs/food
 	name = "Food crate"
 	contains = list("/obj/item/weapon/reagent_containers/food/snacks/flour",

code/defines/obj/vending.dm

@@ -268,7 +268,7 @@
 
 /obj/machinery/vending/engineering
 	name = "Robco Tool Maker"
-	desc = "Everything you need for do-it-yourself ship repair."
+	desc = "Everything you need for do-it-yourself station repair."
 	icon_state = "engi"
 	icon_deny = "engi-deny"
 	req_access_txt = "10"
@@ -279,6 +279,14 @@
 	product_hideamt = ""
 	charge_type = "engineering"
 
+/obj/machinery/vending/plasmaresearch
+	name = "Toximate 3000"
+	desc = "All the fine parts you need in one vending machine!"
+	product_hidden = ""
+	product_hideamt = ""
+	product_paths = "/obj/item/device/transfer_valve;/obj/item/device/assembly/signaler;/obj/item/device/assembly/prox_sensor;/obj/item/device/assembly/igniter;/obj/item/device/assembly/timer"
+	product_amounts = "6;6;6;6;6"
+	charge_type = "toxinslab"
 
 /obj/item/weapon/vending_charge
 	name = "Vending Charge"
@@ -361,3 +369,8 @@
 	name = "Soda Charge"
 	charge_type = "soda"
 	icon_state = "soda-charge"
+
+/obj/item/weapon/vending_charge/toxinslab
+	name = "Toxins Lab Charge"
+	charge_type = "toxinslab"
+	icon_state = "toxinslab-charge"

code/game/machinery/igniter.dm

@@ -89,6 +89,7 @@
 
 	flick("[base_state]-spark", src)
 	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+
 	s.set_up(2, 1, src)
 	s.start()
 	src.last_spark = world.time