Description Consolidation

aurorastation.dme

@@ -1553,15 +1553,6 @@
 #include "code\modules\events\viral_infection.dm"
 #include "code\modules\events\wallrot.dm"
 #include "code\modules\examine\examine.dm"
-#include "code\modules\examine\descriptions\atmospherics.dm"
-#include "code\modules\examine\descriptions\engineering.dm"
-#include "code\modules\examine\descriptions\medical.dm"
-#include "code\modules\examine\descriptions\mobs.dm"
-#include "code\modules\examine\descriptions\paperwork.dm"
-#include "code\modules\examine\descriptions\stacks.dm"
-#include "code\modules\examine\descriptions\structures.dm"
-#include "code\modules\examine\descriptions\turfs.dm"
-#include "code\modules\examine\descriptions\weapons.dm"
 #include "code\modules\ext_scripts\python.dm"
 #include "code\modules\flufftext\Dreaming.dm"
 #include "code\modules\flufftext\TextFilters.dm"

code/ATMOSPHERICS/components/binary_devices/circulator.dm

@@ -4,6 +4,8 @@
 /obj/machinery/atmospherics/binary/circulator
 	name = "circulator"
 	desc = "A gas circulator turbine and heat exchanger."
+	desc_info = "This generates electricity, depending on the difference in temperature between each side of the machine.  The meter in \
+	the center of the machine gives an indicator of how much elecrtricity is being generated."
 	icon = 'icons/obj/pipes.dmi'
 	icon_state = "circ-off"
 	anchored = FALSE

code/ATMOSPHERICS/components/binary_devices/passive_gate.dm

@@ -3,13 +3,13 @@
 #define REGULATE_OUTPUT	2	//shuts off when output side is above the target pressure
 
 /obj/machinery/atmospherics/binary/passive_gate
+	name = "pressure regulator"
+	desc = "A one-way air valve that can be used to regulate input or output pressure, and flow rate. Does not require power."
+	desc_info = "This is a one-way regulator, allowing gas to flow only at a specific pressure and flow rate.  If the light is green, it is flowing."
 	icon = 'icons/atmos/passive_gate.dmi'
 	icon_state = "map"
 	level = 1
 
-	name = "pressure regulator"
-	desc = "A one-way air valve that can be used to regulate input or output pressure, and flow rate. Does not require power."
-
 	use_power = 0
 	interact_offline = 1
 	var/unlocked = 0	//If 0, then the valve is locked closed, otherwise it is open(-able, it's a one-way valve so it closes if gas would flow backwards).

code/ATMOSPHERICS/components/binary_devices/pump.dm

@@ -13,13 +13,13 @@ Thus, the two variables affect pump operation are set in New():
 */
 
 /obj/machinery/atmospherics/binary/pump
+	name = "gas pump"
+	desc = "A pump."
+	desc_info = "This moves gas from one pipe to another.  A higher target pressure demands more energy.  The side with the red end is the output."
 	icon = 'icons/atmos/pump.dmi'
 	icon_state = "map_off"
 	level = 1
 
-	name = "gas pump"
-	desc = "A pump"
-
 	var/target_pressure = ONE_ATMOSPHERE
 
 	//var/max_volume_transfer = 10000

code/ATMOSPHERICS/components/omni_devices/filter.dm

@@ -5,6 +5,8 @@
 	name = "omni gas filter"
 	icon_state = "map_filter"
 	base_icon = "filter"
+	desc_info = "Filters gas from a custom input direction, with up to two filtered outputs and a 'everything else' \
+	output.  The filtered output's arrows glow orange."
 
 	var/list/active_filters = new()
 	var/datum/omni_port/input

code/ATMOSPHERICS/components/omni_devices/mixer.dm

@@ -5,6 +5,7 @@
 	name = "omni gas mixer"
 	icon_state = "map_mixer"
 	base_icon = "mixer"
+	desc_info = "Combines gas from custom input and output directions.  The percentage of combined gas can be defined."
 
 	use_power = 1
 	idle_power_usage = 150		//internal circuitry, friction losses and stuff

code/ATMOSPHERICS/components/tvalve.dm

@@ -1,10 +1,10 @@
 /obj/machinery/atmospherics/tvalve
+	name = "manual switching valve"
+	desc = "A pipe valve."
+	desc_info = "Click this to toggle the mode.  The direction with the green light is where the gas will flow."
 	icon = 'icons/atmos/tvalve.dmi'
 	icon_state = "map_tvalve0"
 
-	name = "manual switching valve"
-	desc = "A pipe valve"
-
 	level = 1
 	dir = SOUTH
 	initialize_directions = SOUTH|NORTH|WEST

code/ATMOSPHERICS/components/unary/cold_sink.dm

@@ -3,7 +3,10 @@
 
 /obj/machinery/atmospherics/unary/freezer
 	name = "gas cooling system"
-	desc = "Cools gas when connected to pipe network"
+	desc = "Cools gas when connected to pipe network."
+	desc_info = "Cools down the gas of the pipe it is connected to.  It uses massive amounts of electricity while on. \
+	It can be upgraded by replacing the capacitors, manipulators, and matter bins.  It can be deconstructed by screwing the maintenance panel open with a \
+	screwdriver, and then using a crowbar."
 	icon = 'icons/obj/sleeper.dmi'
 	icon_state = "freezer_0"
 	density = 1

code/ATMOSPHERICS/components/unary/heat_source.dm

@@ -3,7 +3,10 @@
 
 /obj/machinery/atmospherics/unary/heater
 	name = "gas heating system"
-	desc = "Heats gas when connected to a pipe network"
+	desc = "Heats gas when connected to a pipe network."
+	desc_info = "Heats up the gas of the pipe it is connected to.  It uses massive amounts of electricity while on. \
+	It can be upgraded by replacing the capacitors, manipulators, and matter bins.  It can be deconstructed by screwing the maintenance panel open with a \
+	screwdriver, and then using a crowbar."
 	icon = 'icons/obj/sleeper.dmi'
 	icon_state = "heater_0"
 	density = 1

code/ATMOSPHERICS/components/unary/outlet_injector.dm

@@ -3,13 +3,14 @@
 //When it receives the "inject" signal, it will try to pump it's entire contents into the environment regardless of pressure, using power.
 
 /obj/machinery/atmospherics/unary/outlet_injector
+	name = "air injector"
+	desc = "Passively injects air into its surroundings. Has a valve attached to it that can control flow rate."
+	desc_info = "Outputs the pipe's gas into the atmosphere, similar to an airvent.  It can be controlled by a nearby atmospherics computer. \
+	A green light on it means it is on."
 	icon = 'icons/atmos/injector.dmi'
 	icon_state = "map_injector"
 	layer = 3
 
-	name = "air injector"
-	desc = "Passively injects air into its surroundings. Has a valve attached to it that can control flow rate."
-
 	use_power = 0
 	idle_power_usage = 150		//internal circuitry, friction losses and stuff
 	power_rating = 15000	//15000 W ~ 20 HP

code/ATMOSPHERICS/components/unary/vent_pump.dm

@@ -8,11 +8,12 @@
 #define PRESSURE_CHECK_INTERNAL 2
 
 /obj/machinery/atmospherics/unary/vent_pump
+	name = "air vent"
+	desc = "Has a valve and pump attached to it."
+	desc_info = "This pumps the contents of the attached pipe out into the atmosphere, if needed.  It can be controlled from an Air Alarm."
 	icon = 'icons/atmos/vent_pump.dmi'
 	icon_state = "map_vent"
 
-	name = "Air Vent"
-	desc = "Has a valve and pump attached to it"
 	use_power = 0
 	idle_power_usage = 150		//internal circuitry, friction losses and stuff
 	power_rating = 7500			//7500 W ~ 10 HP

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -1,9 +1,11 @@
 /obj/machinery/atmospherics/unary/vent_scrubber
+	name = "air scrubber"
+	desc = "Has a valve and pump attached to it."
+	desc_info = "This filters the atmosphere of harmful gas.  Filtered gas goes to the pipes connected to it, typically a scrubber pipe. \
+	It can be controlled from an Air Alarm.  It can be configured to drain all air rapidly with a 'panic syphon' from an air alarm."
 	icon = 'icons/atmos/vent_scrubber.dmi'
 	icon_state = "map_scrubber_off"
 
-	name = "Air Scrubber"
-	desc = "Has a valve and pump attached to it"
 	use_power = 0
 	idle_power_usage = 150		//internal circuitry, friction losses and stuff
 	power_rating = 7500			//7500 W ~ 10 HP

code/ATMOSPHERICS/components/valve.dm

@@ -1,10 +1,10 @@
 /obj/machinery/atmospherics/valve
+	name = "manual valve"
+	desc = "A pipe valve."
+	desc_info = "Click this to turn the valve.  If red, the pipes on each end are seperated.  Otherwise, they are connected."
 	icon = 'icons/atmos/valve.dmi'
 	icon_state = "map_valve0"
 
-	name = "manual valve"
-	desc = "A pipe valve"
-
 	level = 1
 	dir = SOUTH
 	initialize_directions = SOUTH|NORTH

code/ATMOSPHERICS/he_pipes.dm

@@ -1,4 +1,5 @@
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging
+	desc_info = "This radiates heat from the pipe's gas to space, cooling it down."
 	icon = 'icons/atmos/heat.dmi'
 	icon_state = "intact"
 	pipe_icon = "hepipe"