Merge pull request #3976 from Citadel-Station-13/upstream-merge-32792

[MIRROR] Grammar fixes on output circuits.
This commit is contained in:
deathride58
2017-11-17 02:00:26 +00:00
committed by GitHub
@@ -3,7 +3,7 @@
/obj/item/integrated_circuit/output/screen
name = "small screen"
desc = "This small screen can display a single piece of data, when the machine is examined closely."
desc = "Takes any data type as an input, and displays it to the user upon examining."
icon_state = "screen"
inputs = list("displayed data" = IC_PINTYPE_ANY)
outputs = list()
@@ -30,7 +30,7 @@
/obj/item/integrated_circuit/output/screen/medium
name = "screen"
desc = "This screen allows for people holding the device to see a piece of data."
desc = "Takes any data type as an input and displays it to the user upon examining, and to adjacent beings when pulsed."
icon_state = "screen_medium"
power_draw_per_use = 20
@@ -43,7 +43,7 @@
/obj/item/integrated_circuit/output/screen/large
name = "large screen"
desc = "This screen allows for people able to see the device to see a piece of data."
desc = "Takes any data type as an input and displays it to the user upon examining, and to all nearby beings when pulsed."
icon_state = "screen_large"
power_draw_per_use = 40
@@ -54,7 +54,7 @@
/obj/item/integrated_circuit/output/light
name = "light"
desc = "This light can turn on and off on command."
desc = "A basic light which can be toggled on/off when pulsed."
icon_state = "light"
complexity = 4
inputs = list()
@@ -96,7 +96,7 @@
/obj/item/integrated_circuit/output/light/advanced
name = "advanced light"
desc = "This light can turn on and off on command, in any color, and in various brightness levels."
desc = "A light that takes a hexadecimal color value and a brightness value, and can be toggled on/off with a pulse."
icon_state = "light_adv"
complexity = 8
inputs = list(
@@ -128,7 +128,7 @@
/obj/item/integrated_circuit/output/text_to_speech
name = "text-to-speech circuit"
desc = "A miniature speaker is attached to this component."
desc = "Takes any string as an input and will make the device say the string when pulsed."
extended_desc = "This unit is more advanced than the plain speaker circuit, able to transpose any valid text to speech."
icon_state = "speaker"
complexity = 12
@@ -169,9 +169,7 @@
/obj/item/integrated_circuit/output/sound/beeper
name = "beeper circuit"
desc = "A miniature speaker is attached to this component. This is often used in the construction of motherboards, which use \
the speaker to tell the user if something goes very wrong when booting up. It can also do other similar synthetic sounds such \
as buzzing, pinging, chiming, and more."
desc = "Takes a sound name as an input, and will play said sound when pulsed. This circuit has a variety of beeps, boops, and buzzes to choose from."
sounds = list(
"beep" = 'sound/machines/twobeep.ogg',
"chime" = 'sound/machines/chime.ogg',
@@ -186,7 +184,7 @@
/obj/item/integrated_circuit/output/sound/beepsky
name = "securitron sound circuit"
desc = "A miniature speaker is attached to this component. Considered by some to be the essential component for a securitron."
desc = "Takes a sound name as an input, and will play said sound when pulsed. This circuit is similar to those used in Securitrons."
sounds = list(
"creep" = 'sound/voice/bcreep.ogg',
"criminal" = 'sound/voice/bcriminal.ogg',
@@ -202,7 +200,7 @@
/obj/item/integrated_circuit/output/sound/medbot
name = "medbot sound circuit"
desc = "A miniature speaker is attached to this component, used to annoy patients while they get pricked by a medbot."
desc = "Takes a sound name as an input, and will play said sound when pulsed. This circuit is often found in medical robots."
sounds = list(
"surgeon" = 'sound/voice/msurgeon.ogg',
"radar" = 'sound/voice/mradar.ogg',
@@ -225,7 +223,7 @@
/obj/item/integrated_circuit/output/video_camera
name = "video camera circuit"
desc = "This small camera allows a remote viewer to see what it sees."
desc = "Takes a string as a name and a boolean to determine whether it is on, and uses this to be a camera linked to the research network."
extended_desc = "The camera is linked to the Research camera network."
icon_state = "video_camera"
w_class = WEIGHT_CLASS_SMALL
@@ -293,7 +291,7 @@
/obj/item/integrated_circuit/output/led
name = "light-emitting diode"
desc = "This a LED that is lit whenever there is TRUE-equivalent data on its input."
desc = "Takes a boolean value in, and if the boolean value is 'true-equivalent', the LED will be marked as lit on examine."
extended_desc = "TRUE-equivalent values are: Non-empty strings, non-zero numbers, and valid refs."
complexity = 0.1
icon_state = "led"