Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology

Conflicts:
	icons/obj/hydroponics.dmi

manual merge of conflicted icon file

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm

@@ -86,9 +86,6 @@
 					for(var/coin_type in typesof(/obj/item/weapon/coin))
 						possible_spawns += coin_type
 
-					//no icon_state for mythril coins
-					possible_spawns -= /obj/item/weapon/coin/mythril
-
 					var/coin_type = pick(possible_spawns)
 					for(var/i=0,i<amount,i++)
 						new coin_type(C)
@@ -306,7 +303,7 @@
 	switch(trap_type)
 		if("sawburst")
 			M << "\red <b>A sawblade shoots out of the ground and strikes you!</b>"
-			M.apply_damage(rand(5,10), BRUTE)
+			M.apply_damage(rand(5,10), BRUTE, sharp=1, edge=1)
 
 			var/atom/myloc = src.loc
 			var/image/flicker = image('code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dmi',"sawblade")

code/WorkInProgress/Cael_Aislinn/Jungle/jungle_turfs.dm

@@ -143,25 +143,25 @@
 					var/turf/T = get_turf(M)
 					if(istype(T, /turf/unsimulated/jungle/water))
 						M << pick("\red Something sharp bites you!","\red Sharp teeth grab hold of you!","\red You feel something take a chunk out of your leg!")
-						M.apply_damage(rand(0,1), BRUTE)
+						M.apply_damage(rand(0,1), BRUTE, sharp=1)
 			if(prob(50))
 				spawn(rand(25,50))
 					var/turf/T = get_turf(M)
 					if(istype(T, /turf/unsimulated/jungle/water))
 						M << pick("\red Something sharp bites you!","\red Sharp teeth grab hold of you!","\red You feel something take a chunk out of your leg!")
-						M.apply_damage(rand(0,1), BRUTE)
+						M.apply_damage(rand(0,1), BRUTE, sharp=1)
 			if(prob(50))
 				spawn(rand(25,50))
 					var/turf/T = get_turf(M)
 					if(istype(T, /turf/unsimulated/jungle/water))
 						M << pick("\red Something sharp bites you!","\red Sharp teeth grab hold of you!","\red You feel something take a chunk out of your leg!")
-						M.apply_damage(rand(0,1), BRUTE)
+						M.apply_damage(rand(0,1), BRUTE, sharp=1)
 			if(prob(50))
 				spawn(rand(25,50))
 					var/turf/T = get_turf(M)
 					if(istype(T, /turf/unsimulated/jungle/water))
 						M << pick("\red Something sharp bites you!","\red Sharp teeth grab hold of you!","\red You feel something take a chunk out of your leg!")
-						M.apply_damage(rand(0,1), BRUTE)
+						M.apply_damage(rand(0,1), BRUTE, sharp=1)
 
 /turf/unsimulated/jungle/water/deep
 	plants_spawn = 0

code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_gen.dm

@@ -281,8 +281,6 @@
 /obj/machinery/shield_gen/proc/get_shielded_turfs()
 	var/list/out = list()
 	for(var/turf/T in range(field_radius, src))
-		world << "turf dist:[get_dist(src,T)]"
 		if(get_dist(src,T) == field_radius)
 			out.Add(T)
-			world << "	added"
 	return out

code/WorkInProgress/Chinsky/ashtray.dm

@@ -32,6 +32,7 @@
 				var/obj/item/butt = new cig.type_butt(src)
 				cig.transfer_fingerprints_to(butt)
 				del(cig)
+				W = butt
 			else if (cig.lit == 0)
 				user << "You place [cig] in [src] without even smoking it. Why would you do that?"
 
@@ -81,8 +82,7 @@
 	icon_broken  = "ashtray_bork_bl"
 	max_butts = 14
 	health = 24.0
-	g_amt = 30
-	m_amt = 30
+	matter = list("metal" = 30,"glass" = 30)
 	empty_desc = "Cheap plastic ashtray."
 	throwforce = 3.0
 	die()
@@ -102,7 +102,7 @@
 	icon_broken  = "ashtray_bork_br"
 	max_butts = 10
 	health = 72.0
-	m_amt = 80
+	matter = list("metal" = 80)
 	empty_desc = "Massive bronze ashtray."
 	throwforce = 10.0
 
@@ -123,7 +123,7 @@
 	icon_broken  = "ashtray_bork_gl"
 	max_butts = 12
 	health = 12.0
-	g_amt = 60
+	matter = list("glass" = 60)
 	empty_desc = "Glass ashtray. Looks fragile."
 	throwforce = 6.0
 

code/WorkInProgress/Ported/policetape.dm

@@ -136,7 +136,7 @@
 	breaktape(/obj/item/weapon/wirecutters,user)
 
 /obj/item/tape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob)
-	if(user.a_intent == "help" && ((!is_sharp(W) && src.allowed(user))))
+	if(user.a_intent == "help" && ((!can_puncture(W) && src.allowed(user))))
 		user << "You can't break the [src] with that!"
 		return
 	user.show_viewers("\blue [user] breaks the [src]!")

code/WorkInProgress/Tastyfish/mainspipe.dm

@@ -1,703 +0,0 @@
-// internal pipe, don't actually place or use these
-obj/machinery/atmospherics/pipe/mains_component
-	var/obj/machinery/atmospherics/mains_pipe/parent_pipe
-	var/list/obj/machinery/atmospherics/pipe/mains_component/nodes = new()
-
-	New(loc)
-		..(loc)
-		parent_pipe = loc
-
-	check_pressure(pressure)
-		var/datum/gas_mixture/environment = loc.loc.return_air()
-
-		var/pressure_difference = pressure - environment.return_pressure()
-
-		if(pressure_difference > parent_pipe.maximum_pressure)
-			mains_burst()
-
-		else if(pressure_difference > parent_pipe.fatigue_pressure)
-			//TODO: leak to turf, doing pfshhhhh
-			if(prob(5))
-				mains_burst()
-
-		else return 1
-
-	pipeline_expansion()
-		return nodes
-
-	disconnect(obj/machinery/atmospherics/reference)
-		if(nodes.Find(reference))
-			nodes.Remove(reference)
-
-	proc/mains_burst()
-		parent_pipe.burst()
-
-obj/machinery/atmospherics/mains_pipe
-	icon = 'icons/obj/atmospherics/mainspipe.dmi'
-	layer = 2.4 //under wires with their 2.5
-
-	var/volume = 0
-	var/force = 20
-
-	var/alert_pressure = 80*ONE_ATMOSPHERE
-
-	var/initialize_mains_directions = 0
-
-	var/list/obj/machinery/atmospherics/mains_pipe/nodes = new()
-	var/obj/machinery/atmospherics/pipe/mains_component/supply
-	var/obj/machinery/atmospherics/pipe/mains_component/scrubbers
-	var/obj/machinery/atmospherics/pipe/mains_component/aux
-
-	var/minimum_temperature_difference = 300
-	var/thermal_conductivity = 0 //WALL_HEAT_TRANSFER_COEFFICIENT No
-
-	var/maximum_pressure = 70*ONE_ATMOSPHERE
-	var/fatigue_pressure = 55*ONE_ATMOSPHERE
-	alert_pressure = 55*ONE_ATMOSPHERE
-
-	New()
-		..()
-
-		supply = new(src)
-		supply.volume = volume
-		supply.nodes.len = nodes.len
-		scrubbers = new(src)
-		scrubbers.volume = volume
-		scrubbers.nodes.len = nodes.len
-		aux = new(src)
-		aux.volume = volume
-		aux.nodes.len = nodes.len
-
-	hide(var/i)
-		if(level == 1 && istype(loc, /turf/simulated))
-			invisibility = i ? 101 : 0
-		update_icon()
-
-	proc/burst()
-		..()
-		for(var/obj/machinery/atmospherics/pipe/mains_component/pipe in contents)
-			burst()
-
-	proc/check_pressure(pressure)
-		var/datum/gas_mixture/environment = loc.return_air()
-
-		var/pressure_difference = pressure - environment.return_pressure()
-
-		if(pressure_difference > maximum_pressure)
-			burst()
-
-		else if(pressure_difference > fatigue_pressure)
-			//TODO: leak to turf, doing pfshhhhh
-			if(prob(5))
-				burst()
-
-		else return 1
-
-	disconnect()
-		..()
-		for(var/obj/machinery/atmospherics/pipe/mains_component/node in nodes)
-			node.disconnect()
-
-	Del()
-		disconnect()
-		..()
-
-	initialize()
-		for(var/i = 1 to nodes.len)
-			var/obj/machinery/atmospherics/mains_pipe/node = nodes[i]
-			if(node)
-				supply.nodes[i] = node.supply
-				scrubbers.nodes[i] = node.scrubbers
-				aux.nodes[i] = node.aux
-
-obj/machinery/atmospherics/mains_pipe/simple
-	name = "mains pipe"
-	desc = "A one meter section of 3-line mains pipe"
-
-	dir = SOUTH
-	initialize_mains_directions = SOUTH|NORTH
-
-	New()
-		nodes.len = 2
-		..()
-		switch(dir)
-			if(SOUTH || NORTH)
-				initialize_mains_directions = SOUTH|NORTH
-			if(EAST || WEST)
-				initialize_mains_directions = EAST|WEST
-			if(NORTHEAST)
-				initialize_mains_directions = NORTH|EAST
-			if(NORTHWEST)
-				initialize_mains_directions = NORTH|WEST
-			if(SOUTHEAST)
-				initialize_mains_directions = SOUTH|EAST
-			if(SOUTHWEST)
-				initialize_mains_directions = SOUTH|WEST
-
-	proc/normalize_dir()
-		if(dir==3)
-			dir = 1
-		else if(dir==12)
-			dir = 4
-
-	update_icon()
-		if(nodes[1] && nodes[2])
-			icon_state = "intact[invisibility ? "-f" : "" ]"
-
-			//var/node1_direction = get_dir(src, node1)
-			//var/node2_direction = get_dir(src, node2)
-
-			//dir = node1_direction|node2_direction
-
-		else
-			if(!nodes[1]&&!nodes[2])
-				del(src) //TODO: silent deleting looks weird
-			var/have_node1 = nodes[1]?1:0
-			var/have_node2 = nodes[2]?1:0
-			icon_state = "exposed[have_node1][have_node2][invisibility ? "-f" : "" ]"
-
-	initialize()
-		normalize_dir()
-		var/node1_dir
-		var/node2_dir
-
-		for(var/direction in cardinal)
-			if(direction&initialize_mains_directions)
-				if (!node1_dir)
-					node1_dir = direction
-				else if (!node2_dir)
-					node2_dir = direction
-
-		for(var/obj/machinery/atmospherics/mains_pipe/target in get_step(src,node1_dir))
-			if(target.initialize_mains_directions & get_dir(target,src))
-				nodes[1] = target
-				break
-		for(var/obj/machinery/atmospherics/mains_pipe/target in get_step(src,node2_dir))
-			if(target.initialize_mains_directions & get_dir(target,src))
-				nodes[2] = target
-				break
-
-		..() // initialize internal pipes
-
-		var/turf/T = src.loc			// hide if turf is not intact
-		hide(T.intact)
-		update_icon()
-
-	hidden
-		level = 1
-		icon_state = "intact-f"
-
-	visible
-		level = 2
-		icon_state = "intact"
-
-obj/machinery/atmospherics/mains_pipe/manifold
-	name = "manifold pipe"
-	desc = "A manifold composed of mains pipes"
-
-	dir = SOUTH
-	initialize_mains_directions = EAST|NORTH|WEST
-	volume = 105
-
-	New()
-		nodes.len = 3
-		..()
-		initialize_mains_directions = (NORTH|SOUTH|EAST|WEST) & ~dir
-
-	initialize()
-		var/connect_directions = initialize_mains_directions
-
-		for(var/direction in cardinal)
-			if(direction&connect_directions)
-				for(var/obj/machinery/atmospherics/mains_pipe/target in get_step(src,direction))
-					if(target.initialize_mains_directions & get_dir(target,src))
-						nodes[1] = target
-						connect_directions &= ~direction
-						break
-				if (nodes[1])
-					break
-
-
-		for(var/direction in cardinal)
-			if(direction&connect_directions)
-				for(var/obj/machinery/atmospherics/mains_pipe/target in get_step(src,direction))
-					if(target.initialize_mains_directions & get_dir(target,src))
-						nodes[2] = target
-						connect_directions &= ~direction
-						break
-				if (nodes[2])
-					break
-
-
-		for(var/direction in cardinal)
-			if(direction&connect_directions)
-				for(var/obj/machinery/atmospherics/mains_pipe/target in get_step(src,direction))
-					if(target.initialize_mains_directions & get_dir(target,src))
-						nodes[3] = target
-						connect_directions &= ~direction
-						break
-				if (nodes[3])
-					break
-
-		..() // initialize internal pipes
-
-		var/turf/T = src.loc			// hide if turf is not intact
-		hide(T.intact)
-		update_icon()
-
-	update_icon()
-		icon_state = "manifold[invisibility ? "-f" : "" ]"
-
-	hidden
-		level = 1
-		icon_state = "manifold-f"
-
-	visible
-		level = 2
-		icon_state = "manifold"
-
-obj/machinery/atmospherics/mains_pipe/manifold4w
-	name = "manifold pipe"
-	desc = "A manifold composed of mains pipes"
-
-	dir = SOUTH
-	initialize_mains_directions = EAST|NORTH|WEST|SOUTH
-	volume = 105
-
-	New()
-		nodes.len = 4
-		..()
-
-	initialize()
-		for(var/obj/machinery/atmospherics/mains_pipe/target in get_step(src,NORTH))
-			if(target.initialize_mains_directions & get_dir(target,src))
-				nodes[1] = target
-				break
-
-		for(var/obj/machinery/atmospherics/mains_pipe/target in get_step(src,SOUTH))
-			if(target.initialize_mains_directions & get_dir(target,src))
-				nodes[2] = target
-				break
-
-		for(var/obj/machinery/atmospherics/mains_pipe/target in get_step(src,EAST))
-			if(target.initialize_mains_directions & get_dir(target,src))
-				nodes[3] = target
-				break
-
-		for(var/obj/machinery/atmospherics/mains_pipe/target in get_step(src,WEST))
-			if(target.initialize_mains_directions & get_dir(target,src))
-				nodes[3] = target
-				break
-
-		..() // initialize internal pipes
-
-		var/turf/T = src.loc			// hide if turf is not intact
-		hide(T.intact)
-		update_icon()
-
-	update_icon()
-		icon_state = "manifold4w[invisibility ? "-f" : "" ]"
-
-	hidden
-		level = 1
-		icon_state = "manifold4w-f"
-
-	visible
-		level = 2
-		icon_state = "manifold4w"
-
-obj/machinery/atmospherics/mains_pipe/split
-	name = "mains splitter"
-	desc = "A splitter for connecting to a single pipe off a mains."
-
-	var/obj/machinery/atmospherics/pipe/mains_component/split_node
-	var/obj/machinery/atmospherics/node3
-	var/icon_type
-
-	New()
-		nodes.len = 2
-		..()
-		initialize_mains_directions = turn(dir, 90) | turn(dir, -90)
-		initialize_directions = dir // actually have a normal connection too
-
-	initialize()
-		var/node1_dir
-		var/node2_dir
-		var/node3_dir
-
-		node1_dir = turn(dir, 90)
-		node2_dir = turn(dir, -90)
-		node3_dir = dir
-
-		for(var/obj/machinery/atmospherics/mains_pipe/target in get_step(src,node1_dir))
-			if(target.initialize_mains_directions & get_dir(target,src))
-				nodes[1] = target
-				break
-		for(var/obj/machinery/atmospherics/mains_pipe/target in get_step(src,node2_dir))
-			if(target.initialize_mains_directions & get_dir(target,src))
-				nodes[2] = target
-				break
-		for(var/obj/machinery/atmospherics/target in get_step(src,node3_dir))
-			if(target.initialize_directions & get_dir(target,src))
-				node3 = target
-				break
-
-		..() // initialize internal pipes
-
-		// bind them
-		spawn(5)
-			if(node3 && split_node)
-				var/datum/pipe_network/N1 = node3.return_network(src)
-				var/datum/pipe_network/N2 = split_node.return_network(split_node)
-				if(N1 && N2)
-					N1.merge(N2)
-
-		var/turf/T = src.loc			// hide if turf is not intact
-		hide(T.intact)
-		update_icon()
-
-	update_icon()
-		icon_state = "split-[icon_type][invisibility ? "-f" : "" ]"
-
-	return_network(A)
-		return split_node.return_network(A)
-
-	supply
-		icon_type = "supply"
-
-		New()
-			..()
-			split_node = supply
-
-		hidden
-			level = 1
-			icon_state = "split-supply-f"
-
-		visible
-			level = 2
-			icon_state = "split-supply"
-
-	scrubbers
-		icon_type = "scrubbers"
-
-		New()
-			..()
-			split_node = scrubbers
-
-		hidden
-			level = 1
-			icon_state = "split-scrubbers-f"
-
-		visible
-			level = 2
-			icon_state = "split-scrubbers"
-
-	aux
-		icon_type = "aux"
-
-		New()
-			..()
-			split_node = aux
-
-		hidden
-			level = 1
-			icon_state = "split-aux-f"
-
-		visible
-			level = 2
-			icon_state = "split-aux"
-
-obj/machinery/atmospherics/mains_pipe/split3
-	name = "triple mains splitter"
-	desc = "A splitter for connecting to the 3 pipes on a mainline."
-
-	var/obj/machinery/atmospherics/supply_node
-	var/obj/machinery/atmospherics/scrubbers_node
-	var/obj/machinery/atmospherics/aux_node
-
-	New()
-		nodes.len = 1
-		..()
-		initialize_mains_directions = dir
-		initialize_directions = cardinal & ~dir // actually have a normal connection too
-
-	initialize()
-		var/node1_dir
-		var/supply_node_dir
-		var/scrubbers_node_dir
-		var/aux_node_dir
-
-		node1_dir = dir
-		aux_node_dir = turn(dir, 180)
-		if(dir & (NORTH|SOUTH))
-			supply_node_dir = EAST
-			scrubbers_node_dir = WEST
-		else
-			supply_node_dir = SOUTH
-			scrubbers_node_dir = NORTH
-
-		for(var/obj/machinery/atmospherics/mains_pipe/target in get_step(src, node1_dir))
-			if(target.initialize_mains_directions & get_dir(target,src))
-				nodes[1] = target
-				break
-		for(var/obj/machinery/atmospherics/target in get_step(src,supply_node_dir))
-			if(target.initialize_directions & get_dir(target,src))
-				supply_node = target
-				break
-		for(var/obj/machinery/atmospherics/target in get_step(src,scrubbers_node_dir))
-			if(target.initialize_directions & get_dir(target,src))
-				scrubbers_node = target
-				break
-		for(var/obj/machinery/atmospherics/target in get_step(src,aux_node_dir))
-			if(target.initialize_directions & get_dir(target,src))
-				aux_node = target
-				break
-
-		..() // initialize internal pipes
-
-		// bind them
-		spawn(5)
-			if(supply_node)
-				var/datum/pipe_network/N1 = supply_node.return_network(src)
-				var/datum/pipe_network/N2 = supply.return_network(supply)
-				if(N1 && N2)
-					N1.merge(N2)
-			if(scrubbers_node)
-				var/datum/pipe_network/N1 = scrubbers_node.return_network(src)
-				var/datum/pipe_network/N2 = scrubbers.return_network(scrubbers)
-				if(N1 && N2)
-					N1.merge(N2)
-			if(aux_node)
-				var/datum/pipe_network/N1 = aux_node.return_network(src)
-				var/datum/pipe_network/N2 = aux.return_network(aux)
-				if(N1 && N2)
-					N1.merge(N2)
-
-		var/turf/T = src.loc			// hide if turf is not intact
-		hide(T.intact)
-		update_icon()
-
-	update_icon()
-		icon_state = "split-t[invisibility ? "-f" : "" ]"
-
-	return_network(obj/machinery/atmospherics/reference)
-		var/obj/machinery/atmospherics/A
-
-		A = supply_node.return_network(reference)
-		if(!A)
-			A = scrubbers_node.return_network(reference)
-		if(!A)
-			A = aux_node.return_network(reference)
-
-		return A
-
-	hidden
-		level = 1
-		icon_state = "split-t-f"
-
-	visible
-		level = 2
-		icon_state = "split-t"
-
-obj/machinery/atmospherics/mains_pipe/cap
-	name = "pipe cap"
-	desc = "A cap for the end of a mains pipe"
-
-	dir = SOUTH
-	initialize_directions = SOUTH
-	volume = 35
-
-	New()
-		nodes.len = 1
-		..()
-		initialize_mains_directions = dir
-
-	update_icon()
-		icon_state = "cap[invisibility ? "-f" : ""]"
-
-	initialize()
-		for(var/obj/machinery/atmospherics/mains_pipe/target in get_step(src,dir))
-			if(target.initialize_mains_directions & get_dir(target,src))
-				nodes[1] = target
-				break
-
-		..()
-
-		var/turf/T = src.loc	// hide if turf is not intact
-		hide(T.intact)
-		update_icon()
-
-	hidden
-		level = 1
-		icon_state = "cap-f"
-
-	visible
-		level = 2
-		icon_state = "cap"
-
-obj/machinery/atmospherics/mains_pipe/valve
-	icon_state = "mvalve0"
-
-	name = "mains shutoff valve"
-	desc = "A mains pipe valve"
-
-	var/open = 1
-
-	dir = SOUTH
-	initialize_mains_directions = SOUTH|NORTH
-
-	New()
-		nodes.len = 2
-		..()
-		initialize_mains_directions = dir | turn(dir, 180)
-
-	update_icon(animation)
-		var/turf/simulated/floor = loc
-		var/hide = istype(floor) ? floor.intact : 0
-		level = 1
-		for(var/obj/machinery/atmospherics/mains_pipe/node in nodes)
-			if(node.level == 2)
-				hide = 0
-				level = 2
-				break
-
-		if(animation)
-			flick("[hide?"h":""]mvalve[src.open][!src.open]",src)
-		else
-			icon_state = "[hide?"h":""]mvalve[open]"
-
-	initialize()
-		normalize_dir()
-		var/node1_dir
-		var/node2_dir
-
-		for(var/direction in cardinal)
-			if(direction&initialize_mains_directions)
-				if (!node1_dir)
-					node1_dir = direction
-				else if (!node2_dir)
-					node2_dir = direction
-
-		for(var/obj/machinery/atmospherics/mains_pipe/target in get_step(src,node1_dir))
-			if(target.initialize_mains_directions & get_dir(target,src))
-				nodes[1] = target
-				break
-		for(var/obj/machinery/atmospherics/mains_pipe/target in get_step(src,node2_dir))
-			if(target.initialize_mains_directions & get_dir(target,src))
-				nodes[2] = target
-				break
-
-		if(open)
-			..() // initialize internal pipes
-
-		update_icon()
-
-	proc/normalize_dir()
-		if(dir==3)
-			dir = 1
-		else if(dir==12)
-			dir = 4
-
-	proc/open()
-		if(open) return 0
-
-		open = 1
-		update_icon()
-
-		initialize()
-
-		return 1
-
-	proc/close()
-		if(!open) return 0
-
-		open = 0
-		update_icon()
-
-		for(var/obj/machinery/atmospherics/pipe/mains_component/node in src)
-			for(var/obj/machinery/atmospherics/pipe/mains_component/o in node.nodes)
-				o.disconnect(node)
-				o.build_network()
-
-		return 1
-
-	attack_ai(mob/user as mob)
-		return
-
-	attack_paw(mob/user as mob)
-		return attack_hand(user)
-
-	attack_hand(mob/user as mob)
-		src.add_fingerprint(usr)
-		update_icon(1)
-		sleep(10)
-		if (open)
-			close()
-		else
-			open()
-
-	digital		// can be controlled by AI
-		name = "digital mains valve"
-		desc = "A digitally controlled valve."
-		icon_state = "dvalve0"
-
-		attack_ai(mob/user as mob)
-			return src.attack_hand(user)
-
-		attack_hand(mob/user as mob)
-			if(!src.allowed(user))
-				user << "\red Access denied."
-				return
-			..()
-
-		//Radio remote control
-
-		proc
-			set_frequency(new_frequency)
-				radio_controller.remove_object(src, frequency)
-				frequency = new_frequency
-				if(frequency)
-					radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
-
-		var/frequency = 0
-		var/id = null
-		var/datum/radio_frequency/radio_connection
-
-		initialize()
-			..()
-			if(frequency)
-				set_frequency(frequency)
-
-		update_icon(animation)
-			var/turf/simulated/floor = loc
-			var/hide = istype(floor) ? floor.intact : 0
-			level = 1
-			for(var/obj/machinery/atmospherics/mains_pipe/node in nodes)
-				if(node.level == 2)
-					hide = 0
-					level = 2
-					break
-
-			if(animation)
-				flick("[hide?"h":""]dvalve[src.open][!src.open]",src)
-			else
-				icon_state = "[hide?"h":""]dvalve[open]"
-
-		receive_signal(datum/signal/signal)
-			if(!signal.data["tag"] || (signal.data["tag"] != id))
-				return 0
-
-			switch(signal.data["command"])
-				if("valve_open")
-					if(!open)
-						open()
-
-				if("valve_close")
-					if(open)
-						close()
-
-				if("valve_toggle")
-					if(open)
-						close()
-					else
-						open()

code/WorkInProgress/autopsy.dm

@@ -157,7 +157,7 @@
 	var/obj/item/weapon/paper/P = new(usr.loc)
 	P.name = "Autopsy Data ([target_name])"
 	P.info = "<tt>[scan_data]</tt>"
-	P.overlays += "paper_words"
+	P.icon_state = "paper_words"
 
 	if(istype(usr,/mob/living/carbon))
 		// place the item in the usr's hand if possible

code/WorkInProgress/kilakk/fax.dm

@@ -136,7 +136,9 @@ var/list/alldepartments = list("Central Command")
 		authenticated = 0
 
 	if(href_list["dept"])
+		var/lastdpt = dpt
 		dpt = input(usr, "Which department?", "Choose a department", "") as null|anything in alldepartments
+		if(!dpt) dpt = lastdpt
 
 	if(href_list["auth"])
 		if ( (!( authenticated ) && (scan)) )

code/WorkInProgress/periodic_news.dm

@@ -6,7 +6,7 @@
 		round_time // time of the round at which this should be announced, in seconds
 		message // body of the message
 		author = "NanoTrasen Editor"
-		channel_name = "Tau Ceti Daily"
+		channel_name = "Nyx Daily"
 		can_be_redacted = 0
 
 	revolution_inciting_event
@@ -65,7 +65,7 @@
 			round_time = 60 * 50
 
 		found_ssd
-			channel_name = "Tau Ceti Daily"
+			channel_name = "Nyx Daily"
 			author = "Doctor Eric Hanfield"
 
 			message = {"Several people have been found unconscious at their terminals. It is thought that it was due
@@ -77,7 +77,7 @@
 	lotus_tree
 
 		explosions
-			channel_name = "Tau Ceti Daily"
+			channel_name = "Nyx Daily"
 			author = "Reporter Leland H. Howards"
 
 			message = {"The newly-christened civillian transport Lotus Tree suffered two very large explosions near the
@@ -91,7 +91,7 @@
 	food_riots
 
 		breaking_news
-			channel_name = "Tau Ceti Daily"
+			channel_name = "Nyx Daily"
 			author = "Reporter Ro'kii Ar-Raqis"
 
 			message = {"Breaking news: Food riots have broken out throughout the Refuge asteroid colony in the Tenebrae
@@ -102,7 +102,7 @@
 			round_time = 60 * 10
 
 		more
-			channel_name = "Tau Ceti Daily"
+			channel_name = "Nyx Daily"
 			author = "Reporter Ro'kii Ar-Raqis"
 
 			message = {"More on the Refuge food riots: The Refuge Council has condemned NanoTrasen's withdrawal from