Merge branch 'master' of git://github.com/Baystation12/Baystation12

baystation12.dme

@@ -982,6 +982,7 @@
 #include "code\WorkInProgress\explosion_particles.dm"
 #include "code\WorkInProgress\mapload\dmm_suite.dm"
 #include "code\WorkInProgress\mapload\reader.dm"
+#include "code\WorkInProgress\Mini\atmos_control.dm"
 #include "code\WorkInProgress\Mini\customitems.dm"
 #include "code\WorkInProgress\SkyMarshal\coatrack.dm"
 #include "code\WorkInProgress\SkyMarshal\eraser.dm"
@@ -990,6 +991,7 @@
 #include "code\WorkInProgress\Tastyfish\Eliza_Data.dm"
 #include "code\WorkInProgress\Tastyfish\paiLiza.dm"
 #include "code\WorkInProgress\Tastyfish\Parser.dm"
+#include "code\WorkInProgress\Tastyfish\wallmount_frame.dm"
 #include "code\WorkInProgress\virus2\analyser.dm"
 #include "code\WorkInProgress\virus2\antibodies.dm"
 #include "code\WorkInProgress\virus2\base.dm"

code/WorkInProgress/Mini/atmos_control.dm

@@ -0,0 +1,325 @@
+/obj/item/weapon/circuitboard/atmoscontrol
+	name = "Central Atmospherics Computer Circuitboard"
+	build_path = "/obj/machinery/computer/security/atmoscontrol"
+
+/obj/machinery/computer/atmoscontrol
+	name = "Central Atmospherics Computer"
+	icon = 'computer.dmi'
+	icon_state = "computer_generic"
+	density = 1
+	anchored = 1.0
+	circuit = "/obj/item/weapon/circuitboard/atmoscontrol"
+	var/obj/machinery/alarm/current = ""
+
+/obj/machinery/computer/atmoscontrol/attack_hand(mob/user)
+	if(..())
+		return
+	user.machine = src
+	var/dat = "<a href='?src=\ref[src]&reset=1'>Main Menu</a><hr>"
+	if(current)
+		dat += src.specific()
+	else
+		for(var/obj/machinery/alarm/alarm in world)
+			dat += "<a href='?src=\ref[src]&alarm=\ref[alarm]'>"
+			switch(max(alarm.danger_level, alarm.alarm_area.atmosalm))
+				if (0)
+					dat += "<font color=blue>"
+				if (1)
+					dat += "<font color=yellow>"
+				if (2)
+					dat += "<font color=red>"
+			dat += "[alarm]</font></a><br/>"
+	user << browse(dat, "window=atmoscontrol")
+
+/obj/machinery/computer/atmoscontrol/proc/specific()
+	if(!current)
+		return ""
+	var/dat = "<h3>[current.name]</h3><hr>"
+	dat += current.return_status()
+	if(current.remote_control)
+		dat += "<hr>[src.return_controls()]"
+	return dat
+
+//a bunch of this is copied from atmos alarms
+/obj/machinery/computer/atmoscontrol/Topic(href, href_list)
+	if(..())
+		return
+	if(href_list["reset"])
+		current = null
+		src.updateUsrDialog()
+	if(href_list["alarm"])
+		current = locate(href_list["alarm"])
+		if(href_list["command"])
+			var/device_id = href_list["id_tag"]
+			switch(href_list["command"])
+				if(
+					"power",
+					"adjust_external_pressure",
+					"checks",
+					"co2_scrub",
+					"tox_scrub",
+					"n2o_scrub",
+					"panic_siphon",
+					"scrubbing"
+				)
+					current.send_signal(device_id, list (href_list["command"] = text2num(href_list["val"])))
+					spawn(3)
+						src.updateUsrDialog()
+				//if("adjust_threshold") //was a good idea but required very wide window
+				if("set_threshold")
+					var/env = href_list["env"]
+					var/varname = href_list["var"]
+					var/datum/tlv/tlv = current.TLV[env]
+					var/newval = input("Enter [varname] for env", "Alarm triggers", tlv.vars[varname]) as num|null
+					if (isnull(newval) || ..() || (current.locked && issilicon(usr)))
+						return
+					if (newval<0)
+						tlv.vars[varname] = -1.0
+					else if (env=="temperature" && newval>5000)
+						tlv.vars[varname] = 5000
+					else if (env=="pressure" && newval>50*ONE_ATMOSPHERE)
+						tlv.vars[varname] = 50*ONE_ATMOSPHERE
+					else if (env!="temperature" && env!="pressure" && newval>200)
+						tlv.vars[varname] = 200
+					else
+						newval = round(newval,0.01)
+						tlv.vars[varname] = newval
+					spawn(1)
+						src.updateUsrDialog()
+			return
+
+		if(href_list["screen"])
+			current.screen = text2num(href_list["screen"])
+			spawn(1)
+				src.updateUsrDialog()
+			return
+
+
+		if(href_list["atmos_alarm"])
+			if (current.alarm_area.atmosalert(2))
+				current.post_alert(2)
+			spawn(1)
+				src.updateUsrDialog()
+			current.update_icon()
+			return
+		if(href_list["atmos_reset"])
+			if (current.alarm_area.atmosalert(0))
+				current.post_alert(0)
+			spawn(1)
+				src.updateUsrDialog()
+			current.update_icon()
+			return
+
+		if(href_list["mode"])
+			current.mode = text2num(href_list["mode"])
+			current.apply_mode()
+			spawn(5)
+				src.updateUsrDialog()
+			return
+		src.updateUsrDialog()
+
+//copypasta from alarm code, changed to work with this without derping hard
+//---START COPYPASTA----
+#define AALARM_MODE_SCRUBBING    1
+#define AALARM_MODE_VENTING      2 //makes draught
+#define AALARM_MODE_PANIC        3 //constantly sucks all air
+#define AALARM_MODE_REPLACEMENT  4 //sucks off all air, then refill and swithes to scrubbing
+#define AALARM_MODE_OFF          5
+
+#define AALARM_SCREEN_MAIN    1
+#define AALARM_SCREEN_VENT    2
+#define AALARM_SCREEN_SCRUB   3
+#define AALARM_SCREEN_MODE    4
+#define AALARM_SCREEN_SENSORS 5
+
+/obj/machinery/computer/atmoscontrol/proc/return_controls()
+	var/output = ""//"<B>[alarm_zone] Air [name]</B><HR>"
+
+	switch(current.screen)
+		if (AALARM_SCREEN_MAIN)
+			if(current.alarm_area.atmosalm)
+				output += {"<a href='?src=\ref[src];alarm=\ref[current];atmos_reset=1'>Reset - Atmospheric Alarm</a><hr>"}
+			else
+				output += {"<a href='?src=\ref[src];alarm=\ref[current];atmos_alarm=1'>Activate - Atmospheric Alarm</a><hr>"}
+
+			output += {"
+<a href='?src=\ref[src];alarm=\ref[current];screen=[AALARM_SCREEN_SCRUB]'>Scrubbers Control</a><br>
+<a href='?src=\ref[src];alarm=\ref[current];screen=[AALARM_SCREEN_VENT]'>Vents Control</a><br>
+<a href='?src=\ref[src];alarm=\ref[current];screen=[AALARM_SCREEN_MODE]'>Set envirenomentals mode</a><br>
+<a href='?src=\ref[src];alarm=\ref[current];screen=[AALARM_SCREEN_SENSORS]'>Sensor Control</a><br>
+<HR>
+"}
+			if (current.mode==AALARM_MODE_PANIC)
+				output += "<font color='red'><B>PANIC SYPHON ACTIVE</B></font><br><A href='?src=\ref[src];alarm=\ref[current];mode=[AALARM_MODE_OFF]'>turn syphoning off</A>"
+			else
+				output += "<A href='?src=\ref[src];alarm=\ref[current];mode=[AALARM_MODE_PANIC]'><font color='red'><B>ACTIVATE PANIC SYPHON IN AREA</B></font></A>"
+		if (AALARM_SCREEN_VENT)
+			var/sensor_data = ""
+			if(current.alarm_area.air_vent_names.len)
+				for(var/id_tag in current.alarm_area.air_vent_names)
+					var/long_name = current.alarm_area.air_vent_names[id_tag]
+					var/list/data = current.alarm_area.air_vent_info[id_tag]
+					var/state = ""
+					if(!data)
+						state = "<font color='red'> can not be found!</font>"
+						data = list("external" = 0) //for "0" instead of empty string
+					else if (data["timestamp"]+AALARM_REPORT_TIMEOUT < world.time)
+						state = "<font color='red'> not responding!</font>"
+					sensor_data += {"
+<B>[long_name]</B>[state]<BR>
+<B>Operating:</B>
+<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=power;val=[!data["power"]]'>[data["power"]?"on":"off"]</A>
+<BR>
+<B>Pressure checks:</B>
+<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=checks;val=[data["checks"]^1]' [(data["checks"]&1)?"style='font-weight:bold;'":""]>external</A>
+<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=checks;val=[data["checks"]^2]' [(data["checks"]&2)?"style='font-weight:bold;'":""]>internal</A>
+<BR>
+<B>External pressure bound:</B>
+<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=adjust_external_pressure;val=-1000'>-</A>
+<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=adjust_external_pressure;val=-100'>-</A>
+<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=adjust_external_pressure;val=-10'>-</A>
+<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=adjust_external_pressure;val=-1'>-</A>
+[data["external"]]
+<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=adjust_external_pressure;val=+1'>+</A>
+<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=adjust_external_pressure;val=+10'>+</A>
+<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=adjust_external_pressure;val=+100'>+</A>
+<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=adjust_external_pressure;val=+1000'>+</A>
+<BR>
+"}
+					if (data["direction"] == "siphon")
+						sensor_data += {"
+<B>Direction:</B>
+siphoning
+<BR>
+"}
+					sensor_data += {"<HR>"}
+			else
+				sensor_data = "No vents connected.<BR>"
+			output = {"<a href='?src=\ref[src];alarm=\ref[current];screen=[AALARM_SCREEN_MAIN]'>Main menu</a><br>[sensor_data]"}
+		if (AALARM_SCREEN_SCRUB)
+			var/sensor_data = ""
+			if(current.alarm_area.air_scrub_names.len)
+				for(var/id_tag in current.alarm_area.air_scrub_names)
+					var/long_name = current.alarm_area.air_scrub_names[id_tag]
+					var/list/data = current.alarm_area.air_scrub_info[id_tag]
+					var/state = ""
+					if(!data)
+						state = "<font color='red'> can not be found!</font>"
+						data = list("external" = 0) //for "0" instead of empty string
+					else if (data["timestamp"]+AALARM_REPORT_TIMEOUT < world.time)
+						state = "<font color='red'> not responding!</font>"
+
+					sensor_data += {"
+<B>[long_name]</B>[state]<BR>
+<B>Operating:</B>
+<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=power;val=[!data["power"]]'>[data["power"]?"on":"off"]</A><BR>
+<B>Type:</B>
+<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=scrubbing;val=[!data["scrubbing"]]'>[data["scrubbing"]?"scrubbing":"syphoning"]</A><BR>
+"}
+
+					if(data["scrubbing"])
+						sensor_data += {"
+<B>Filtering:</B>
+Carbon Dioxide
+<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=co2_scrub;val=[!data["filter_co2"]]'>[data["filter_co2"]?"on":"off"]</A>;
+Toxins
+<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=tox_scrub;val=[!data["filter_toxins"]]'>[data["filter_toxins"]?"on":"off"]</A>;
+Nitrous Oxide
+<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=n2o_scrub;val=[!data["filter_n2o"]]'>[data["filter_n2o"]?"on":"off"]</A>
+<BR>
+"}
+					sensor_data += {"
+<B>Panic syphon:</B> [data["panic"]?"<font color='red'><B>PANIC SYPHON ACTIVATED</B></font>":""]
+<A href='?src=\ref[src];alarm=\ref[current];id_tag=[id_tag];command=panic_siphon;val=[!data["panic"]]'><font color='[(data["panic"]?"blue'>Dea":"red'>A")]ctivate</font></A><BR>
+<HR>
+"}
+			else
+				sensor_data = "No scrubbers connected.<BR>"
+			output = {"<a href='?src=\ref[src];alarm=\ref[current];screen=[AALARM_SCREEN_MAIN]'>Main menu</a><br>[sensor_data]"}
+
+		if (AALARM_SCREEN_MODE)
+			output += {"
+<a href='?src=\ref[src];alarm=\ref[current];screen=[AALARM_SCREEN_MAIN]'>Main menu</a><br>
+<b>Air machinery mode for the area:</b><ul>"}
+			var/list/modes = list(
+				AALARM_MODE_SCRUBBING   = "Filtering",
+				AALARM_MODE_VENTING     = "Draught",
+				AALARM_MODE_PANIC       = "<font color='red'>PANIC</font>",
+				AALARM_MODE_REPLACEMENT = "<font color='red'>REPLACE AIR</font>",
+				AALARM_MODE_OFF         = "Off",
+			)
+			for (var/m=1,m<=modes.len,m++)
+				if (current.mode==m)
+					output += {"<li><A href='?src=\ref[src];alarm=\ref[current];mode=[m]'><b>[modes[m]]</b></A> (selected)</li>"}
+				else
+					output += {"<li><A href='?src=\ref[src];alarm=\ref[current];mode=[m]'>[modes[m]]</A></li>"}
+			output += "</ul>"
+		if (AALARM_SCREEN_SENSORS)
+			output += {"
+<a href='?src=\ref[src];alarm=\ref[current];screen=[AALARM_SCREEN_MAIN]'>Main menu</a><br>
+<b>Alarm thresholds:</b><br>
+Partial pressure for gases
+<style>/* some CSS woodoo here. Does not work perfect in ie6 but who cares? */
+table td { border-left: 1px solid black; border-top: 1px solid black;}
+table tr:first-child th { border-left: 1px solid black;}
+table th:first-child { border-top: 1px solid black; font-weight: normal;}
+table tr:first-child th:first-child { border: none;}
+.dl0 { color: green; }
+.dl1 { color: orange; }
+.dl2 { color: red; font-weght: bold;}
+</style>
+<table cellspacing=0>
+<TR><th></th><th class=dl2>min2</th><th class=dl1>min1</th><th class=dl1>max1</th><th class=dl2>max2</th></TR>
+"}
+			var/list/gases = list(
+				"oxygen"         = "O<sub>2</sub>",
+				"carbon dioxide" = "CO<sub>2</sub>",
+				"plasma"         = "Toxin",
+				"other"          = "Other",
+			)
+			var/list/thresholds = list("min2", "min1", "max1", "max2")
+			var/datum/tlv/tlv
+			for (var/g in gases)
+				output += {"
+<TR><th>[gases[g]]</th>
+"}
+				tlv = current.TLV[g]
+				for (var/v in thresholds)
+					output += {"
+<td>
+<A href='?src=\ref[src];alarm=\ref[current];command=set_threshold;env=[g];var=[v]'>[tlv.vars[v]>=0?tlv.vars[v]:"OFF"]</A>
+</td>
+"}
+				output += {"
+</TR>
+"}
+			tlv = current.TLV["pressure"]
+			output += {"
+<TR><th>Pressure</th>
+"}
+			for (var/v in thresholds)
+				output += {"
+<td>
+<A href='?src=\ref[src];alarm=\ref[current];command=set_threshold;env=pressure;var=[v]'>[tlv.vars[v]>=0?tlv.vars[v]:"OFF"]</A>
+</td>
+"}
+			output += {"
+</TR>
+"}
+			tlv = current.TLV["temperature"]
+			output += {"
+<TR><th>Temperature</th>
+"}
+			for (var/v in thresholds)
+				output += {"
+<td>
+<A href='?src=\ref[src];alarm=\ref[current];command=set_threshold;env=temperature;var=[v]'>[tlv.vars[v]>=0?tlv.vars[v]:"OFF"]</A>
+</td>
+"}
+			output += {"
+</TR>
+"}
+			output += {"</table>"}
+
+	return output
+//---END COPYPASTA----

code/WorkInProgress/Tastyfish/wallmount_frame.dm

@@ -0,0 +1,215 @@
+// a frame for generic wall-mounted things, such as fire alarm, status display..
+// combination of apc_frame and machine_frame
+/obj/machinery/constructable_frame/wallmount_frame
+	icon = 'stock_parts.dmi'
+	icon_state = "wm_0"
+	var/wall_offset = 24
+	density = 0
+
+/obj/machinery/constructable_frame/wallmount_frame/New()
+	spawn(1)
+		if (!istype(loc, /turf/simulated/floor))
+			usr << "\red [name] cannot be placed on this spot."
+			new/obj/item/stack/sheet/metal(get_turf(src), 2)
+			del(src)
+			return
+
+		var/turf/obj_ofs = get_step(locate(2,2,1), dir)
+		pixel_x = (obj_ofs.x - 2) * wall_offset
+		pixel_y = (obj_ofs.y - 2) * wall_offset
+
+		var/turf/T = get_step(usr, dir)
+		if(!istype(T, /turf/simulated/wall))
+			usr << "\red [name] must be placed on a wall."
+			new/obj/item/stack/sheet/metal(get_turf(src), 2)
+			del(src)
+			return
+
+		dir = get_dir(T, loc)
+
+/obj/machinery/constructable_frame/wallmount_frame/attackby(obj/item/P as obj, mob/user as mob)
+	if(P.crit_fail)
+		user << "\red This part is faulty, you cannot add this to the machine!"
+		return
+	switch(state)
+		if(1)
+			if(istype(P, /obj/item/weapon/cable_coil))
+				if(P:amount >= 5)
+					playsound(src.loc, 'Deconstruct.ogg', 50, 1)
+					user << "\blue You start to add cables to the frame."
+					if(do_after(user, 20))
+						P:amount -= 5
+						if(!P:amount) del(P)
+						user << "\blue You add cables to the frame."
+						state = 2
+						icon_state = "wm_1"
+			if(istype(P, /obj/item/weapon/wrench))
+				playsound(src.loc, 'Ratchet.ogg', 75, 1)
+				user << "\blue You dismantle the frame"
+				new /obj/item/stack/sheet/metal(src.loc, 2)
+				del(src)
+		if(2)
+			if(istype(P, /obj/item/weapon/circuitboard))
+				var/obj/item/weapon/circuitboard/B = P
+				if(B.board_type == "wallmount")
+					playsound(src.loc, 'Deconstruct.ogg', 50, 1)
+					user << "\blue You add the circuit board to the frame."
+					circuit = P
+					user.drop_item()
+					P.loc = src
+					icon_state = "wm_2"
+					state = 3
+					components = list()
+					req_components = circuit.req_components.Copy()
+					for(var/A in circuit.req_components)
+						req_components[A] = circuit.req_components[A]
+					if(circuit.frame_desc) desc = circuit.frame_desc
+				else
+					user << "\red This frame does not accept circuit boards of this type!"
+			if(istype(P, /obj/item/weapon/wirecutters))
+				playsound(src.loc, 'wirecutter.ogg', 50, 1)
+				user << "\blue You remove the cables."
+				state = 1
+				icon_state = "wm_0"
+				var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( src.loc )
+				A.amount = 5
+
+		if(3)
+			if(istype(P, /obj/item/weapon/crowbar))
+				playsound(src.loc, 'Crowbar.ogg', 50, 1)
+				state = 2
+				circuit.loc = src.loc
+				circuit = null
+				if(components.len == 0)
+					user << "\blue You remove the circuit board."
+				else
+					user << "\blue You remove the circuit board and other components."
+					for(var/obj/item/weapon/W in components)
+						W.loc = src.loc
+				desc = initial(desc)
+				req_components = null
+				components = null
+				icon_state = "wm_1"
+
+			if(istype(P, /obj/item/weapon/screwdriver))
+				var/component_check = 1
+				for(var/R in req_components)
+					if(req_components[R] > 0)
+						component_check = 0
+						break
+				if(component_check)
+					playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+					var/obj/machinery/new_machine = new src.circuit.build_path(src.loc)
+					new_machine.dir = dir
+					if(istype(circuit, /obj/item/weapon/circuitboard/status_display))
+						new_machine.pixel_x = pixel_x * 1.33
+						new_machine.pixel_y = pixel_y * 1.33
+					else
+						new_machine.pixel_x = pixel_x
+						new_machine.pixel_y = pixel_y
+					for(var/obj/O in new_machine.component_parts)
+						del(O)
+					new_machine.component_parts = list()
+					for(var/obj/O in src)
+						if(circuit.contain_parts) // things like disposal don't want their parts in them
+							O.loc = new_machine
+						else
+							O.loc = null
+						new_machine.component_parts += O
+					if(circuit.contain_parts)
+						circuit.loc = new_machine
+					else
+						circuit.loc = null
+					new_machine.RefreshParts()
+					del(src)
+
+			if(istype(P, /obj/item/weapon))
+				for(var/I in req_components)
+					if(istype(P, text2path(I)) && (req_components[I] > 0))
+						if(istype(P, /obj/item/weapon/cable_coil))
+							var/obj/item/weapon/cable_coil/CP = P
+							if(CP.amount > 1)
+								var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src)
+								CC.amount = 1
+								components += CC
+								req_components[I]--
+								break
+						user.drop_item()
+						P.loc = src
+						components += P
+						req_components[I]--
+						break
+				if(P.loc != src && !istype(P, /obj/item/weapon/cable_coil))
+					user << "\red You cannot add that component to the machine!"
+
+/obj/item/weapon/circuitboard/firealarm
+	name = "Circuit board (Fire Alarm)"
+	build_path = "/obj/machinery/firealarm"
+	board_type = "wallmount"
+	origin_tech = "engineering=2"
+	frame_desc = "Requires 1 Scanning Module, 1 Capacitor, and 2 pieces of cable."
+	contain_parts = 0
+	req_components = list(
+							"/obj/item/weapon/stock_parts/scanning_module" = 1,
+							"/obj/item/weapon/stock_parts/capacitor" = 1,
+							"/obj/item/weapon/cable_coil" = 2)
+
+/obj/item/weapon/circuitboard/alarm
+	name = "Circuit board (Atmospheric Alarm)"
+	build_path = "/obj/machinery/alarm"
+	board_type = "wallmount"
+	origin_tech = "engineering=2;programming=2"
+	frame_desc = "Requires 1 Scanning Module, 1 Console Screen, and 2 pieces of cable."
+	contain_parts = 0
+	req_components = list(
+							"/obj/item/weapon/stock_parts/scanning_module" = 1,
+							"/obj/item/weapon/stock_parts/console_screen" = 1,
+							"/obj/item/weapon/cable_coil" = 2)
+
+/* oh right, not a machine :(
+/obj/item/weapon/circuitboard/intercom
+	name = "Circuit board (Intercom)"
+	build_path = "/obj/item/device/radio/intercom"
+	board_type = "wallmount"
+	origin_tech = "engineering=2"
+	frame_desc = "Requires 1 Console Screen, and 2 piece of cable."
+	contain_parts = 0
+	req_components = list(
+							"/obj/item/weapon/stock_parts/console_screen" = 1,
+							"/obj/item/weapon/cable_coil" = 2)
+*/
+
+/* too complex to set up the dept for an RC in a way intuitive for the user
+/obj/item/weapon/circuitboard/requests_console
+	name = "Circuit board (Requests Console)"
+	build_path = "/obj/machinery/requests_console"
+	board_type = "wallmount"
+	origin_tech = "engineering=2;programming=2"
+	frame_desc = "Requires 1 radio, 1 Console Screen, and 1 piece of cable."
+	contain_parts = 0
+	req_components = list(
+							"/obj/item/device/radio" = 1,
+							"/obj/item/weapon/stock_parts/console_screen" = 1
+							"/obj/item/weapon/cable_coil" = 1)
+*/
+
+/obj/item/weapon/circuitboard/status_display
+	name = "Circuit board (Status Display)"
+	build_path = "/obj/machinery/status_display"
+	board_type = "wallmount"
+	origin_tech = "engineering=2,programming=2"
+	frame_desc = "Requires 2 Console Screens, and 1 piece of cable."
+	contain_parts = 0
+	req_components = list(
+							"/obj/item/weapon/stock_parts/console_screen" = 2,
+							"/obj/item/weapon/cable_coil" = 1)
+
+/obj/item/weapon/circuitboard/light_switch
+	name = "Circuit board (Light Switch)"
+	build_path = "/obj/machinery/light_switch"
+	board_type = "wallmount"
+	origin_tech = "engineering=2"
+	frame_desc = "Requires 2 pieces of cable."
+	contain_parts = 0
+	req_components = list(
+							"/obj/item/weapon/cable_coil" = 2)

code/WorkInProgress/virus2/base.dm

@@ -38,7 +38,7 @@ proc/airborne_can_reach(turf/source, turf/target)
 
 	for(var/i=0, i<5, i++) if(!step_towards(dummy, target)) break
 
-	var/rval = (dummy.loc == target)
+	var/rval = (dummy.loc in range(1,target))
 	del dummy
 	return rval
 
@@ -396,6 +396,12 @@ proc/airborne_can_reach(turf/source, turf/target)
 		mob.say("*sneeze")
 		if(mob.virus2) mob.virus2.spread_airborne(mob)
 		if(mob.virus2) mob.virus2.spread_airborne(mob)
+		if(prob(5))
+			var/obj/effect/decal/cleanable/mucus/this = new(mob.loc)
+			this.anchored = 0
+			step(this, mob.dir)
+			this.anchored = 1
+			this.virus2 = mob.virus2
 
 
 /datum/disease2/effect/greater/cough
@@ -405,6 +411,9 @@ proc/airborne_can_reach(turf/source, turf/target)
 		mob.say("*cough")
 		if(mob.virus2) mob.virus2.spread_airborne(mob)
 		if(mob.virus2) mob.virus2.spread_airborne(mob)
+		if(prob(2))
+			var/obj/effect/decal/cleanable/mucus/this = new(mob.loc)
+			this.virus2 = mob.virus2
 
 /datum/disease2/effect/greater/gunck
 	name = "Flemmingtons"
@@ -481,6 +490,12 @@ proc/airborne_can_reach(turf/source, turf/target)
 		mob.say("*sneeze")
 		if(mob.virus2) mob.virus2.spread_airborne(mob)
 		if(mob.virus2) mob.virus2.spread_airborne(mob)
+		if(prob(10))
+			var/obj/effect/decal/cleanable/mucus/this = new(mob.loc)
+			this.anchored = 0
+			step(this, mob.dir)
+			this.anchored = 1
+			this.virus2 = mob.virus2
 
 /datum/disease2/effect/lesser/cough
 	name = "Anima Syndrome"
@@ -489,6 +504,9 @@ proc/airborne_can_reach(turf/source, turf/target)
 		mob.say("*cough")
 		if(mob.virus2) mob.virus2.spread_airborne(mob)
 		if(mob.virus2) mob.virus2.spread_airborne(mob)
+		if(prob(10))
+			var/obj/effect/decal/cleanable/mucus/this = new(mob.loc)
+			this.virus2 = mob.virus2
 
 /*/datum/disease2/effect/lesser/hallucinations
 	name = "Hallucinational Syndrome"

code/WorkInProgress/virus2/diseasesplicer.dm

@@ -68,14 +68,14 @@
 	user.machine = src
 	var/dat
 	if(splicing)
-		dat = "Splicing in progress"
+		dat = "Splicing in progress."
 	else if(scanning)
-		dat = "Splicing in progress"
+		dat = "Splicing in progress."
 	else if(burning)
-		dat = "Data disk burning in progress"
+		dat = "Data disk burning in progress."
 	else
 		if(dish)
-			dat = "Virus dish inserted"
+			dat = "Virus dish inserted."
 
 		dat += "<BR>Current DNA strand : "
 		if(memorybank)
@@ -88,7 +88,7 @@
 
 			dat += "<BR><A href='?src=\ref[src];disk=1'>Burn DNA Sequence to data storage disk</a>"
 		else
-			dat += "Empty"
+			dat += "Empty."
 
 		dat += "<BR><BR>"
 
@@ -101,13 +101,13 @@
 							dat += ": [e.effect.name]"
 						dat += " (5-[e.effect.stage])</a>"
 				else
-					dat += "<BR>Insufficent cells to attempt gene splicing"
+					dat += "<BR>Insufficent cells to attempt gene splicing."
 			else
-				dat += "<BR>No virus found in dish"
+				dat += "<BR>No virus found in dish."
 
 			dat += "<BR><BR><A href='?src=\ref[src];eject=1'>Eject disk</a>"
 		else
-			dat += "<BR>Please insert dish"
+			dat += "<BR>Please insert dish."
 
 	user << browse(dat, "window=computer;size=400x500")
 	onclose(user, "computer")

code/datums/shuttle_controller.dm

@@ -18,12 +18,15 @@ datum/shuttle_controller
 		timelimit //important when the shuttle gets called for more than shuttlearrivetime
 		//timeleft = 360 //600
 		fake_recall = 0 //Used in rounds to prevent "ON NOES, IT MUST [INSERT ROUND] BECAUSE SHUTTLE CAN'T BE CALLED"
-
+		deny_shuttle = 0 //for admins not allowing it to be called.
 
 	// call the shuttle
 	// if not called before, set the endtime to T+600 seconds
 	// otherwise if outgoing, switch to incoming
 	proc/incall(coeff = 1)
+		if(deny_shuttle)
+			return
+
 		if(endtime)
 			if(direction == -1)
 				setdirection(1)

code/defines/obj/decal.dm

@@ -58,6 +58,17 @@
 			D.cure(0)
 		..()
 
+/obj/effect/decal/cleanable/mucus
+	name = "Mucus"
+	desc = "Icky mucus!"
+	density = 0
+	anchored = 1
+	layer = 2
+	icon = 'blood.dmi'
+	icon_state = "mucus"
+	random_icon_states = list("mucus")
+	var/datum/disease2/disease/virus2 = null
+
 /obj/effect/decal/cleanable/blood/splatter
 	random_icon_states = list("gibbl1", "gibbl2", "gibbl3", "gibbl4", "gibbl5")
 

code/game/atom_procs.dm

@@ -142,6 +142,7 @@
 			var/obj/effect/decal/cleanable/blood/this = new /obj/effect/decal/cleanable/blood(source2)
 			this.blood_DNA = M.dna.unique_enzymes
 			this.blood_type = M.b_type
+			this.virus2 = M.virus2
 			for(var/datum/disease/D in M.viruses)
 				var/datum/disease/newDisease = new D.type
 				this.viruses += newDisease

code/game/machinery/alarm.dm

@@ -40,6 +40,7 @@
 	var/frequency = 1439
 	//var/skipprocess = 0 //Experimenting
 	var/alarm_frequency = 1437
+	var/remote_control = 0
 #define AALARM_REPORT_TIMEOUT 100
 	var/datum/radio_frequency/radio_connection
 	var/locked = 1
@@ -211,9 +212,9 @@
 
 /obj/machinery/alarm/proc/return_text()
 	if(!(istype(usr, /mob/living/silicon)) && locked)
-		return "<html><head><title>[src]</title></head><body>[return_status()]<hr><i>(Swipe ID card to unlock interface)</i></body></html>"
+		return "<html><head><title>[src]</title></head><body>[return_status()]<hr><a href='?src=\ref[src]&ctrl=1'>[remote_control ? "Disable" : "Enable"] Remote Control</a><hr><i>(Swipe ID card to unlock interface)</i></body></html>"
 	else
-		return "<html><head><title>[src]</title></head><body>[return_status()]<hr>[return_controls()]</body></html>"
+		return "<html><head><title>[src]</title></head><body>[return_status()]<hr><a href='?src=\ref[src]&ctrl=1'>[remote_control ? "Disable" : "Enable"] Remote Control</a><hr>[return_controls()]</body></html>"
 
 /obj/machinery/alarm/proc/return_status()
 	var/turf/location = src.loc
@@ -491,7 +492,9 @@ table tr:first-child th:first-child { border: none;}
 /obj/machinery/alarm/Topic(href, href_list)
 	if(..())
 		return
-
+	if(href_list["ctrl"])
+		remote_control = !remote_control
+		src.updateUsrDialog()
 	if(href_list["command"])
 		var/device_id = href_list["id_tag"]
 		switch(href_list["command"])
@@ -554,7 +557,6 @@ table tr:first-child th:first-child { border: none;}
 		apply_mode()
 		spawn(5)
 			src.updateUsrDialog()
-
 	return
 
 /obj/machinery/alarm/proc/apply_mode()

code/game/machinery/computer/communications.dm

@@ -379,6 +379,10 @@
 	if ((!( ticker ) || emergency_shuttle.location))
 		return
 
+	if(emergency_shuttle.deny_shuttle)
+		user << "Centcom does not currently have a shuttle available in your sector. Please try again later."
+		return
+
 	if(sent_strike_team == 1)
 		user << "Centcom will not allow the shuttle to be called. Consider all contracts terminated."
 		return

code/game/machinery/constructable_frame.dm

@@ -252,4 +252,4 @@ obj/item/weapon/circuitboard/rdserver
 							"/obj/item/weapon/stock_parts/matter_bin" = 1,
 							"/obj/item/weapon/cable_coil" = 1)
 	m_amt = 50
-	g_amt = 50
+	g_amt = 50

code/game/magic/musician.dm

@@ -416,9 +416,9 @@
 				dat += "<A href='?src=\ref[src];stop=1'>Stop Playing</A><BR><BR>"
 
 		if(!edit)
-			dat += "<A href='?src=\ref[src];edit=2'>Show Editer</A><BR><BR>"
+			dat += "<A href='?src=\ref[src];edit=2'>Show Editor</A><BR><BR>"
 		else
-			dat += "<A href='?src=\ref[src];edit=1'>Hide Editer</A><BR>"
+			dat += "<A href='?src=\ref[src];edit=1'>Hide Editor</A><BR>"
 			dat += "<A href='?src=\ref[src];newsong=1'>Start a New Song</A><BR>"
 			dat += "<A href='?src=\ref[src];import=1'>Import a Song</A><BR><BR>"
 			if(song)

code/game/objects/secstorage/secstorage.dm

@@ -74,7 +74,6 @@
 		if (cx > mx)
 			cx = tx
 			cy--
-		//Foreach goto(56)
 	src.closer.screen_loc = text("[],[]", mx, my)
 	return
 

code/game/objects/stacks/metal.dm

@@ -73,14 +73,15 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("machine frame", /obj/machinery/constructable_frame/machine_frame, 5, one_per_turf = 1), \
+	new/datum/stack_recipe("wall machine frame", /obj/machinery/constructable_frame/wallmount_frame, 2, one_per_turf = 1), \
 	new/datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, one_per_turf = 1), \
 	null, \
 	new/datum/stack_recipe("apc frame", /obj/item/apc_frame, 2), \
 	new/datum/stack_recipe("tube light frame", /obj/structure/light_frame), \
 	new/datum/stack_recipe("small light frame", /obj/structure/light_frame/small), \
 	new/datum/stack_recipe("table lamp frame", /obj/structure/light_frame/lamp), \
-	new/datum/stack_recipe("grenade casing", /obj/item/weapon/chem_grenade), \
 	null, \
+	new/datum/stack_recipe("grenade casing", /obj/item/weapon/chem_grenade), \
 	new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20), \
 )
 

code/game/objects/storage/coat.dm

@@ -19,16 +19,15 @@
 	src.closer.screen_loc = "9,7"
 
 /obj/item/clothing/suit/storage/proc/view_inv(mob/user as mob)
-	if(!user)
+	if(!user.client)
 		return
 	user.client.screen += src.boxes
 	user.client.screen += src.closer
 	user.client.screen += src.contents
 
 /obj/item/clothing/suit/storage/proc/close(mob/user as mob)
-	if(!user)
+	if(!user.client)
 		return
-	user.s_active = src
 	user.client.screen -= src.boxes
 	user.client.screen -= src.closer
 	user.client.screen -= src.contents

code/game/vote.dm

@@ -397,8 +397,12 @@
 		spawn(config.vote_period*10)
 			vote.endvote()
 
-		world << "\red<B>*** A vote to [vote.mode?"change game mode":"restart"] has been initiated by [M.key].</B>"
-		world << "\red     You have [vote.timetext(config.vote_period)] to vote."
+		if(vote.mode == 2)
+			world << "\red<B>*** A custom vote has been initiated by [M.key].</B>"
+			world << "\red     You have [vote.timetext(config.vote_period)] to vote."
+		else
+			world << "\red<B>*** A vote to [vote.mode?"change game mode":"restart"] has been initiated by [M.key].</B>"
+			world << "\red     You have [vote.timetext(config.vote_period)] to vote."
 
 		log_vote("Voting to [vote.mode ? "change mode" : "restart round"] started by [M.name]/[M.key]")
 

code/modules/admin/admin_verbs.dm

@@ -209,6 +209,7 @@
 			verbs += /client/proc/cmd_admin_remove_plasma
 			verbs += /client/proc/admin_call_shuttle
 			verbs += /client/proc/admin_cancel_shuttle
+			verbs += /client/proc/admin_deny_shuttle
 			verbs += /obj/admins/proc/show_traitor_panel
 			verbs += /client/proc/cmd_admin_dress
 			verbs += /client/proc/cmd_admin_christmas
@@ -346,6 +347,7 @@
 	verbs -= /client/proc/cmd_admin_remove_plasma
 	verbs -= /client/proc/admin_call_shuttle
 	verbs -= /client/proc/admin_cancel_shuttle
+	verbs -= /client/proc/admin_deny_shuttle
 	verbs -= /obj/admins/proc/show_traitor_panel
 	verbs -= /client/proc/cmd_admin_dress
 	verbs -= /client/proc/cmd_admin_christmas

code/modules/admin/verbs/custom_event.dm

@@ -10,8 +10,13 @@
 	var/input = input(usr, "Enter the description of the custom event. Be descriptive. To cancel the event, make this blank or hit cancel.", "Custom Event", custom_event_msg) as message|null
 	if(!input || input == "")
 		custom_event_msg = null
+		log_admin("[usr.key] has cleared the custom event text.")
+		message_admins("[key_name_admin(usr)] has cleared the custom event text.")
 		return
 
+	log_admin("[usr.key] has changed the custom event text.")
+	message_admins("[key_name_admin(usr)] has changed the custom event text.")
+
 	custom_event_msg = input
 
 	world << "<h1 class='alert'>Custom Event</h1>"

code/modules/admin/verbs/randomverbs.dm

@@ -789,6 +789,22 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 	return
 
+/client/proc/admin_deny_shuttle()
+	set category = "Admin"
+	set name = "Toggle Deny Shuttle"
+
+	if (!ticker)
+		return
+
+	if (!holder)
+		src << "Only administrators may use this command."
+		return
+
+	emergency_shuttle.deny_shuttle = !emergency_shuttle.deny_shuttle
+
+	log_admin("[key_name(src)] has [emergency_shuttle.deny_shuttle ? "denied" : "allowed"] the shuttle to be called.")
+	message_admins("[key_name_admin(usr)] has [emergency_shuttle.deny_shuttle ? "denied" : "allowed"] the shuttle to be called.")
+
 /client/proc/cmd_admin_attack_log(mob/M as mob in world)
 	set category = "Special Verbs"
 	set name = "Attack Log"

code/modules/mob/living/carbon/human/emote.dm

@@ -183,10 +183,9 @@
 				message = "<B>[src]</B> makes a weak noise."
 				m_type = 2
 
-/*		if ("deathgasp")
+		if ("deathgasp")
 			message = "<B>[src]</B> seizes up and falls limp, \his eyes dead and lifeless..."
-			m_type = 1	*/
-			//No.  --SkyMarshal
+			m_type = 1
 
 		if ("giggle")
 			if (!muzzled)

code/modules/mob/living/carbon/human/life.dm

@@ -998,9 +998,12 @@
 					D.cure()
 
 			if(!virus2)
-				for(var/obj/effect/decal/cleanable/blood/B in src.loc)
-					if(B.virus2)
+				for(var/obj/effect/decal/cleanable/blood/B in view(1,src))
+					if(B.virus2 && get_infection_chance())
 						infect_virus2(src,B.virus2)
+				for(var/obj/effect/decal/cleanable/mucus/M in view(1,src))
+					if(M.virus2 && get_infection_chance())
+						infect_virus2(src,M.virus2)
 			else
 				virus2.activate(src)
 

code/modules/research/designs.dm

@@ -339,6 +339,42 @@ datum
 			materials = list("$glass" = 2000, "acid" = 20)
 			build_path = "/obj/item/weapon/circuitboard/mining"
 
+		firealarm
+			name = "Circuit Design (Fire Alarm)"
+			desc = "Allows for the construction of circuit boards used to build fire alarms."
+			id = "firealarm"
+			req_tech = list("engineering" = 2)
+			build_type = IMPRINTER
+			materials = list("$glass" = 2000, "acid" = 20)
+			build_path = "/obj/item/weapon/circuitboard/firealarm"
+
+		alarm
+			name = "Circuit Design (Atmospheric Alarm)"
+			desc = "Allows for the construction of circuit boards used to build atmos alarms."
+			id = "alarm"
+			req_tech = list("engineering" = 2, "programming" = 2)
+			build_type = IMPRINTER
+			materials = list("$glass" = 2000, "acid" = 20)
+			build_path = "/obj/item/weapon/circuitboard/alarm"
+
+		status_display
+			name = "Circuit Design (Status Display)"
+			desc = "Allows for the construction of circuit boards used to build status displays."
+			id = "status_display"
+			req_tech = list("engineering" = 2, "programming" = 2)
+			build_type = IMPRINTER
+			materials = list("$glass" = 2000, "acid" = 20)
+			build_path = "/obj/item/weapon/circuitboard/status_display"
+
+		light_switch
+			name = "Circuit Design (Light Switch)"
+			desc = "Allows for the construction of circuit boards used to build light switches."
+			id = "light_switch"
+			req_tech = list("engineering" = 2)
+			build_type = IMPRINTER
+			materials = list("$glass" = 2000, "acid" = 20)
+			build_path = "/obj/item/weapon/circuitboard/light_switch"
+
 ///////////////////////////////////
 //////////AI Module Disks//////////
 ///////////////////////////////////
@@ -1104,7 +1140,7 @@ datum
 			req_tech = list("combat" = 4, "materials" = 5, "engineering" = 3, "biotech" = 4, "syndicate" = 3)
 			build_type = PROTOLATHE
 			materials = list("$metal" = 5000, "$glass" = 1000, "$uranium" = 1000, "$silver" = 1000)
-			build_path = "/obj/item/weapon/gun/energy/largecrossbow"
+			build_path = "/obj/item/weapon/gun/energy/crossbow/largecrossbow"
 
 		temp_gun
 			name = "Temperature Gun"