Merge branch 'master' into development

# Conflicts:
#	maps/aurora/aurora-3_sublevel.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-5_interstitial.dmm

code/datums/trading/goods.dm

@@ -178,7 +178,6 @@
 		/obj/item/clothing/gloves/force                 = TRADER_BLACKLIST_ALL,
 		/obj/item/clothing/gloves/swat/fluff            = TRADER_BLACKLIST_ALL,
 		/obj/item/clothing/gloves/black/fluff           = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/gloves/fluff                 = TRADER_BLACKLIST_ALL,
 		/obj/item/clothing/gloves/yellow/typec          = TRADER_BLACKLIST,
 		/obj/item/clothing/gloves/swat/bst              = TRADER_BLACKLIST,
 		/obj/item/clothing/gloves/watch/fluff           = TRADER_BLACKLIST_ALL,
@@ -196,11 +195,9 @@
 		/obj/item/clothing/head/radiation               = TRADER_BLACKLIST,
 		/obj/item/clothing/head/tajaran                 = TRADER_BLACKLIST,
 		/obj/item/clothing/head/welding                 = TRADER_BLACKLIST,
-		/obj/item/clothing/head/soft/sec/corp/fluff     = TRADER_BLACKLIST_ALL,
 		/obj/item/clothing/head/fluff                   = TRADER_BLACKLIST_ALL,
 		/obj/item/clothing/head/det/fluff               = TRADER_BLACKLIST_ALL,
 		/obj/item/clothing/head/winterhood              = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/head/hairflower/fluff        = TRADER_BLACKLIST_ALL,
 		/obj/item/clothing/head/beret/engineering/fluff = TRADER_BLACKLIST_ALL
 	)
 

code/game/machinery/portable_turret.dm

@@ -231,6 +231,7 @@
 			enabled = value
 		else if(href_list["command"] == "lethal")
 			lethal = value
+			lethal_icon = value
 		else if(href_list["command"] == "check_synth")
 			check_synth = value
 		else if(href_list["command"] == "check_weapons")

code/game/objects/items/weapons/dice.dm

@@ -5,6 +5,9 @@
 	icon_state = "d66"
 	w_class = 1
 	var/sides = 6
+	var/weighted = FALSE //if this dice can cheat or something
+	var/favored_number = 1 //related to the var above
+	var/weighted_value = 70 //what is the chance of falling on the favored number
 	attack_verb = list("diced")
 
 /obj/item/weapon/dice/New()
@@ -12,7 +15,12 @@
 
 /obj/item/weapon/dice/throw_impact(atom/hit_atom)
 	..()
-	var/result = rand(1, sides)
+	var/result
+	if((weighted) && (prob(weighted_value)))
+		result = favored_number
+	else
+		result = rand(1, sides)
+
 	var/comment = ""
 	if(sides == 20 && result == 20)
 		comment = "Nat 20!"

code/modules/cargo/randomstock.dm

@@ -683,11 +683,9 @@ var/list/global/random_stock_large = list(
 			var/list/allgloves = typesof(/obj/item/clothing/gloves)
 
 			var/list/exclusion = list(/obj/item/clothing/gloves,
-			/obj/item/clothing/gloves/fluff,
 			/obj/item/clothing/gloves/swat/bst,
-			/obj/item/clothing/gloves/swat/fluff/hawk_gloves,
-			/obj/item/clothing/gloves/fluff/stone_ring,
-			/obj/item/clothing/gloves/black/fluff/kathleen_glove,
+			/obj/item/clothing/gloves/swat/fluff,
+			/obj/item/clothing/gloves/black/fluff,
 			/obj/item/clothing/gloves/powerfist,
 			/obj/item/clothing/gloves/claws)
 			exclusion += typesof(/obj/item/clothing/gloves/rig)

code/modules/clothing/clothing.dm

@@ -316,37 +316,6 @@
 	item_state = "earmuffs"
 	slot_flags = SLOT_EARS | SLOT_TWOEARS
 
-///////////////////////////////////////////////////////////////////////
-//Glasses
-/*
-SEE_SELF  // can see self, no matter what
-SEE_MOBS  // can see all mobs, no matter what
-SEE_OBJS  // can see all objs, no matter what
-SEE_TURFS // can see all turfs (and areas), no matter what
-SEE_PIXELS// if an object is located on an unlit area, but some of its pixels are
-          // in a lit area (via pixel_x,y or smooth movement), can see those pixels
-BLIND     // can't see anything
-*/
-/obj/item/clothing/glasses
-	name = "glasses"
-	icon = 'icons/obj/clothing/glasses.dmi'
-	w_class = 2.0
-	body_parts_covered = EYES
-	slot_flags = SLOT_EYES
-	var/vision_flags = 0
-	var/darkness_view = 0//Base human is 2
-	var/see_invisible = -1
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/eyes.dmi',
-		"Resomi" = 'icons/mob/species/resomi/eyes.dmi'
-		)
-	species_restricted = list("exclude","Vaurca Breeder")
-
-/obj/item/clothing/glasses/update_clothing_icon()
-	if (ismob(src.loc))
-		var/mob/M = src.loc
-		M.update_inv_glasses()
-
 ///////////////////////////////////////////////////////////////////////
 //Gloves
 /obj/item/clothing/gloves

code/modules/clothing/glasses/glasses.dm

@@ -1,12 +1,24 @@
-
+///////////////////////////////////////////////////////////////////////
+//Glasses
+/*
+SEE_SELF  // can see self, no matter what
+SEE_MOBS  // can see all mobs, no matter what
+SEE_OBJS  // can see all objs, no matter what
+SEE_TURFS // can see all turfs (and areas), no matter what
+SEE_PIXELS// if an object is located on an unlit area, but some of its pixels are
+          // in a lit area (via pixel_x,y or smooth movement), can see those pixels
+BLIND     // can't see anything
+*/
 /obj/item/clothing/glasses
 	name = "glasses"
 	icon = 'icons/obj/clothing/glasses.dmi'
-	//w_class = 2.0
-	//slot_flags = SLOT_EYES
-	//var/vision_flags = 0
-	//var/darkness_view = 0//Base human is 2
+	w_class = 2.0
+	slot_flags = SLOT_EYES
+	body_parts_covered = EYES
+	var/vision_flags = 0
+	var/darkness_view = 0//Base human is 2
 	var/prescription = 0
+	var/see_invisible = -1
 	var/toggleable = 0
 	var/off_state = "degoggles"
 	var/active = 1
@@ -14,6 +26,17 @@
 	var/obj/screen/overlay = null
 	var/obj/item/clothing/glasses/hud/hud = null	// Hud glasses, if any
 	var/activated_color = null
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/eyes.dmi',
+		"Resomi" = 'icons/mob/species/resomi/eyes.dmi'
+		)
+	species_restricted = list("exclude","Vaurca Breeder")
+
+/obj/item/clothing/glasses/update_clothing_icon()
+	if (ismob(src.loc))
+		var/mob/M = src.loc
+		M.update_inv_glasses()
+
 
 /obj/item/clothing/glasses/attack_self(mob/user)
 	if(toggleable)

code/modules/customitems/item_defines.dm

@@ -25,11 +25,6 @@ All custom items with worn sprites must follow the contained sprite system: http
 			desc = "Inside the pocket watch, there is a collection of numbers, displaying '[worldtime2text()]'. On the inside of the lid, there is another sequence of numbers etched into the lid itself."
 
 
-/obj/item/clothing/head/soft/sec/corp/fluff/mendoza_cap //Mendoza's cap - Chance Mendoza - loow
-	name = "well-worn corporate security cap"
-	desc = "A baseball hat in corporate colors.\"C. Mendoza\" is embroidered in fine print on the bill. On the underside of the cap, in dark ink, the phrase \"Gamble till you're Lucky!\" is written in loopy cursive handwriting."
-
-
 /obj/item/clothing/head/fluff/ziva_bandana //Ziva's Bandana - Ziva Ta'Kim - sierrakomodo
 	name = "old bandana"
 	desc = "An old orange-ish-yellow bandana. It has a few stains from engine grease, and the color has been dulled."
@@ -116,11 +111,6 @@ All custom items with worn sprites must follow the contained sprite system: http
 	slot_flags = SLOT_MASK | SLOT_TIE
 
 
-/obj/item/clothing/ears/skrell/purple_skrell_cloth_male/fluff/dompesh_cloth //Skrell Purple Head Cloth - Shkor-Dyet Dom'Pesh - mofo1995
-	name = "male skrell purple head cloth"
-	desc = "A set of purple headcloths fit for a skrell's head tails. This one has a small SAMPLe logo on the interior of each cloth, perfect for scientific skrell."
-
-
 /obj/item/weapon/fluff/kiara_altar //Pocket Altar - Kiara Branwen - nursiekitty
 	name = "pocket altar"
 	desc = "A black tin box with a symbol painted over it. It shimmers in the light."
@@ -158,11 +148,6 @@ All custom items with worn sprites must follow the contained sprite system: http
 	/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter,/obj/item/device/taperecorder, /obj/item/clothing/accessory/badge/fluff/bell_badge)
 
 
-/obj/item/clothing/under/syndicate/tacticool/fluff/jaylor_turtleneck //Borderworlds Turtleneck - Jaylor Rameau - evilbrage
-	name = "borderworlds turtleneck"
-	desc = "A loose-fitting turtleneck, common among borderworld pilots and criminals. One criminal in particular is missing his, apparently."
-
-
 /obj/item/weapon/melee/fluff/tina_knife //Consecrated Athame - Tina Kaekel - tainavaa
 	name = "consecrated athame"
 	desc = "An athame used in occult rituals. The double-edged dagger is dull. The handle is black with a pink/white occult design strewn about it, and \"Tina\" is inscribed into it in decorated letters."
@@ -396,10 +381,6 @@ All custom items with worn sprites must follow the contained sprite system: http
 
 	usr.update_inv_wear_suit()
 
-/obj/item/clothing/head/beret/centcom/officer/fluff/fabian_beret //Worn Security Beret - Fabian Goellstein - mirkoloio
-	name = "worn security beret"
-	desc = "A NT Asset Protection Force Beret. It has the NT APF insignia on it as well as the Name \"Goellstein\" inside."
-
 
 /obj/item/clothing/head/fluff/vittorio_fez //Black Fez - Vittorio Giurifiglio - tytostyris
 	name = "black fez"
@@ -473,18 +454,13 @@ All custom items with worn sprites must follow the contained sprite system: http
 	icon_state = "barcia_flask"
 
 
-/obj/item/clothing/gloves/fluff/stone_ring //Thunder Dome Pendant Ring - Jerimiah Stone - dominicthemafiaso
+/obj/item/clothing/ring/fluff/stone_ring //Thunder Dome Pendant Ring - Jerimiah Stone - dominicthemafiaso
 	name = "thunder dome pendant ring"
 	desc = "It appears to be a Collectors edition Thunder dome Pendant ring from the IGTDL's show rumble in the red planet in 2444. It has a decorative diamond center with a image of the Intergalactic belt in the center."
 	icon = 'icons/obj/custom_items/stone_ring.dmi'
 	icon_state = "stone_ring"
 	item_state = "stone_ring"
 	contained_sprite = TRUE
-	clipped = TRUE
-	species_restricted = null
-	gender = NEUTER
-	body_parts_covered = null
-	fingerprint_chance = 100
 
 
 /obj/item/clothing/under/dress/fluff/sayyidah_dress //Traditional Jumper Dress - Sayyidah Al-Kateb - alberyk
@@ -655,11 +631,6 @@ All custom items with worn sprites must follow the contained sprite system: http
 	contained_sprite = TRUE
 
 
-/obj/item/clothing/head/soft/sec/corp/fluff/karson_cap //Karson's Cap - Eric Karson - dronzthewolf
-	name = "well-worn corporate security cap"
-	desc = "A well-worn corporate security cap. The name \"Karson\" is written on the underside of the brim, it is well-worn at the point where it has shaped to the owner's head."
-
-
 /obj/item/sign/fluff/triaka_atimono //Framed Zatimono - Azkuyua Triaka - jackboot
 	name = "framed zatimono"
 	desc = "A framed Zatimono, a Unathi standard worn into battle similar to an old-Earth Sashimono. This one is slightly faded."
@@ -692,16 +663,6 @@ All custom items with worn sprites must follow the contained sprite system: http
 	item_state = "zohjar_uniform"
 	contained_sprite = TRUE
 
-/obj/item/clothing/suit/storage/toggle/labcoat/tajaran/fluff/zohjar_jacket //People's Republic Medical Officer Coat - Zohjar Rasateir - lordraven001
-	name = "people's republic medical officer coat"
-	desc = "A sterile insulated coat made of leather stitched over fur. It has two gold lapels indicating Officer rank. \
-	The a white armband with a scarlet line in the center indicates that the person wearing this coat is medically trained."
-
-
-/obj/item/clothing/suit/storage/tajaran/fluff/maksim_coat //Tajaran Naval Officer's Coat - Maksim Vasilyev - aimlessanalyst
-	name = "tajaran naval officer coat"
-	desc = "A thick wool coat from Adhomai, calling back to days long past."
-
 
 /obj/item/sign/fluff/iskanz_atimono //Framed Zatimono - Iskanz Sal'Dans - zundy
 	name = "framed zatimono"
@@ -831,11 +792,6 @@ All custom items with worn sprites must follow the contained sprite system: http
 	badge_string = "NanoTrasen Security Department"
 
 
-/obj/item/clothing/head/hairflower/fluff/aquila_pin //Magnetic Flower Pin - Aquila - nandastar
-	name = "magnetic flower pin"
-	desc = "That's a magnet in the shape of a hair flower pin. Smells nice."
-
-
 /obj/item/clothing/head/beret/engineering/fluff/ikrad_beret //LR-31MTA Beret - Ikrad Yam'hir - houseofsynth
 	name = "\improper LR-31MTA beret"
 	desc = "A silver beret with an insignia on the front, it looks like an old Tajaran cannon with a ring around it. \
@@ -1164,6 +1120,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	if(..(user, 1))
 		user << "It is [active ? "on" : "off"]."
 
+
 /obj/item/weapon/reagent_containers/food/drinks/bottle/cognac/fluff/leonce_cognac //Old Earth Luxury Cognac - Francois Leonce - driecg36
 	name = "old earth luxury cognac"
 	desc = "An unusually shaped crystal bottle, covered in elaborate etchings displaying the symbol of the house that produced it. Inside is a smooth, amber liquor, \
@@ -2039,4 +1996,46 @@ obj/item/clothing/suit/storage/hooded/fluff/make_poncho //Raincoat Poncho - M.A.
 	on = FALSE
 	update_icon()
 	playsound(src, "spark", 50, 1, -1)
-	..()
+	..()
+
+
+/obj/item/clothing/head/fluff/jix_wrap //Dull Headwraps - JIX - kyres1
+	name = "dull headwraps"
+	desc = "A sturdy, dull brown cloth."
+	icon = 'icons/obj/custom_items/jix_items.dmi'
+	icon_state = "jix_wrap"
+	item_state = "jix_wrap"
+	contained_sprite = TRUE
+
+/obj/item/clothing/suit/fluff/jix_robes //Dull Robes - JIX - kyres1
+	name = "dull robes"
+	desc = "A set of drab robes which look particularly old, though in good condition. It consists of two pieces, loosely connected and separating at the center."
+	icon = 'icons/obj/custom_items/jix_items.dmi'
+	icon_state = "jix_robes"
+	item_state = "jix_robes"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+	contained_sprite = TRUE
+
+
+/obj/item/clothing/mask/fluff/ird_mask //Titanium Faceplate - IRD - kyres1
+	name = "titanium faceplate"
+	desc = "An odd mask seeming to mimic the face of a Human with some artistic liberties taken. Small lights keep it dimly illuminated from within with holographic projectors emulating two bright blue eyes.  \
+	Its rigid frame is composed of what looks like polished titanium."
+	icon = 'icons/obj/custom_items/ird_face.dmi'
+	icon_state = "ird_mask"
+	item_state = "ird_mask"
+	contained_sprite = TRUE
+	flags_inv = HIDEEARS|HIDEFACE
+	body_parts_covered = FACE
+	w_class = 3.0
+
+
+/obj/item/weapon/dice/fluff/baron_dice //BARON's Dice - BARON - iamcrystalclear
+	weighted = TRUE
+	favored_number = 2
+
+
+/obj/item/weapon/flame/lighter/zippo/fluff/nikit_zippo //Vasili Mine Zippo - Nikit Vasili - simontheminer
+	desc = "An old looking zippo lighter with Vasili Mine Logo engraved on it. \"Good Luck Nikit\" is crudely scratched on under the logo in small writing."
+	icon = 'icons/obj/custom_items/nikit_zippo.dmi'
+	icon_state = "nikit_zippo"

code/modules/mob/living/carbon/human/species/station/station.dm

@@ -624,7 +624,7 @@ datum/species/machine/handle_post_spawn(var/mob/living/carbon/human/H)
 	bodytype = "Vaurca"
 	age_min = 1
 	age_max = 20
-	economic_modifier = 1
+	economic_modifier = 2
 	language = LANGUAGE_VAURCA
 	primitive_form = "V'krexi"
 	greater_form = "Vaurca Warrior"

code/modules/mob/living/living.dm

@@ -677,7 +677,15 @@ default behaviour is:
 	if(buckled)
 		buckled.user_unbuckle_mob(src)
 
+/mob/living/var/last_resist
+
 /mob/living/proc/resist_grab()
+	if (last_resist + 4 > world.time)
+		return
+	last_resist = world.time
+	if (stat || paralysis || stunned)
+		src << "<span class='notice'>You can't move...</span>"
+		return
 	var/resisting = 0
 	for(var/obj/O in requests)
 		requests.Remove(O)

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -36,17 +36,21 @@
 	if (nutriment_amt)
 		reagents.add_reagent(nutriment_type, nutriment_amt, nutriment_desc)
 
-/obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume(var/mob/M)
+/obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume(var/mob/eater, var/mob/feeder = null)
 	if(!reagents.total_volume)
-		M.visible_message("<span class='notice'>[M] finishes eating \the [src].</span>","<span class='notice'>You finish eating \the [src].</span>")
-		M.drop_from_inventory(src)	//so icons update :[
+		eater.visible_message("<span class='notice'>[eater] finishes eating \the [src].</span>","<span class='notice'>You finish eating \the [src].</span>")
+
+		if (!feeder)
+			feeder = eater
+
+		feeder.drop_from_inventory(src)	//so icons update :[
 
 		if(trash)
 			if(ispath(trash,/obj/item))
-				var/obj/item/TrashItem = new trash(M)
-				M.put_in_hands(TrashItem)
+				var/obj/item/TrashItem = new trash(feeder)
+				feeder.put_in_hands(TrashItem)
 			else if(istype(trash,/obj/item))
-				M.put_in_hands(trash)
+				feeder.put_in_hands(trash)
 		qdel(src)
 	return
 
@@ -114,7 +118,7 @@
 				else
 					reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
 				bitecount++
-				On_Consume(M)
+				On_Consume(M, user)
 			return 1
 
 	else if (isanimal(M))
@@ -144,7 +148,7 @@
 				user.visible_message("<span class='notice'>[user] feeds [M] a tiny bit of [src]. <b>It looks full.</b></span>")
 				if (!istype(M.loc, /turf))
 					M << "<span class='notice'>[user] feeds you a tiny bit of [src]. <b>You feel pretty full!</b></span>"
-			On_Consume(M)
+			On_Consume(M, user)
 			return 1
 		else
 			user << "<span class='danger'>[M.name] can't stomach anymore food!</span>"

html/changelog.html

@@ -56,11 +56,24 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">10 May 2018</h2>
+			<h3 class="author">Kaedwuff updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">No longer can your victims resist their way out of a good sucking after being hypnotized by your vampire.</li>
+			</ul>
+
 			<h2 class="date">07 May 2018</h2>
 			<h3 class="author">BurgerBB updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Fixes the stacking machine from eating materials due to an oversight.</li>
 			</ul>
+			<h3 class="author">PoZe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">EMT room now has two GPS and two medical emergency medical radios</li>
+				<li class="maptweak">Increased size of Toxin's airlock, allowing canister to refill from main air supply</li>
+				<li class="bugfix">Fixed tags(names) for medical construction level security cameras</li>
+				<li class="spellcheck">Chemistry, and security construction levels request consoles names are fixed according to their room.</li>
+			</ul>
 
 			<h2 class="date">25 April 2018</h2>
 			<h3 class="author">Alberyk updated:</h3>

html/changelogs/.all_changelog.yml

@@ -5393,3 +5393,14 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2018-05-07:
   BurgerBB:
   - rscadd: Fixes the stacking machine from eating materials due to an oversight.
+  PoZe:
+  - rscadd: EMT room now has two GPS and two medical emergency medical radios
+  - maptweak: Increased size of Toxin's airlock, allowing canister to refill from
+      main air supply
+  - bugfix: Fixed tags(names) for medical construction level security cameras
+  - spellcheck: Chemistry, and security construction levels request consoles names
+      are fixed according to their room.
+2018-05-10:
+  Kaedwuff:
+  - bugfix: No longer can your victims resist their way out of a good sucking after
+      being hypnotized by your vampire.

html/changelogs/Sindorman-AI.yml

@@ -0,0 +1,6 @@
+author: PoZe
+
+delete-after: True
+
+changes:
+  - tweak: "All AI intercom microphones are turned off by default. To help new antag AI players not to accidentally reveal their plans"

html/changelogs/skull132_vaurca_econ.yml

@@ -0,0 +1,5 @@
+author: Skull132
+delete-after: True
+
+changes:
+  - tweak: "Bumped Vaurca economic modifier by 1 point, as per lore developments."

maps/aurora/aurora-3_sublevel.dmm

@@ -6337,7 +6337,7 @@
 	pixel_y = 0
 	},
 /obj/item/device/radio/intercom{
-	broadcasting = 1;
+	broadcasting = 0;
 	listening = 1;
 	name = "Common Channel";
 	pixel_x = -27;
@@ -7151,7 +7151,7 @@
 	pixel_y = -26
 	},
 /obj/item/device/radio/intercom{
-	broadcasting = 1;
+	broadcasting = 0;
 	listening = 1;
 	name = "Common Channel";
 	pixel_x = 27;
@@ -7868,7 +7868,7 @@
 	pixel_y = 0
 	},
 /obj/item/device/radio/intercom{
-	broadcasting = 1;
+	broadcasting = 0;
 	listening = 1;
 	name = "Common Channel";
 	pixel_x = -27;
@@ -26287,25 +26287,12 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay4)
 "Uj" = (
-/obj/machinery/atmospherics/pipe/simple/visible,
-/obj/machinery/camera/network/research_outpost{
-	c_tag = "Research Sublevel - Toxins Testing Storage";
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
-	},
-/obj/machinery/alarm{
-	dir = 4;
-	icon_state = "alarm0";
-	pixel_x = -22
-	},
 /turf/simulated/floor/tiled,
 /area/rnd/mixing)
 "Uk" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
@@ -26314,16 +26301,17 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/rnd/mixing)
 "Ul" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/rnd/mixing)
 "Um" = (
@@ -26506,55 +26494,47 @@
 /turf/simulated/floor/plating,
 /area/rnd/mixing)
 "UB" = (
-/obj/effect/floor_decal/industrial/warning{
-	icon_state = "warning";
-	dir = 10
-	},
 /obj/structure/cable/green{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/visible{
-	icon_state = "intact";
-	dir = 9
+/obj/effect/floor_decal/industrial/warning/cee{
+	icon_state = "warningcee";
+	dir = 8
 	},
-/obj/machinery/access_button{
-	command = "cycle_interior";
-	frequency = 1379;
-	master_tag = "toxinsairlock_airlock";
-	name = "interior access button";
-	pixel_x = 0;
-	pixel_y = -25;
-	req_one_access = list(13,65)
+/obj/machinery/atmospherics/binary/pump/on{
+	dir = 8;
+	name = "Distro to Canisters";
+	target_pressure = 150
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/plating,
 /area/rnd/mixing)
 "UC" = (
 /obj/machinery/light/small,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
-	},
 /obj/effect/floor_decal/industrial/warning,
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/obj/machinery/requests_console{
-	department = "Science";
-	departmentType = 2;
-	name = "Science Requests Console";
-	pixel_x = 0;
-	pixel_y = -30
+/obj/machinery/alarm{
+	dir = 1;
+	pixel_y = -22
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/mixing)
 "UD" = (
-/obj/machinery/suit_storage_unit/standard_unit,
 /obj/effect/floor_decal/industrial/warning{
 	dir = 6
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	icon_state = "intact-supply";
+	dir = 9
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/mixing)
 "UE" = (
@@ -27195,6 +27175,64 @@
 	icon_state = "asteroidplating"
 	},
 /area/mine/unexplored)
+"Wi" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/suit_storage_unit/standard_unit,
+/turf/simulated/floor/tiled,
+/area/rnd/mixing)
+"Wj" = (
+/obj/machinery/atmospherics/pipe/simple/visible,
+/obj/machinery/camera/network/research_outpost{
+	c_tag = "Research Sublevel - Toxins Testing Storage";
+	dir = 4
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/rnd/mixing)
+"Wk" = (
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/access_button{
+	command = "cycle_exterior";
+	frequency = 1379;
+	master_tag = "toxinsairlock_airlock";
+	name = "exterior access button";
+	pixel_x = 25;
+	pixel_y = -25;
+	req_one_access = list(13,65)
+	},
+/turf/simulated/floor/asteroid/ash/rocky,
+/area/mine/unexplored)
+"Wl" = (
+/obj/effect/floor_decal/industrial/warning{
+	icon_state = "warning";
+	dir = 10
+	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/access_button{
+	command = "cycle_interior";
+	frequency = 1379;
+	master_tag = "toxinsairlock_airlock";
+	name = "interior access button";
+	pixel_x = 0;
+	pixel_y = -25;
+	req_one_access = list(13,65)
+	},
+/obj/machinery/atmospherics/pipe/manifold/visible,
+/obj/machinery/meter,
+/turf/simulated/floor/tiled,
+/area/rnd/mixing)
 
 (1,1,1) = {"
 aa
@@ -43048,7 +43086,7 @@ Tx
 Sm
 ac
 ac
-Ve
+Wk
 rH
 UU
 sK
@@ -43304,9 +43342,9 @@ Tm
 Ty
 Sm
 ac
-ac
-Ux
-rH
+NP
+Uy
+NP
 UV
 sK
 aa
@@ -43562,7 +43600,7 @@ Tz
 Sm
 ac
 NP
-Uy
+Uz
 NP
 UY
 NP
@@ -43817,9 +43855,9 @@ SS
 To
 SS
 TK
-ac
 NP
-Uz
+NP
+UA
 NP
 UY
 NP
@@ -44074,9 +44112,9 @@ ST
 Tp
 TA
 NP
-NP
-NP
-UA
+TY
+Wj
+Wl
 NP
 UY
 NP
@@ -44331,7 +44369,7 @@ SU
 PV
 TB
 NP
-TY
+Wi
 Uj
 UB
 NP