cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 16:38:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Description Consolidation (#9038)

Browse Source 
I moved the desc_info to their parent thingies, because alt clicking the type and being sent to the description.dm was infuriating.
This commit is contained in:
Geeves
2020-06-10 09:03:44 +03:00
committed by GitHub
parent ced8c44d51
commit 1f213e48c0
62 changed files with 318 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/binary_devices/circulator.dm
+2
View File
@@ -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 -3
View File
@@ -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
+3 -3
View File
@@ -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
+2
View File
@@ -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
+1
View File
@@ -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
+3 -3
View File
@@ -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
+4 -1
View File
@@ -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
+4 -1
View File
@@ -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
+4 -3
View File
@@ -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
+3 -2
View File
@@ -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
+4 -2
View File
@@ -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
+3 -3
View File
@@ -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
View File
@@ -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"
code/ATMOSPHERICS/pipes.dm
+59 -26
View File
@@ -1,5 +1,6 @@
/obj/machinery/atmospherics/pipe
desc_info = "This pipe, and all other pipes, can be connected or disconnected by a wrench. The internal pressure of the pipe must \
be below 300 kPa to do this. More pipes can be obtained from the pipe dispenser."
var/datum/gas_mixture/air_temporary // used when reconstructing a pipeline that broke
var/datum/pipeline/parent
var/volume = 0
@@ -22,6 +23,8 @@
if(istype(get_turf(src), /turf/simulated/wall) || istype(get_turf(src), /turf/unsimulated/wall))
level = 1
. = ..()
desc_info += "<br>Most pipes and atmospheric devices can be connected or disconnected with a wrench. The pipe's pressure must not be too high, \
or if it is a device, it must be turned off first."
/obj/machinery/atmospherics/pipe/hides_under_flooring()
return level != 2
@@ -321,12 +324,16 @@
return null
/obj/machinery/atmospherics/pipe/simple/visible
desc_info = "This is a special 'scrubber' pipe, which does not connect to 'normal' pipes. If you want to connect it, use \
a Universal Adapter pipe."
icon_state = "intact"
level = 2
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers
name = "Scrubbers pipe"
desc = "A one meter section of scrubbers pipe"
desc = "A one meter section of scrubbers pipe."
desc_info = "This is a special 'supply' pipe, which does not connect to 'normal' pipes. If you want to connect it, use \
a Universal Adapter pipe."
icon_state = "intact-scrubbers"
connect_types = CONNECT_TYPE_SCRUBBER
layer = 2.38
@@ -368,7 +375,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers
name = "Scrubbers pipe"
desc = "A one meter section of scrubbers pipe"
desc = "A one meter section of scrubbers pipe."
desc_info = "This is a special 'scrubber' pipe, which does not connect to 'normal' pipes. If you want to connect it, use \
a Universal Adapter pipe."
icon_state = "intact-scrubbers"
connect_types = CONNECT_TYPE_SCRUBBER
layer = 2.38
@@ -377,7 +386,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply
name = "Air supply pipe"
desc = "A one meter section of supply pipe"
desc = "A one meter section of supply pipe."
desc_info = "This is a special 'supply' pipe, which does not connect to 'normal' pipes. If you want to connect it, use \
a Universal Adapter pipe."
icon_state = "intact-supply"
connect_types = CONNECT_TYPE_SUPPLY
layer = 2.39
@@ -403,6 +414,7 @@
color = PIPE_COLOR_BLUE
/obj/machinery/atmospherics/pipe/simple/insulated
desc_info = "This is completely useless, use a normal pipe."
icon = 'icons/obj/atmospherics/red_pipe.dmi'
icon_state = "intact"
@@ -416,10 +428,11 @@
/obj/machinery/atmospherics/pipe/manifold
name = "pipe manifold"
desc = "A manifold composed of regular pipes."
desc_info = "A normal pipe with three ends to connect to."
icon = 'icons/atmos/manifold.dmi'
icon_state = ""
name = "pipe manifold"
desc = "A manifold composed of regular pipes"
volume = ATMOS_DEFAULT_VOLUME_PIPE * 1.5
@@ -598,8 +611,10 @@
level = 2
/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers
name="Scrubbers pipe manifold"
name = "scrubbers pipe manifold"
desc = "A manifold composed of scrubbers pipes"
desc_info = "This is a special 'scrubber' pipe, which does not connect to 'normal' pipes. If you want to connect it, use \
a Universal Adapter pipe."
icon_state = "map-scrubbers"
connect_types = CONNECT_TYPE_SCRUBBER
layer = 2.38
@@ -607,8 +622,10 @@
color = PIPE_COLOR_RED
/obj/machinery/atmospherics/pipe/manifold/visible/supply
name="Air supply pipe manifold"
desc = "A manifold composed of supply pipes"
name = "air supply pipe manifold"
desc = "A manifold composed of supply pipes."
desc_info = "This is a special 'supply' pipe, which does not connect to 'normal' pipes. If you want to connect it, use \
a Universal Adapter pipe."
icon_state = "map-supply"
connect_types = CONNECT_TYPE_SUPPLY
layer = 2.39
@@ -640,8 +657,10 @@
alpha = 128 //set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers
name="Scrubbers pipe manifold"
desc = "A manifold composed of scrubbers pipes"
name = "scrubbers pipe manifold"
desc = "A manifold composed of scrubbers pipes."
desc_info = "This is a special 'scrubber' pipe, which does not connect to 'normal' pipes. If you want to connect it, use \
a Universal Adapter pipe."
icon_state = "map-scrubbers"
connect_types = CONNECT_TYPE_SCRUBBER
layer = 2.38
@@ -649,8 +668,10 @@
color = PIPE_COLOR_RED
/obj/machinery/atmospherics/pipe/manifold/hidden/supply
name="Air supply pipe manifold"
desc = "A manifold composed of supply pipes"
name = "air supply pipe manifold"
desc = "A manifold composed of supply pipes."
desc_info = "This is a special 'supply' pipe, which does not connect to 'normal' pipes. If you want to connect it, use \
a Universal Adapter pipe."
icon_state = "map-supply"
connect_types = CONNECT_TYPE_SUPPLY
layer = 2.39
@@ -676,10 +697,11 @@
color = PIPE_COLOR_BLUE
/obj/machinery/atmospherics/pipe/manifold4w
name = "4-way pipe manifold"
desc = "A manifold composed of regular pipes."
desc_info = "This is a four-way pipe."
icon = 'icons/atmos/manifold.dmi'
icon_state = ""
name = "4-way pipe manifold"
desc = "A manifold composed of regular pipes"
volume = ATMOS_DEFAULT_VOLUME_PIPE * 2
@@ -859,8 +881,10 @@
level = 2
/obj/machinery/atmospherics/pipe/manifold4w/visible/scrubbers
name="4-way scrubbers pipe manifold"
desc = "A manifold composed of scrubbers pipes"
name = "4-way scrubbers pipe manifold"
desc = "A manifold composed of scrubbers pipes."
desc_info = "This is a special 'scrubber' pipe, which does not connect to 'normal' pipes. If you want to connect it, use \
a Universal Adapter pipe."
icon_state = "map_4way-scrubbers"
connect_types = CONNECT_TYPE_SCRUBBER
layer = 2.38
@@ -868,8 +892,10 @@
color = PIPE_COLOR_RED
/obj/machinery/atmospherics/pipe/manifold4w/visible/supply
name="4-way air supply pipe manifold"
name = "4-way air supply pipe manifold"
desc = "A manifold composed of supply pipes"
desc_info = "This is a special 'supply' pipe, which does not connect to 'normal' pipes. If you want to connect it, use \
a Universal Adapter pipe."
icon_state = "map_4way-supply"
connect_types = CONNECT_TYPE_SUPPLY
layer = 2.39
@@ -900,8 +926,10 @@
alpha = 128 //set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers
name="4-way scrubbers pipe manifold"
desc = "A manifold composed of scrubbers pipes"
name = "4-way scrubbers pipe manifold"
desc = "A manifold composed of scrubbers pipes."
desc_info = "This is a special 'scrubber' pipe, which does not connect to 'normal' pipes. If you want to connect it, use \
a Universal Adapter pipe."
icon_state = "map_4way-scrubbers"
connect_types = CONNECT_TYPE_SCRUBBER
layer = 2.38
@@ -909,8 +937,10 @@
color = PIPE_COLOR_RED
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply
name="4-way air supply pipe manifold"
desc = "A manifold composed of supply pipes"
name = "4-way air supply pipe manifold"
desc = "A manifold composed of supply pipes."
desc_info = "This is a special 'supply' pipe, which does not connect to 'normal' pipes. If you want to connect it, use \
a Universal Adapter pipe."
icon_state = "map_4way-supply"
connect_types = CONNECT_TYPE_SUPPLY
layer = 2.39
@@ -938,6 +968,7 @@
/obj/machinery/atmospherics/pipe/cap
name = "pipe endcap"
desc = "An endcap for pipes"
desc_info = "This is a cosmetic attachment, as pipes do not spill their contents into the air."
icon = 'icons/atmos/pipes.dmi'
icon_state = ""
level = 2
@@ -1301,8 +1332,9 @@
/obj/machinery/atmospherics/pipe/simple/visible/universal
name="Universal pipe adapter"
desc = "An adapter for regular, supply and scrubbers pipes"
name = "universal pipe adapter"
desc = "An adapter for regular, supply and scrubbers pipes."
desc_info = "This allows you to connect 'normal' pipes, red 'scrubber' pipes, and blue 'supply' pipes."
connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SUPPLY|CONNECT_TYPE_SCRUBBER
icon_state = "map_universal"
gfi_layer_rotation = GFI_ROTATION_OVERDIR
@@ -1337,8 +1369,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/universal
name="Universal pipe adapter"
desc = "An adapter for regular, supply and scrubbers pipes"
name = "universal pipe adapter"
desc = "An adapter for regular, supply and scrubbers pipes."
desc_info = "This allows you to connect 'normal' pipes, red 'scrubber' pipes, and blue 'supply' pipes."
connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SUPPLY|CONNECT_TYPE_SCRUBBER
icon_state = "map_universal"
gfi_layer_rotation = GFI_ROTATION_OVERDIR