Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real

code/modules/atmospherics/gasmixtures/gas_mixture.dm

@@ -167,6 +167,7 @@ GLOBAL_LIST_INIT(meta_gas_fusions, meta_gas_fusion_list())
 		if(!ispath(path))
 			path = gas_id2path(path) //a lot of these strings can't have embedded expressions (especially for mappers), so support for IDs needs to stick around
 		set_moles(path, text2num(gas[id]))
+	archive()
 	return 1
 	
 /datum/gas_mixture/react(datum/holder)

code/modules/atmospherics/machinery/airalarm.dm

@@ -36,7 +36,7 @@
 /obj/item/electronics/airalarm
 	name = "air alarm electronics"
 	icon_state = "airalarm_electronics"
-	custom_price = 50
+	custom_price = PRICE_CHEAP
 
 /obj/item/wallframe/airalarm
 	name = "air alarm frame"
@@ -67,6 +67,7 @@
 	desc = "A machine that monitors atmosphere levels. Goes off if the area is dangerous."
 	icon = 'icons/obj/monitors.dmi'
 	icon_state = "alarm0"
+	plane = ABOVE_WALL_PLANE
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 4
 	active_power_usage = 8

code/modules/atmospherics/machinery/atmosmachinery.dm

@@ -17,6 +17,7 @@
 	active_power_usage = 0
 	power_channel = ENVIRON
 	layer = GAS_PIPE_HIDDEN_LAYER //under wires
+	plane = ABOVE_WALL_PLANE
 	resistance_flags = FIRE_PROOF
 	max_integrity = 200
 	obj_flags = CAN_BE_HIT | ON_BLUEPRINTS

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

@@ -7,6 +7,7 @@
 	name = "circulator/heat exchanger"
 	desc = "A gas circulator pump and heat exchanger."
 	icon_state = "circ-off-0"
+	plane = GAME_PLANE
 
 	var/active = FALSE
 

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

@@ -31,7 +31,7 @@
 	var/turf/T = loc
 	if(level == 2 || (istype(T) && !T.intact))
 		showpipe = TRUE
-		plane = GAME_PLANE
+		plane = ABOVE_WALL_PLANE
 	else
 		showpipe = FALSE
 		plane = FLOOR_PLANE
@@ -161,6 +161,9 @@
 	to_chat(user, "<span class='danger'>Access denied.</span>")
 	return UI_CLOSE
 
+/obj/machinery/atmospherics/components/attack_ghost(mob/dead/observer/O)
+	. = ..()
+	atmosanalyzer_scan(airs, O, src, FALSE)
 
 // Tool acts
 

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

@@ -6,6 +6,7 @@
 	max_integrity = 350
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 30, "acid" = 30)
 	layer = ABOVE_WINDOW_LAYER
+	plane = GAME_PLANE
 	state_open = FALSE
 	circuit = /obj/item/circuitboard/machine/cryo_tube
 	pipe_flags = PIPING_ONE_PER_TURF | PIPING_DEFAULT_LAYER_ONLY
@@ -15,8 +16,8 @@
 	var/volume = 100
 
 	var/efficiency = 1
-	var/sleep_factor = 0.00125
-	var/unconscious_factor = 0.001
+	var/base_knockout = 30 SECONDS
+	var/knockout_factor = 1
 	var/heat_capacity = 20000
 	var/conduction_coefficient = 0.3
 
@@ -53,10 +54,9 @@
 	var/C
 	for(var/obj/item/stock_parts/matter_bin/M in component_parts)
 		C += M.rating
-
+	// 2 bins total, so C ranges from 2 to 8.
 	efficiency = initial(efficiency) * C
-	sleep_factor = initial(sleep_factor) * C
-	unconscious_factor = initial(unconscious_factor) * C
+	knockout_factor = initial(knockout_factor) / max(1, (C * 0.33))
 	heat_capacity = initial(heat_capacity) / C
 	conduction_coefficient = initial(conduction_coefficient) * C
 
@@ -188,8 +188,10 @@
 
 	if(air1.total_moles())
 		if(mob_occupant.bodytemperature < T0C) // Sleepytime. Why? More cryo magic.
-			mob_occupant.Sleeping((mob_occupant.bodytemperature * sleep_factor) * 2000)
-			mob_occupant.Unconscious((mob_occupant.bodytemperature * unconscious_factor) * 2000)
+			// temperature factor goes from 1 to about 2.5
+			var/amount = max(1, (4 * log(T0C - mob_occupant.bodytemperature)) - 20) * knockout_factor * base_knockout
+			mob_occupant.Sleeping(amount)
+			mob_occupant.Unconscious(amount)
 		if(beaker)
 			if(reagent_transfer == 0) // Magically transfer reagents. Because cryo magic.
 				beaker.reagents.trans_to(occupant, 1, efficiency * 0.25) // Transfer reagents.

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

@@ -7,6 +7,7 @@
 	max_integrity = 800
 	density = TRUE
 	layer = ABOVE_WINDOW_LAYER
+	plane = GAME_PLANE
 	pipe_flags = PIPING_ONE_PER_TURF
 	var/volume = 10000 //in liters
 	var/gas_type = 0

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

@@ -9,6 +9,7 @@
 	max_integrity = 300
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 30)
 	layer = OBJ_LAYER
+	plane = GAME_PLANE
 	circuit = /obj/item/circuitboard/machine/thermomachine
 	ui_x = 300
 	ui_y = 230

code/modules/atmospherics/machinery/pipes/pipes.dm

@@ -111,3 +111,10 @@
 	pipe_color = paint_color
 	update_node_icon()
 	return TRUE
+
+/obj/machinery/atmospherics/pipe/attack_ghost(mob/dead/observer/O)
+	. = ..()
+	if(parent)
+		atmosanalyzer_scan(parent.air, O, src, FALSE)
+	else
+		to_chat(O, "<span class='warning'>[src] doesn't have a pipenet, which is probably a bug.</span>")

code/modules/atmospherics/machinery/portable/portable_atmospherics.dm

@@ -146,10 +146,14 @@
 /obj/machinery/portable_atmospherics/analyzer_act(mob/living/user, obj/item/I)
 	atmosanalyzer_scan(air_contents, user, src)
 
-/obj/machinery/portable_atmospherics/attacked_by(obj/item/I, mob/user)
+/obj/machinery/portable_atmospherics/attacked_by(obj/item/I, mob/user, attackchain_flags = NONE, damage_multiplier = 1)
 	if(I.force < 10 && !(stat & BROKEN))
 		take_damage(0)
 	else
 		investigate_log("was smacked with \a [I] by [key_name(user)].", INVESTIGATE_ATMOS)
 		add_fingerprint(user)
 		..()
+
+/obj/machinery/portable_atmospherics/attack_ghost(mob/dead/observer/O)
+	. = ..()
+	atmosanalyzer_scan(air_contents, O, src, FALSE)