Revert "12/21 modernizations from TG live"

code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm

@@ -65,7 +65,7 @@ Acts like a normal vent, but has an input AND output.
 	..()
 
 	if(!on)
-		return FALSE
+		return 0
 	var/datum/gas_mixture/air1 = AIR1
 	var/datum/gas_mixture/air2 = AIR2
 
@@ -85,9 +85,6 @@ Acts like a normal vent, but has an input AND output.
 				var/transfer_moles = pressure_delta*environment.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
 
 				var/datum/gas_mixture/removed = air1.remove(transfer_moles)
-				//Removed can be null if there is no atmosphere in air1
-				if(!removed)
-					return FALSE
 
 				loc.assume_air(removed)
 				air_update_turf()
@@ -108,9 +105,6 @@ Acts like a normal vent, but has an input AND output.
 				var/transfer_moles = pressure_delta*air2.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
 
 				var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
-				//removed can be null if there is no air in the location
-				if(!removed)
-					return FALSE
 
 				air2.merge(removed)
 				air_update_turf()
@@ -118,7 +112,7 @@ Acts like a normal vent, but has an input AND output.
 				var/datum/pipeline/parent2 = PARENT2
 				parent2.update = 1
 
-	return TRUE
+	return 1
 
 	//Radio remote control
 
@@ -201,4 +195,4 @@ Acts like a normal vent, but has an input AND output.
 
 #undef EXT_BOUND
 #undef INPUT_MIN
-#undef OUTPUT_MAX
+#undef OUTPUT_MAX

code/modules/atmospherics/machinery/components/binary_devices/valve.dm

@@ -54,10 +54,6 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
 		close()
 		return
 	open()
-	investigate_log("Valve, [src.name], was manipiulated by [key_name(usr)] at [x], [y], [z], [loc.loc]", "atmos")
-	message_admins("Valve, [src.name], was manipulated by [key_name(usr)] at [x], [y], [z], [loc.loc]")
-	log_admin("[key_name(usr)] manipulated a manual valve at [x], [y], [z]")
-
 
 /obj/machinery/atmospherics/components/binary/valve/digital		// can be controlled by AI
 	name = "digital valve"

code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm

@@ -119,10 +119,7 @@ Thus, the two variables affect pump operation are set in New():
 	switch(action)
 		if("power")
 			on = !on
-			investigate_log("Volume Pump, [src.name], was turned [on ? "on" : "off"] by [key_name(usr)] at [x], [y], [z], [loc.loc]", "atmos")
-			message_admins("Volume Pump, [src.name], turned [on ? "on" : "off"] by [key_name(usr)] at [x], [y], [z], [loc.loc]")
-			log_admin("[key_name(usr)] manipulated a volume pump at [x], [y], [z]")
-
+			investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos")
 			. = TRUE
 		if("rate")
 			var/rate = params["rate"]
@@ -138,9 +135,7 @@ Thus, the two variables affect pump operation are set in New():
 				. = TRUE
 			if(.)
 				transfer_rate = Clamp(rate, 0, MAX_TRANSFER_RATE)
-				investigate_log("Volume Pump, [src.name], was set to [transfer_rate] L/s by [key_name(usr)] at [x], [y], [z], [loc.loc]", "atmos")
-				message_admins("Volume Pump, [src.name], was set to [transfer_rate] L/s by [key_name(usr)] at [x], [y], [z], [loc.loc]")
-				log_admin("[key_name(usr)] manipulated a volume pump at [x], [y], [z]")
+				investigate_log("was set to [transfer_rate] L/s by [key_name(usr)]", "atmos")
 	update_icon()
 
 /obj/machinery/atmospherics/components/binary/volume_pump/receive_signal(datum/signal/signal)
@@ -179,9 +174,5 @@ Thus, the two variables affect pump operation are set in New():
 		if(!(stat & NOPOWER) && on)
 			user << "<span class='warning'>You cannot unwrench this [src], turn it off first!</span>"
 		else
-			investigate_log("Volume Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [loc.loc]", "atmos")
-			message_admins("Volume Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [loc.loc]")
-			log_admin("[key_name(usr)] unwrenched a volume pump at [x], [y], [z]")
-
 			return 1
 

code/modules/atmospherics/machinery/components/components_base.dm

@@ -7,12 +7,12 @@ On top of that, now people can add component-speciic procs/vars if they want!
 	var/welded = 0 //Used on pumps and scrubbers
 	var/showpipe = 0
 
-	var/list/datum/pipeline/parents
-	var/list/datum/gas_mixture/airs
+	var/list/datum/pipeline/parents = list()
+	var/list/datum/gas_mixture/airs = list()
 
 /obj/machinery/atmospherics/components/New()
-	parents = new(device_type)
-	airs = new(device_type)
+	parents.len = device_type
+	airs.len = device_type
 	..()
 
 	for(DEVICE_TYPE_LOOP)
@@ -72,7 +72,7 @@ Pipenet stuff; housekeeping
 		qdel(AIR_I)
 		AIR_I = null
 
-/obj/machinery/atmospherics/components/on_construction()
+/obj/machinery/atmospherics/components/construction()
 	..()
 	update_parents()
 

code/modules/atmospherics/machinery/components/trinary_devices/filter.dm

@@ -83,25 +83,18 @@
 
 		if(!removed)
 			return
-		
-		var/filtering = filter_type ? TRUE : FALSE
-		
-		if(filtering && !istext(filter_type))
-			WARNING("Wrong gas ID in [src]'s filter_type var. filter_type == [filter_type]")
-			filtering = FALSE
-		
-		if(filtering && removed.gases[filter_type])
-			var/datum/gas_mixture/filtered_out = new
-			
-			filtered_out.temperature = removed.temperature
+		var/datum/gas_mixture/filtered_out = new
+		filtered_out.temperature = removed.temperature
+
+		if(filter_type && removed.gases[filter_type])
 			filtered_out.assert_gas(filter_type)
 			filtered_out.gases[filter_type][MOLES] = removed.gases[filter_type][MOLES]
-			
 			removed.gases[filter_type][MOLES] = 0
 			removed.garbage_collect()
+		else
+			filtered_out = null
 
-			air2.merge(filtered_out)
-
+		air2.merge(filtered_out)
 		air3.merge(removed)
 
 	update_parents()
@@ -116,7 +109,7 @@
 																	datum/tgui/master_ui = null, datum/ui_state/state = default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "atmos_filter", name, 475, 155, master_ui, state)
+		ui = new(user, src, ui_key, "atmos_filter", name, 475, 140, master_ui, state)
 		ui.open()
 
 /obj/machinery/atmospherics/components/trinary/filter/ui_data()

code/modules/atmospherics/machinery/components/unary_devices/cryo.dm

@@ -1,18 +1,15 @@
 /obj/machinery/atmospherics/components/unary/cryo_cell
 	name = "cryo cell"
 	icon = 'icons/obj/cryogenics.dmi'
-	icon_state = "cell-off"
+	icon_state = "pod0"
 	density = 1
 	anchored = 1
-	obj_integrity = 350
-	max_integrity = 350
-	armor = list(melee = 0, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 30, acid = 30)
 
 	var/on = FALSE
 	state_open = FALSE
 	var/autoeject = FALSE
 	var/volume = 100
-
+	var/running_bob_animation = 0
 	var/efficiency = 1
 	var/sleep_factor = 750
 	var/paralyze_factor = 1000
@@ -38,7 +35,7 @@
 							/obj/item/weapon/stock_parts/console_screen = 1,
 							/obj/item/stack/sheet/glass = 2)
 
-/obj/machinery/atmospherics/components/unary/cryo_cell/on_construction()
+/obj/machinery/atmospherics/components/unary/cryo_cell/construction()
 	..(dir, dir)
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/RefreshParts()
@@ -53,39 +50,63 @@
 	conduction_coefficient = initial(conduction_coefficient) * C
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/Destroy()
-	if(beaker)
-		qdel(beaker)
-		beaker = null
+	beaker = null
 	return ..()
 
-/obj/machinery/atmospherics/components/unary/cryo_cell/contents_explosion(severity, target)
-	..()
-	if(beaker)
-		beaker.ex_act(severity, target)
-
-/obj/machinery/atmospherics/components/unary/cryo_cell/handle_atom_del(atom/A)
-	..()
-	if(A == beaker)
-		beaker = null
-		updateUsrDialog()
-
-/obj/machinery/atmospherics/components/unary/cryo_cell/on_deconstruction()
-	if(beaker)
-		beaker.forceMove(loc)
-		beaker = null
-
 /obj/machinery/atmospherics/components/unary/cryo_cell/update_icon()
+	handle_update_icon()
+
+/obj/machinery/atmospherics/components/unary/cryo_cell/proc/handle_update_icon() //making another proc to avoid spam in update_icon
+	overlays.Cut() //empty the overlay proc, just in case
+
 	if(panel_open)
-		icon_state = "cell-o"
+		icon_state = "pod0-o"
 	else if(state_open)
-		icon_state = "cell-open"
+		icon_state = "pod0"
 	else if(on && is_operational())
 		if(occupant)
-			icon_state = "cell-occupied"
+			var/image/pickle = image(occupant.icon, occupant.icon_state)
+			pickle.overlays = occupant.overlays
+			pickle.pixel_y = 22
+			overlays += pickle
+			icon_state = "pod1"
+			var/up = 0 //used to see if we are going up or down, 1 is down, 2 is up
+			spawn(0) // Without this, the icon update will block. The new thread will die once the occupant leaves.
+				running_bob_animation = 1
+				while(occupant)
+					overlays -= "lid1" //have to remove the overlays first, to force an update- remove cloning pod overlay
+					overlays -= pickle //remove mob overlay
+
+					switch(pickle.pixel_y) //this looks messy as fuck but it works, switch won't call itself twice
+
+						if(23) //inbetween state, for smoothness
+							switch(up) //this is set later in the switch, to keep track of where the mob is supposed to go
+								if(2) //2 is up
+									pickle.pixel_y = 24 //set to highest
+
+								if(1) //1 is down
+									pickle.pixel_y = 22 //set to lowest
+
+						if(22) //mob is at it's lowest
+							pickle.pixel_y = 23 //set to inbetween
+							up = 2 //have to go up
+
+						if(24) //mob is at it's highest
+							pickle.pixel_y = 23 //set to inbetween
+							up = 1 //have to go down
+
+					overlays += pickle //re-add the mob to the icon
+					overlays += "lid1" //re-add the overlay of the pod, they are inside it, not floating
+
+					sleep(7) //don't want to jiggle violently, just slowly bob
+					return
+				running_bob_animation = 0
 		else
-			icon_state = "cell-on"
+			icon_state = "pod1"
+			overlays += "lid0" //have to remove the overlays first, to force an update- remove cloning pod overlay
 	else
-		icon_state = "cell-off"
+		icon_state = "pod0"
+		overlays += "lid0" //if no occupant, just put the lid overlay on, and ignore the rest
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/process()
 	..()
@@ -106,18 +127,18 @@
 			return
 		else if(occupant.stat == DEAD) // We don't bother with dead people.
 			return
-		if(air1.gases.len)
-			if(occupant.bodytemperature < T0C) // Sleepytime. Why? More cryo magic.
-				occupant.Sleeping((occupant.bodytemperature / sleep_factor) * 100)
-				occupant.Paralyse((occupant.bodytemperature / paralyze_factor) * 100)
 
-			if(beaker)
-				if(reagent_transfer == 0) // Magically transfer reagents. Because cryo magic.
-					beaker.reagents.trans_to(occupant, 1, 10 * efficiency) // Transfer reagents, multiplied because cryo magic.
-					beaker.reagents.reaction(occupant, VAPOR)
-					air1.gases["o2"][MOLES] -= 2 / efficiency // Lets use gas for this.
-				if(++reagent_transfer >= 10 * efficiency) // Throttle reagent transfer (higher efficiency will transfer the same amount but consume less from the beaker).
-					reagent_transfer = 0
+		if(occupant.bodytemperature < T0C) // Sleepytime. Why? More cryo magic.
+			occupant.Sleeping((occupant.bodytemperature / sleep_factor) * 100)
+			occupant.Paralyse((occupant.bodytemperature / paralyze_factor) * 100)
+
+		if(beaker)
+			if(reagent_transfer == 0) // Magically transfer reagents. Because cryo magic.
+				beaker.reagents.trans_to(occupant, 1, 10 * efficiency) // Transfer reagents, multiplied because cryo magic.
+				beaker.reagents.reaction(occupant, VAPOR)
+				air1.gases["o2"][MOLES] -= 2 / efficiency // Lets use gas for this.
+			if(++reagent_transfer >= 10 * efficiency) // Throttle reagent transfer (higher efficiency will transfer the same amount but consume less from the beaker).
+				reagent_transfer = 0
 	return 1
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/process_atmos()
@@ -125,7 +146,7 @@
 	if(!on)
 		return
 	var/datum/gas_mixture/air1 = AIR1
-	if(!NODE1 || !AIR1 || !air1.gases.len || air1.gases["o2"][MOLES] < 5) // Turn off if the machine won't work.
+	if(!NODE1 || !AIR1 || air1.gases["o2"][MOLES] < 5) // Turn off if the machine won't work.
 		on = FALSE
 		update_icon()
 		return
@@ -158,14 +179,14 @@
 		on = FALSE
 		..()
 		if(beaker)
-			beaker.forceMove(src)
+			beaker.loc = src
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/close_machine(mob/living/carbon/user)
 	if((isnull(user) || istype(user)) && state_open && !panel_open)
 		..(user)
 		return occupant
 
-/obj/machinery/atmospherics/components/unary/cryo_cell/container_resist(mob/living/user)
+/obj/machinery/atmospherics/components/unary/cryo_cell/container_resist(mob/user)
 	user << "<span class='notice'>You struggle inside the cryotube, kicking the release with your foot... (This will take around 30 seconds.)</span>"
 	audible_message("<span class='notice'>You hear a thump from [src].</span>")
 	if(do_after(user, 300))
@@ -233,7 +254,7 @@
 		occupantData["stat"] = occupant.stat
 		occupantData["health"] = occupant.health
 		occupantData["maxHealth"] = occupant.maxHealth
-		occupantData["minHealth"] = HEALTH_THRESHOLD_DEAD
+		occupantData["minHealth"] = config.health_threshold_dead
 		occupantData["bruteLoss"] = occupant.getBruteLoss()
 		occupantData["oxyLoss"] = occupant.getOxyLoss()
 		occupantData["toxLoss"] = occupant.getToxLoss()
@@ -274,7 +295,7 @@
 			. = TRUE
 		if("ejectbeaker")
 			if(beaker)
-				beaker.forceMove(loc)
+				beaker.loc = loc
 				beaker = null
 				. = TRUE
 	update_icon()

code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm

@@ -14,7 +14,7 @@
 	if(NODE1)
 		icon_state = "he_intact"
 		var/obj/machinery/atmospherics/node = NODE1
-		add_atom_colour(node.color, FIXED_COLOUR_PRIORITY)
+		color = node.color
 	else
 		icon_state = "he_exposed"
 

code/modules/atmospherics/machinery/components/unary_devices/tank.dm

@@ -4,8 +4,6 @@
 	icon_state = "generic"
 	name = "pressure tank"
 	desc = "A large vessel containing pressurized gas."
-	obj_integrity = 800
-	max_integrity = 800
 	var/volume = 10000 //in liters, 1 meters by 1 meters by 2 meters
 	density = 1
 	var/gas_type = 0
@@ -48,4 +46,4 @@
 	var/datum/gas_mixture/air_contents = AIR1
 	air_contents.assert_gases("o2", "n2")
 	air_contents.gases["o2"][MOLES] = AIR_CONTENTS * 0.2
-	air_contents.gases["n2"][MOLES] = AIR_CONTENTS * 0.8
+	air_contents.gases["n2"][MOLES] = AIR_CONTENTS * 0.8

code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm

@@ -6,9 +6,6 @@
 	var/icon_state_open = "cold_off"
 	density = TRUE
 	anchored = TRUE
-	obj_integrity = 300
-	max_integrity = 300
-	armor = list(melee = 0, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 80, acid = 30)
 
 	var/on = FALSE
 	var/min_temperature = 0
@@ -52,7 +49,7 @@
 	else
 		return ..()
 
-/obj/machinery/atmospherics/components/unary/thermomachine/on_construction()
+/obj/machinery/atmospherics/components/unary/thermomachine/construction()
 	..(dir,dir)
 
 /obj/machinery/atmospherics/components/unary/thermomachine/RefreshParts()

code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm

@@ -247,9 +247,9 @@
 	if(istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
 		if (WT.remove_fuel(0,user))
-			playsound(loc, WT.usesound, 40, 1)
+			playsound(loc, 'sound/items/Welder.ogg', 40, 1)
 			user << "<span class='notice'>You begin welding the vent...</span>"
-			if(do_after(user, 20*W.toolspeed, target = src))
+			if(do_after(user, 20/W.toolspeed, target = src))
 				if(!src || !WT.isOn()) return
 				playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
 				if(!welded)
@@ -260,7 +260,6 @@
 					welded = 0
 				update_icon()
 				pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir)
-				pipe_vision_img.plane = ABOVE_HUD_PLANE
 			return 0
 	else
 		return ..()
@@ -291,7 +290,6 @@
 	welded = 0
 	update_icon()
 	pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir)
-	pipe_vision_img.plane = ABOVE_HUD_PLANE
 	playsound(loc, 'sound/weapons/bladeslice.ogg', 100, 1)
 
 
@@ -300,4 +298,4 @@
 #undef NO_BOUND
 
 #undef SIPHONING
-#undef RELEASING
+#undef RELEASING

code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm

@@ -20,9 +20,6 @@
 	var/scrub_Toxins = 0
 	var/scrub_N2O = 0
 	var/scrub_BZ = 0
-	var/scrub_Freon = 0
-	var/scrub_WaterVapor = 0
-
 
 	var/volume_rate = 200
 	var/widenet = 0 //is this scrubber acting on the 3x3 area around it.
@@ -72,10 +69,6 @@
 			amount += idle_power_usage
 		if(scrub_BZ)
 			amount += idle_power_usage
-		if(scrub_Freon)
-			amount += idle_power_usage
-		if(scrub_WaterVapor)
-			amount += idle_power_usage
 	else //scrubbing == SIPHONING
 		amount = active_power_usage
 
@@ -126,8 +119,6 @@
 		"filter_toxins" = scrub_Toxins,
 		"filter_n2o" = scrub_N2O,
 		"filter_bz" = scrub_BZ,
-		"filter_freon" = scrub_Freon,
-		"filter_water_vapor" = scrub_WaterVapor,
 		"sigtype" = "status"
 	)
 
@@ -184,10 +175,9 @@
 
 			//Take a gas sample
 			var/datum/gas_mixture/removed = tile.remove_air(transfer_moles)
-			//Nothing left to remove from the tile
-			if (isnull(removed))
-				return
 			var/list/removed_gases = removed.gases
+			if (isnull(removed)) //in space
+				return
 
 			//Filter it
 			var/datum/gas_mixture/filtered_out = new
@@ -219,16 +209,6 @@
 				filtered_out.gases["bz"][MOLES] = removed_gases["bz"][MOLES]
 				removed.gases["bz"][MOLES] = 0
 
-			if(scrub_Freon && removed_gases["freon"])
-				filtered_out.assert_gas("freon")
-				filtered_out.gases["freon"][MOLES] = removed_gases["freon"][MOLES]
-				removed.gases["freon"][MOLES] = 0
-
-			if(scrub_WaterVapor && removed_gases["water_vapor"])
-				filtered_out.assert_gas("water_vapor")
-				filtered_out.gases["water_vapor"][MOLES] = removed_gases["water_vapor"][MOLES]
-				removed.gases["water_vapor"][MOLES] = 0
-
 			removed.garbage_collect()
 
 			//Remix the resulting gases
@@ -309,16 +289,6 @@
 	if("toggle_bz_scrub" in signal.data)
 		scrub_BZ = !scrub_BZ
 
-	if("freon_scrub" in signal.data)
-		scrub_Freon = text2num(signal.data["freon_scrub"])
-	if("toggle_freon_scrub" in signal.data)
-		scrub_Freon = !scrub_Freon
-
-	if("water_vapor_scrub" in signal.data)
-		scrub_WaterVapor = text2num(signal.data["water_vapor_scrub"])
-	if("toggle_water_vapor_scrub" in signal.data)
-		scrub_WaterVapor = !scrub_WaterVapor
-
 	if("init" in signal.data)
 		name = signal.data["init"]
 		return
@@ -339,9 +309,9 @@
 	if(istype(W, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/WT = W
 		if(WT.remove_fuel(0,user))
-			playsound(loc, WT.usesound, 40, 1)
+			playsound(loc, 'sound/items/Welder.ogg', 40, 1)
 			user << "<span class='notice'>Now welding the scrubber.</span>"
-			if(do_after(user, 20*W.toolspeed, target = src))
+			if(do_after(user, 20/W.toolspeed, target = src))
 				if(!src || !WT.isOn())
 					return
 				playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
@@ -353,7 +323,6 @@
 					welded = 0
 				update_icon()
 				pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir)
-				pipe_vision_img.plane = ABOVE_HUD_PLANE
 			return 0
 	else
 		return ..()
@@ -375,7 +344,6 @@
 	welded = 0
 	update_icon()
 	pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir)
-	pipe_vision_img.plane = ABOVE_HUD_PLANE
 	playsound(loc, 'sound/weapons/bladeslice.ogg', 100, 1)