Merge branch 'master' into upstream-merge-32188

code/game/machinery/computer/Operating.dm

@@ -1,74 +1,72 @@
-/obj/machinery/computer/operating
-	name = "operating computer"
-	desc = "Used to monitor the vitals of a patient during surgery."
-	icon_screen = "crew"
-	icon_keyboard = "med_key"
-	circuit = /obj/item/circuitboard/computer/operating
-	var/mob/living/carbon/human/patient
-	var/obj/structure/table/optable/table
-
-	light_color = LIGHT_COLOR_BLUE
-
-/obj/machinery/computer/operating/Initialize()
-	. = ..()
-	find_table()
-
-/obj/machinery/computer/operating/proc/find_table()
-	for(var/dir in GLOB.cardinals)
-		table = locate(/obj/structure/table/optable, get_step(src, dir))
-		if(table)
-			table.computer = src
-			break
-
-
-/obj/machinery/computer/operating/attack_hand(mob/user)
-	if(..())
-		return
-	interact(user)
-
-/obj/machinery/computer/operating/interact(mob/user)
-	var/dat = ""
-	if(table)
-		dat += "<B>Patient information:</B><BR>"
-		if(table.check_patient())
-			patient = table.patient
-			dat += get_patient_info()
-		else
-			patient = null
-			dat += "<B>No patient detected</B>"
-	else
-		dat += "<B>Operating table not found.</B>"
-
-	var/datum/browser/popup = new(user, "op", "Operating Computer", 400, 500)
-	popup.set_content(dat)
-	popup.open()
-
-/obj/machinery/computer/operating/proc/get_patient_info()
-	var/dat = {"
-				<div class='statusLabel'>Patient:</div> [patient.stat ? "<span class='bad'>Non-Responsive</span>" : "<span class='good'>Stable</span>"]<BR>
-				<div class='statusLabel'>Blood Type:</div> [patient.dna.blood_type]
-
-				<BR>
-				<div class='line'><div class='statusLabel'>Health:</div><div class='progressBar'><div style='width: [max(patient.health, 0)]%;' class='progressFill good'></div></div><div class='statusValue'>[patient.health]%</div></div>
-				<div class='line'><div class='statusLabel'>\> Brute Damage:</div><div class='progressBar'><div style='width: [max(patient.getBruteLoss(), 0)]%;' class='progressFill bad'></div></div><div class='statusValue'>[patient.getBruteLoss()]%</div></div>
-				<div class='line'><div class='statusLabel'>\> Resp. Damage:</div><div class='progressBar'><div style='width: [max(patient.getOxyLoss(), 0)]%;' class='progressFill bad'></div></div><div class='statusValue'>[patient.getOxyLoss()]%</div></div>
-				<div class='line'><div class='statusLabel'>\> Toxin Content:</div><div class='progressBar'><div style='width: [max(patient.getToxLoss(), 0)]%;' class='progressFill bad'></div></div><div class='statusValue'>[patient.getToxLoss()]%</div></div>
-				<div class='line'><div class='statusLabel'>\> Burn Severity:</div><div class='progressBar'><div style='width: [max(patient.getFireLoss(), 0)]%;' class='progressFill bad'></div></div><div class='statusValue'>[patient.getFireLoss()]%</div></div>
-
-				"}
-	if(patient.surgeries.len)
-		dat += "<BR><BR><B>Initiated Procedures</B><div class='statusDisplay'>"
-		for(var/datum/surgery/procedure in patient.surgeries)
-			dat += "[capitalize(procedure.name)]<BR>"
-			var/datum/surgery_step/surgery_step = procedure.get_surgery_step()
-			dat += "Next step: [capitalize(surgery_step.name)]"
-			if(surgery_step.repeatable)
-				dat += " or "
-				var/datum/surgery_step/next_step = procedure.get_surgery_next_step()
-				if(next_step)
-					dat += "[capitalize(next_step.name)]"
-				else
-					dat += "finish operation"
-			dat += "<BR>"
-		dat += "</div>"
-	return dat
+/obj/machinery/computer/operating
+	name = "operating computer"
+	desc = "Used to monitor the vitals of a patient during surgery."
+	icon_screen = "crew"
+	icon_keyboard = "med_key"
+	circuit = /obj/item/circuitboard/computer/operating
+	var/mob/living/carbon/human/patient
+	var/obj/structure/table/optable/table
+	light_color = LIGHT_COLOR_BLUE
+
+/obj/machinery/computer/operating/Initialize()
+	. = ..()
+	find_table()
+
+/obj/machinery/computer/operating/proc/find_table()
+	for(var/direction in GLOB.cardinals)
+		table = locate(/obj/structure/table/optable, get_step(src, direction))
+		if(table)
+			table.computer = src
+			break
+
+/obj/machinery/computer/operating/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "operating_computer", name, 350, 470, master_ui, state)
+		ui.open()
+
+/obj/machinery/computer/operating/ui_data(mob/user)
+	var/list/data = list()
+	data["table"] = table
+	if(table)
+		data["patient"] = list()
+		if(table.check_patient())
+			patient = table.patient
+			switch(patient.stat)
+				if(CONSCIOUS)
+					data["patient"]["stat"] = "Conscious"
+					data["patient"]["statstate"] = "good"
+				if(SOFT_CRIT)
+					data["patient"]["stat"] = "Conscious"
+					data["patient"]["statstate"] = "average"
+				if(UNCONSCIOUS)
+					data["patient"]["stat"] = "Unconscious"
+					data["patient"]["statstate"] = "average"
+				if(DEAD)
+					data["patient"]["stat"] = "Dead"
+					data["patient"]["statstate"] = "bad"
+			data["patient"]["health"] = patient.health
+			data["patient"]["blood_type"] = patient.dna.blood_type
+			data["patient"]["maxHealth"] = patient.maxHealth
+			data["patient"]["minHealth"] = HEALTH_THRESHOLD_DEAD
+			data["patient"]["bruteLoss"] = patient.getBruteLoss()
+			data["patient"]["fireLoss"] = patient.getFireLoss()
+			data["patient"]["toxLoss"] = patient.getToxLoss()
+			data["patient"]["oxyLoss"] = patient.getOxyLoss()
+			if(patient.surgeries.len)
+				data["procedures"] = list()
+				for(var/datum/surgery/procedure in patient.surgeries)
+					var/datum/surgery_step/surgery_step = procedure.get_surgery_step()
+					var/alternative_step
+					if(surgery_step.repeatable)
+						var/datum/surgery_step/next_step = procedure.get_surgery_next_step()
+						if(next_step)
+							alternative_step = capitalize(next_step.name)
+						else
+							alternative_step = "Finish operation"
+					data["procedures"] += list(list(
+						"name" = capitalize(procedure.name),
+						"next_step" = capitalize(surgery_step.name),
+						"alternative_step" = alternative_step
+					))
+	return data

code/game/machinery/computer/_computer.dm

@@ -111,15 +111,16 @@
 	if(!(flags_1 & NODECONSTRUCT_1))
 		if(circuit) //no circuit, no computer frame
 			var/obj/structure/frame/computer/A = new /obj/structure/frame/computer(src.loc)
+			A.dir = dir
 			A.circuit = circuit
 			A.anchored = TRUE
 			if(stat & BROKEN)
 				if(user)
 					to_chat(user, "<span class='notice'>The broken glass falls out.</span>")
 				else
-					playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
-				new /obj/item/shard(src.loc)
-				new /obj/item/shard(src.loc)
+					playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
+				new /obj/item/shard(drop_location())
+				new /obj/item/shard(drop_location())
 				A.state = 3
 				A.icon_state = "3"
 			else

code/game/machinery/computer/buildandrepair.dm

@@ -8,7 +8,7 @@
 	switch(state)
 		if(0)
 			if(istype(P, /obj/item/wrench))
-				playsound(src.loc, P.usesound, 50, 1)
+				playsound(src, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You start wrenching the frame into place...</span>")
 				if(do_after(user, 20*P.toolspeed, target = src))
 					to_chat(user, "<span class='notice'>You wrench the frame into place.</span>")
@@ -21,19 +21,19 @@
 					if(!WT.isOn())
 						to_chat(user, "<span class='warning'>[WT] must be on to complete this task!</span>")
 					return
-				playsound(src.loc, P.usesound, 50, 1)
+				playsound(src, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You start deconstructing the frame...</span>")
 				if(do_after(user, 20*P.toolspeed, target = src))
 					if(!src || !WT.isOn())
 						return
 					to_chat(user, "<span class='notice'>You deconstruct the frame.</span>")
-					var/obj/item/stack/sheet/metal/M = new (loc, 5)
+					var/obj/item/stack/sheet/metal/M = new (drop_location(), 5)
 					M.add_fingerprint(user)
 					qdel(src)
 				return
 		if(1)
 			if(istype(P, /obj/item/wrench))
-				playsound(src.loc, P.usesound, 50, 1)
+				playsound(src, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You start to unfasten the frame...</span>")
 				if(do_after(user, 20*P.toolspeed, target = src))
 					to_chat(user, "<span class='notice'>You unfasten the frame.</span>")
@@ -43,7 +43,7 @@
 			if(istype(P, /obj/item/circuitboard/computer) && !circuit)
 				if(!user.transferItemToLoc(P, null))
 					return
-				playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
+				playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
 				to_chat(user, "<span class='notice'>You place [P] inside the frame.</span>")
 				icon_state = "1"
 				circuit = P
@@ -54,13 +54,13 @@
 				to_chat(user, "<span class='warning'>This frame does not accept circuit boards of this type!</span>")
 				return
 			if(istype(P, /obj/item/screwdriver) && circuit)
-				playsound(src.loc, P.usesound, 50, 1)
+				playsound(src, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You screw [circuit] into place.</span>")
 				state = 2
 				icon_state = "2"
 				return
 			if(istype(P, /obj/item/crowbar) && circuit)
-				playsound(src.loc, P.usesound, 50, 1)
+				playsound(src, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You remove [circuit].</span>")
 				state = 1
 				icon_state = "0"
@@ -70,7 +70,7 @@
 				return
 		if(2)
 			if(istype(P, /obj/item/screwdriver) && circuit)
-				playsound(src.loc, P.usesound, 50, 1)
+				playsound(src, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You unfasten the circuit board.</span>")
 				state = 1
 				icon_state = "1"
@@ -78,7 +78,7 @@
 			if(istype(P, /obj/item/stack/cable_coil))
 				var/obj/item/stack/cable_coil/C = P
 				if(C.get_amount() >= 5)
-					playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
+					playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
 					to_chat(user, "<span class='notice'>You start adding cables to the frame...</span>")
 					if(do_after(user, 20*P.toolspeed, target = src))
 						if(C.get_amount() >= 5 && state == 2)
@@ -91,11 +91,11 @@
 				return
 		if(3)
 			if(istype(P, /obj/item/wirecutters))
-				playsound(src.loc, P.usesound, 50, 1)
+				playsound(src, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You remove the cables.</span>")
 				state = 2
 				icon_state = "2"
-				var/obj/item/stack/cable_coil/A = new (loc)
+				var/obj/item/stack/cable_coil/A = new (drop_location())
 				A.amount = 5
 				A.add_fingerprint(user)
 				return
@@ -106,7 +106,7 @@
 					to_chat(user, "<span class='warning'>You need two glass sheets to continue construction!</span>")
 					return
 				else
-					playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
+					playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
 					to_chat(user, "<span class='notice'>You start to put in the glass panel...</span>")
 					if(do_after(user, 20, target = src))
 						if(G.get_amount() >= 2 && state == 3)
@@ -117,17 +117,18 @@
 				return
 		if(4)
 			if(istype(P, /obj/item/crowbar))
-				playsound(src.loc, P.usesound, 50, 1)
+				playsound(src, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You remove the glass panel.</span>")
 				state = 3
 				icon_state = "3"
-				var/obj/item/stack/sheet/glass/G = new (loc, 2)
+				var/obj/item/stack/sheet/glass/G = new (drop_location(), 2)
 				G.add_fingerprint(user)
 				return
 			if(istype(P, /obj/item/screwdriver))
-				playsound(src.loc, P.usesound, 50, 1)
+				playsound(src, P.usesound, 50, 1)
 				to_chat(user, "<span class='notice'>You connect the monitor.</span>")
-				var/obj/B = new src.circuit.build_path (src.loc, circuit)
+				var/obj/B = new circuit.build_path (loc, circuit)
+				B.dir = dir
 				transfer_fingerprints_to(B)
 				qdel(src)
 				return
@@ -138,8 +139,19 @@
 /obj/structure/frame/computer/deconstruct(disassembled = TRUE)
 	if(!(flags_1 & NODECONSTRUCT_1))
 		if(state == 4)
-			new /obj/item/shard(loc)
-			new /obj/item/shard(loc)
+			new /obj/item/shard(drop_location())
+			new /obj/item/shard(drop_location())
 		if(state >= 3)
-			new /obj/item/stack/cable_coil(loc , 5)
-	..()
+			new /obj/item/stack/cable_coil(drop_location(), 5)
+	..()
+
+/obj/structure/frame/computer/AltClick(mob/user)
+	..()
+	if(!in_range(src, user) || !isliving(user) || user.incapacitated())
+		return
+
+	if(anchored)
+		to_chat(usr, "<span class='warning'>You must unwrench [src] before rotating it!</span>")
+		return
+
+	setDir(turn(dir, -90))

code/game/machinery/computer/gulag_teleporter.dm

@@ -129,8 +129,8 @@
 /obj/machinery/computer/gulag_teleporter_computer/proc/findteleporter()
 	var/obj/machinery/gulag_teleporter/teleporterf = null
 
-	for(dir in GLOB.cardinals)
-		teleporterf = locate(/obj/machinery/gulag_teleporter, get_step(src, dir))
+	for(var/direction in GLOB.cardinals)
+		teleporterf = locate(/obj/machinery/gulag_teleporter, get_step(src, direction))
 		if(teleporterf && teleporterf.is_operational())
 			return teleporterf
 

code/game/machinery/computer/medical.dm

@@ -100,10 +100,6 @@
 							dat += text("<td>[]</td>", R.fields["p_stat"])
 							dat += text("<td>[]</td></tr>", R.fields["m_stat"])
 					dat += "</table><hr width='75%' />"
-//					if(GLOB.data_core.general)
-//						for(var/datum/data/record/R in sortRecord(GLOB.data_core.general))
-//							dat += "<A href='?src=[REF(src)];d_rec=[R.fields["id"]]'>[R.fields["id"]]: [R.fields["name"]]<BR>"
-//							//Foreach goto(132)
 					dat += "<HR><A href='?src=[REF(src)];screen=1'>Back</A>"
 				if(3)
 					dat += "<B>Records Maintenance</B><HR>\n<A href='?src=[REF(src)];back=1'>Backup To Disk</A><BR>\n<A href='?src=[REF(src)];u_load=1'>Upload From Disk</A><BR>\n<A href='?src=[REF(src)];del_all=1'>Delete All Records</A><BR>\n<BR>\n<A href='?src=[REF(src)];screen=1'>Back</A>"

code/game/machinery/computer/message.dm

@@ -119,9 +119,6 @@
 		//Message Logs
 		if(1)
 			var/index = 0
-			//var/recipient = "Unspecified" //name of the person
-			//var/sender = "Unspecified" //name of the sender
-			//var/message = "Blank" //transferred message
 			dat += "<center><A href='?src=[REF(src)];back=1'>Back</a> - <A href='?src=[REF(src)];refresh=1'>Refresh</center><hr>"
 			dat += "<table border='1' width='100%'><tr><th width = '5%'>X</th><th width='15%'>Sender</th><th width='15%'>Recipient</th><th width='300px' word-wrap: break-word>Message</th></tr>"
 			for(var/datum/data_pda_msg/pda in src.linkedServer.pda_msgs)

code/game/machinery/computer/teleporter.dm

@@ -27,8 +27,8 @@
 /obj/machinery/computer/teleporter/proc/link_power_station()
 	if(power_station)
 		return
-	for(dir in GLOB.cardinals)
-		power_station = locate(/obj/machinery/teleport/station, get_step(src, dir))
+	for(var/direction in GLOB.cardinals)
+		power_station = locate(/obj/machinery/teleport/station, get_step(src, direction))
 		if(power_station)
 			break
 	return power_station

code/game/machinery/doors/airlock.dm

@@ -261,7 +261,7 @@
 					justzap = TRUE
 					addtimer(CALLBACK(src, .proc/unzap), 10)
 					return
-			else /*if(src.justzap)*/
+			else
 				return
 		else if(user.hallucinating() && ishuman(user) && prob(4) && !operating)
 			var/mob/living/carbon/human/H = user
@@ -1358,7 +1358,7 @@
 													datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "ai_airlock", name, 550, 430, master_ui, state)
+		ui = new(user, src, ui_key, "ai_airlock", name, 550, 456, master_ui, state)
 		ui.open()
 
 /obj/machinery/door/airlock/ui_data()
@@ -1371,8 +1371,6 @@
 	power["backup_timeleft"] = src.secondsBackupPowerLost
 	data["power"] = power
 
-	data["density"] = density
-	data["welded"] = welded
 	data["shock"] = secondsElectrified == 0 ? 2 : 0
 	data["shock_timeleft"] = secondsElectrified
 	data["id_scanner"] = !aiDisabledIdScanner
@@ -1381,6 +1379,8 @@
 	data["lights"] = lights // bolt lights
 	data["safe"] = safe // safeties
 	data["speed"] = normalspeed // safe speed
+	data["welded"] = welded // welded
+	data["opened"] = !density // opened
 
 	var/list/wire = list()
 	wire["main_1"] = !wires.is_cut(WIRE_POWER1)

code/game/machinery/doors/door.dm

@@ -63,9 +63,6 @@
 		spark_system = null
 	return ..()
 
-//process()
-	//return
-
 /obj/machinery/door/CollidedWith(atom/movable/AM)
 	if(operating || emagged)
 		return

code/game/machinery/doppler_array.dm

@@ -45,8 +45,9 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
 		return
 	if(usr.stat || usr.restrained() || !usr.canmove)
 		return
-	src.setDir(turn(src.dir, 90))
-	return
+	setDir(turn(dir, -90))
+	to_chat(usr, "<span class='notice'>You adjust [src]'s dish to face to the [dir2text(dir)].</span>")
+	playsound(src, 'sound/items/screwdriver2.ogg', 50, 1)
 
 /obj/machinery/doppler_array/AltClick(mob/living/user)
 	if(!istype(user) || user.incapacitated())

code/game/machinery/firealarm.dm

@@ -73,7 +73,6 @@
 		if(src.z in GLOB.station_z_levels)
 			add_overlay("overlay_[GLOB.security_level]")
 		else
-			//var/green = SEC_LEVEL_GREEN
 			add_overlay("overlay_[SEC_LEVEL_GREEN]")
 
 		if(detecting)

code/game/machinery/overview.dm

@@ -119,7 +119,6 @@
 			if(!colour2 && !T.density)
 				var/datum/gas_mixture/environment = T.return_air()
 				var/turf_total = environment.total_moles()
-				//var/turf_total = T.co2 + T.oxygen + T.poison + T.sl_gas + T.n2
 
 
 				var/t1 = turf_total / MOLES_CELLSTANDARD * 150
@@ -242,9 +241,6 @@
 							else
 								colour = rgb(255,128,128)
 
-						//if(istype(AM, /obj/structure/blob))
-						//	colour = rgb(255,0,255)
-
 				var/area/A = T.loc
 
 				if(A.fire)
@@ -296,10 +292,6 @@
 
 	src.close(user)
 
-/*			if(seccomp == src)
-				drawmap(user)
-			else
-				user.clearmap()*/
 	return
 
 

code/game/machinery/pipe/construction.dm

@@ -20,7 +20,7 @@ Buildable meters
 	w_class = WEIGHT_CLASS_NORMAL
 	level = 2
 	var/piping_layer = PIPING_LAYER_DEFAULT
-	var/RPD_type //TEMP: kill this once RPDs get a rewrite pls
+	var/RPD_type
 
 /obj/item/pipe/directional
 	RPD_type = PIPE_UNARY

code/game/machinery/teleporter.dm

@@ -35,8 +35,8 @@
 /obj/machinery/teleport/hub/proc/link_power_station()
 	if(power_station)
 		return
-	for(dir in list(NORTH,EAST,SOUTH,WEST))
-		power_station = locate(/obj/machinery/teleport/station, get_step(src, dir))
+	for(var/direction in GLOB.cardinals)
+		power_station = locate(/obj/machinery/teleport/station, get_step(src, direction))
 		if(power_station)
 			break
 	return power_station
@@ -127,13 +127,13 @@
 	efficiency = E - 1
 
 /obj/machinery/teleport/station/proc/link_console_and_hub()
-	for(dir in list(NORTH,EAST,SOUTH,WEST))
-		teleporter_hub = locate(/obj/machinery/teleport/hub, get_step(src, dir))
+	for(var/direction in GLOB.cardinals)
+		teleporter_hub = locate(/obj/machinery/teleport/hub, get_step(src, direction))
 		if(teleporter_hub)
 			teleporter_hub.link_power_station()
 			break
-	for(dir in list(NORTH,EAST,SOUTH,WEST))
-		teleporter_console = locate(/obj/machinery/computer/teleporter, get_step(src, dir))
+	for(var/direction in GLOB.cardinals)
+		teleporter_console = locate(/obj/machinery/computer/teleporter, get_step(src, direction))
 		if(teleporter_console)
 			teleporter_console.link_power_station()
 			break

code/game/machinery/vending.dm

@@ -622,16 +622,6 @@
 IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY CANISTER CHARGES in vending_items.dm
 */
 
-/*
-/obj/machinery/vending/atmospherics //Commenting this out until someone ponies up some actual working, broken, and unpowered sprites - Quarxink
-	name = "Tank Vendor"
-	desc = "A vendor with a wide variety of masks and gas tanks."
-	icon = 'icons/obj/objects.dmi'
-	icon_state = "dispenser"
-	product_paths = "/obj/item/tank/internals/oxygen;/obj/item/tank/internals/plasma;/obj/item/tank/internals/emergency_oxygen;/obj/item/tank/internals/emergency_oxygen/engi;/obj/item/clothing/mask/breath"
-	product_amounts = "10;10;10;5;25"
-*/
-
 /obj/machinery/vending/boozeomat
 	name = "\improper Booze-O-Mat"
 	desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one."