Merge branch 'master' into holy-chapel

code/game/objects/effects/portals.dm

@@ -14,6 +14,7 @@
 	var/precision = TRUE // how close to the portal you will teleport. FALSE = on the portal, TRUE = adjacent
 	var/can_multitool_to_remove = FALSE
 	var/ignore_tele_proof_area_setting = FALSE
+	var/one_use = FALSE // Does this portal go away after one teleport?
 
 /obj/effect/portal/New(loc, turf/target, creator = null, lifespan = 300)
 	..()
@@ -101,14 +102,17 @@
 
 	if(prob(failchance))
 		icon_state = fail_icon
-		if(!do_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy -5), 3), 0, bypass_area_flag = ignore_tele_proof_area_setting)) // Try to send them to deep space.
+		var/list/target_z = levels_by_trait(SPAWN_RUINS)
+		target_z -= M.z
+		if(!do_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy -5), pick(target_z)), 0, bypass_area_flag = ignore_tele_proof_area_setting)) // Try to send them to deep space.
 			invalid_teleport()
 			return FALSE
 	else
 		if(!do_teleport(M, target, precision, bypass_area_flag = ignore_tele_proof_area_setting)) // Try to send them to a turf adjacent to target.
 			invalid_teleport()
 			return FALSE
-
+	if(one_use)
+		qdel(src)
 	return TRUE
 
 /obj/effect/portal/proc/invalid_teleport()

code/game/objects/items/devices/radio/beacon.dm

@@ -50,6 +50,10 @@
 /obj/item/radio/beacon/bacon/proc/digest_delay()
 	QDEL_IN(src, 600)
 
+/obj/item/radio/beacon/emagged
+	syndicate = TRUE
+	emagged = TRUE
+
 // SINGULO BEACON SPAWNER
 /obj/item/radio/beacon/syndicate
 	name = "suspicious beacon"

code/game/objects/items/devices/traitordevices.dm

@@ -273,20 +273,20 @@ effective or pretty fucking useless.
 /obj/item/teleporter/proc/dir_correction(mob/user) //Direction movement, screws with teleport distance and saving throw, and thus must be removed first
 	var/temp_direction = user.dir
 	switch(temp_direction)
-		if(NORTHEAST || SOUTHEAST)
+		if(NORTHEAST, SOUTHEAST)
 			user.dir = EAST
-		if(NORTHWEST || SOUTHWEST)
+		if(NORTHWEST, SOUTHWEST)
 			user.dir = WEST
 
 /obj/item/teleporter/proc/panic_teleport(mob/user, turf/destination, direction = NORTH)
 	var/saving_throw
 	switch(direction)
-		if(NORTH || SOUTH)
+		if(NORTH, SOUTH)
 			if(prob(50))
 				saving_throw = EAST
 			else
 				saving_throw = WEST
-		if(EAST || WEST)
+		if(EAST, WEST)
 			if(prob(50))
 				saving_throw = NORTH
 			else

code/game/objects/items/mountable_frames/apc_frame.dm

@@ -28,5 +28,5 @@
 	return TRUE
 
 /obj/item/mounted/frame/apc_frame/do_build(turf/on_wall, mob/user)
-	new /obj/machinery/power/apc(get_turf(src), get_dir(user, on_wall), 1)
+	new /obj/machinery/power/apc(get_turf(src), get_dir(user, on_wall), TRUE)
 	qdel(src)

code/game/objects/items/stacks/sheets/glass.dm

@@ -19,7 +19,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
 	new/datum/stack_recipe/window("fulltile window", /obj/structure/window/full/basic, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
 	new/datum/stack_recipe("fishbowl", /obj/machinery/fishtank/bowl, 1, time = 10), \
 	new/datum/stack_recipe("fish tank", /obj/machinery/fishtank/tank, 3, time = 20, on_floor = TRUE), \
-	new/datum/stack_recipe("wall aquariam", /obj/machinery/fishtank/wall, 4, time = 40, on_floor = TRUE) \
+	new/datum/stack_recipe("wall aquarium", /obj/machinery/fishtank/wall, 4, time = 40, on_floor = TRUE) \
 ))
 
 /obj/item/stack/sheet/glass

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

@@ -104,7 +104,7 @@
 
 /obj/item/stock_parts/matter_bin
 	name = "matter bin"
-	desc = "A container for hold compressed matter awaiting re-construction."
+	desc = "A container used to hold compressed matter awaiting re-construction."
 	icon_state = "matter_bin"
 	origin_tech = "materials=1"
 	materials = list(MAT_METAL=80)
@@ -145,7 +145,7 @@
 
 /obj/item/stock_parts/matter_bin/adv
 	name = "advanced matter bin"
-	desc = "A container for hold compressed matter awaiting re-construction."
+	desc = "A container used to hold compressed matter awaiting re-construction."
 	icon_state = "advanced_matter_bin"
 	origin_tech = "materials=3"
 	rating = 2
@@ -187,7 +187,7 @@
 
 /obj/item/stock_parts/matter_bin/super
 	name = "super matter bin"
-	desc = "A container for hold compressed matter awaiting re-construction."
+	desc = "A container used to hold compressed matter awaiting re-construction."
 	icon_state = "super_matter_bin"
 	origin_tech = "materials=4;engineering=4"
 	rating = 3
@@ -229,7 +229,7 @@
 
 /obj/item/stock_parts/matter_bin/bluespace
 	name = "bluespace matter bin"
-	desc = "A container for hold compressed matter awaiting re-construction."
+	desc = "A container used to hold compressed matter awaiting re-construction."
 	icon_state = "bluespace_matter_bin"
 	origin_tech = "materials=6;programming=4;engineering=4"
 	rating = 4

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

@@ -163,7 +163,7 @@
 /obj/item/storage/proc/show_to(mob/user)
 	if(!user.client)
 		return
-	if(user.s_active != src) // Switching from another container
+	if(user.s_active != src && !isobserver(user))
 		for(var/obj/item/I in src)
 			if(I.on_found(user)) // For mouse traps and such
 				return // If something triggered, don't open the UI

code/game/objects/structures/crates_lockers/closets/syndicate.dm

@@ -23,7 +23,7 @@
 /obj/structure/closet/syndicate/suits/populate_contents()
 	new /obj/item/clothing/mask/gas/syndicate(src)
 	new /obj/item/clothing/suit/space/hardsuit/syndi(src)
-	new /obj/item/tank/jetpack/oxygen/harness(src)
+	new /obj/item/tank/internals/oxygen/red(src)
 
 /obj/structure/closet/syndicate/nuclear
 	desc = "It's a storage unit for a Syndicate boarding party."
@@ -37,6 +37,7 @@
 	new /obj/item/storage/box/teargas(src)
 	new /obj/item/storage/box/flashbangs(src)
 	new /obj/item/storage/backpack/duffel/syndie/med(src)
+	new /obj/item/tank/jetpack/oxygen/harness(src)
 	new /obj/item/gun/projectile/automatic/shotgun/bulldog(src)
 	new /obj/item/gun/projectile/automatic/shotgun/bulldog(src)
 	new /obj/item/gun/projectile/automatic/shotgun/bulldog(src)
@@ -50,7 +51,7 @@
 /obj/structure/closet/syndicate/sst/populate_contents()
 	new /obj/item/ammo_box/magazine/mm556x45(src)
 	new /obj/item/gun/projectile/automatic/l6_saw(src)
-	new /obj/item/tank/jetpack/oxygen/harness(src)
+	new /obj/item/tank/internals/oxygen/red(src)
 	new /obj/item/storage/belt/military/sst(src)
 	new /obj/item/clothing/glasses/thermal(src)
 	new /obj/item/clothing/shoes/magboots/syndie/advance(src)