mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-10 17:52:36 +00:00
Integrated Circuits Parameter Fixes (#37073)
Some circuits were missing parameter types allowing players to input values that would no matter what fail. Some of those also had the parameter type wrote into the name to attempt to make it look like the typing was correct however this just made two of the texts saying what type it is apear. Logic gates now output booleans rather than 1's and 0's(purely cosmetic) and had their descriptions updated accordingly.
This commit is contained in:
committed by
vuonojenmustaturska
parent
440620938f
commit
f0a8f4f53c
@@ -81,7 +81,7 @@
|
|||||||
desc = "A very small version of the common medical analyser. This allows the machine to know how healthy someone is."
|
desc = "A very small version of the common medical analyser. This allows the machine to know how healthy someone is."
|
||||||
icon_state = "medscan"
|
icon_state = "medscan"
|
||||||
complexity = 4
|
complexity = 4
|
||||||
inputs = list("\<REF\> target")
|
inputs = list("target" = IC_PINTYPE_REF)
|
||||||
outputs = list(
|
outputs = list(
|
||||||
"total health %" = IC_PINTYPE_NUMBER,
|
"total health %" = IC_PINTYPE_NUMBER,
|
||||||
"total missing health" = IC_PINTYPE_NUMBER
|
"total missing health" = IC_PINTYPE_NUMBER
|
||||||
@@ -110,7 +110,7 @@
|
|||||||
This type is much more precise, allowing the machine to know much more about the target than a normal analyzer."
|
This type is much more precise, allowing the machine to know much more about the target than a normal analyzer."
|
||||||
icon_state = "medscan_adv"
|
icon_state = "medscan_adv"
|
||||||
complexity = 12
|
complexity = 12
|
||||||
inputs = list("\<REF\> target")
|
inputs = list("target" = IC_PINTYPE_REF)
|
||||||
outputs = list(
|
outputs = list(
|
||||||
"total health %" = IC_PINTYPE_NUMBER,
|
"total health %" = IC_PINTYPE_NUMBER,
|
||||||
"total missing health" = IC_PINTYPE_NUMBER,
|
"total missing health" = IC_PINTYPE_NUMBER,
|
||||||
@@ -153,7 +153,7 @@
|
|||||||
desc = "A very small version of the xenobio analyser. This allows the machine to know every needed properties of slime."
|
desc = "A very small version of the xenobio analyser. This allows the machine to know every needed properties of slime."
|
||||||
icon_state = "medscan_adv"
|
icon_state = "medscan_adv"
|
||||||
complexity = 12
|
complexity = 12
|
||||||
inputs = list("\<REF\> target")
|
inputs = list("target" = IC_PINTYPE_REF)
|
||||||
outputs = list(
|
outputs = list(
|
||||||
"colour" = IC_PINTYPE_STRING,
|
"colour" = IC_PINTYPE_STRING,
|
||||||
"adult" = IC_PINTYPE_BOOLEAN,
|
"adult" = IC_PINTYPE_BOOLEAN,
|
||||||
@@ -197,7 +197,7 @@
|
|||||||
It cannot scan seeds nor fruits, only plants."
|
It cannot scan seeds nor fruits, only plants."
|
||||||
icon_state = "medscan_adv"
|
icon_state = "medscan_adv"
|
||||||
complexity = 12
|
complexity = 12
|
||||||
inputs = list("\<REF\> target")
|
inputs = list("target" = IC_PINTYPE_REF)
|
||||||
outputs = list(
|
outputs = list(
|
||||||
"plant type" = IC_PINTYPE_STRING,
|
"plant type" = IC_PINTYPE_STRING,
|
||||||
"age" = IC_PINTYPE_NUMBER,
|
"age" = IC_PINTYPE_NUMBER,
|
||||||
@@ -258,7 +258,7 @@
|
|||||||
extended_desc = "This allows the machine to scan plants in trays for reagent and trait genes. \
|
extended_desc = "This allows the machine to scan plants in trays for reagent and trait genes. \
|
||||||
It cannot scan seeds nor fruits, only plants."
|
It cannot scan seeds nor fruits, only plants."
|
||||||
inputs = list(
|
inputs = list(
|
||||||
"\<REF\> target" = IC_PINTYPE_REF
|
"target" = IC_PINTYPE_REF
|
||||||
)
|
)
|
||||||
outputs = list(
|
outputs = list(
|
||||||
"traits" = IC_PINTYPE_LIST,
|
"traits" = IC_PINTYPE_LIST,
|
||||||
@@ -448,8 +448,8 @@
|
|||||||
extended_desc = "The first pin requires a ref to the kind of object that you want the locator to acquire. This means that it will \
|
extended_desc = "The first pin requires a ref to the kind of object that you want the locator to acquire. This means that it will \
|
||||||
give refs to nearby objects that are similar. If more than one valid object is found nearby, it will choose one of them at \
|
give refs to nearby objects that are similar. If more than one valid object is found nearby, it will choose one of them at \
|
||||||
random."
|
random."
|
||||||
inputs = list("desired type ref")
|
inputs = list("desired type ref" = IC_PINTYPE_REF)
|
||||||
outputs = list("located ref")
|
outputs = list("located ref" = IC_PINTYPE_REF)
|
||||||
activators = list("locate" = IC_PINTYPE_PULSE_IN,"found" = IC_PINTYPE_PULSE_OUT,
|
activators = list("locate" = IC_PINTYPE_PULSE_IN,"found" = IC_PINTYPE_PULSE_OUT,
|
||||||
"not found" = IC_PINTYPE_PULSE_OUT)
|
"not found" = IC_PINTYPE_PULSE_OUT)
|
||||||
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
||||||
@@ -544,7 +544,7 @@
|
|||||||
item by matching desired text in it's name and description. If more than one valid object is found nearby, it will choose one of them at \
|
item by matching desired text in it's name and description. If more than one valid object is found nearby, it will choose one of them at \
|
||||||
random. The second pin is a radius."
|
random. The second pin is a radius."
|
||||||
inputs = list("desired type" = IC_PINTYPE_ANY, "radius" = IC_PINTYPE_NUMBER)
|
inputs = list("desired type" = IC_PINTYPE_ANY, "radius" = IC_PINTYPE_NUMBER)
|
||||||
outputs = list("located ref")
|
outputs = list("located ref" = IC_PINTYPE_REF)
|
||||||
activators = list("locate" = IC_PINTYPE_PULSE_IN,"found" = IC_PINTYPE_PULSE_OUT,"not found" = IC_PINTYPE_PULSE_OUT)
|
activators = list("locate" = IC_PINTYPE_PULSE_IN,"found" = IC_PINTYPE_PULSE_OUT,"not found" = IC_PINTYPE_PULSE_OUT)
|
||||||
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
||||||
power_draw_per_use = 30
|
power_draw_per_use = 30
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
desc = "This tiny chip will decide for you!"
|
desc = "This tiny chip will decide for you!"
|
||||||
extended_desc = "Logic circuits will treat a null, 0, and a \"\" string value as FALSE and anything else as TRUE."
|
extended_desc = "Logic circuits will treat a null, 0, and a \"\" string value as FALSE and anything else as TRUE."
|
||||||
complexity = 1
|
complexity = 1
|
||||||
outputs = list("result")
|
outputs = list("result" = IC_PINTYPE_BOOLEAN)
|
||||||
activators = list("compare" = IC_PINTYPE_PULSE_IN)
|
activators = list("compare" = IC_PINTYPE_PULSE_IN)
|
||||||
category_text = "Logic"
|
category_text = "Logic"
|
||||||
power_draw_per_use = 1
|
power_draw_per_use = 1
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
push_data()
|
push_data()
|
||||||
|
|
||||||
/obj/item/integrated_circuit/logic/binary
|
/obj/item/integrated_circuit/logic/binary
|
||||||
inputs = list("A","B")
|
inputs = list("A" = IC_PINTYPE_ANY,"B" = IC_PINTYPE_ANY)
|
||||||
activators = list("compare" = IC_PINTYPE_PULSE_IN, "on true result" = IC_PINTYPE_PULSE_OUT, "on false result" = IC_PINTYPE_PULSE_OUT)
|
activators = list("compare" = IC_PINTYPE_PULSE_IN, "on true result" = IC_PINTYPE_PULSE_OUT, "on false result" = IC_PINTYPE_PULSE_OUT)
|
||||||
|
|
||||||
/obj/item/integrated_circuit/logic/binary/do_work()
|
/obj/item/integrated_circuit/logic/binary/do_work()
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
return (isnum(A.data) && isnum(B.data)) || (istext(A.data) && istext(B.data))
|
return (isnum(A.data) && isnum(B.data)) || (istext(A.data) && istext(B.data))
|
||||||
|
|
||||||
/obj/item/integrated_circuit/logic/unary
|
/obj/item/integrated_circuit/logic/unary
|
||||||
inputs = list("A")
|
inputs = list("A" = IC_PINTYPE_ANY)
|
||||||
activators = list("compare" = IC_PINTYPE_PULSE_IN, "on compare" = IC_PINTYPE_PULSE_OUT)
|
activators = list("compare" = IC_PINTYPE_PULSE_IN, "on compare" = IC_PINTYPE_PULSE_OUT)
|
||||||
|
|
||||||
/obj/item/integrated_circuit/logic/unary/do_work()
|
/obj/item/integrated_circuit/logic/unary/do_work()
|
||||||
@@ -49,7 +49,7 @@
|
|||||||
|
|
||||||
/obj/item/integrated_circuit/logic/binary/equals
|
/obj/item/integrated_circuit/logic/binary/equals
|
||||||
name = "equal gate"
|
name = "equal gate"
|
||||||
desc = "This gate compares two values, and outputs '1' if both are the same."
|
desc = "This gate compares two values, and outputs TRUE if both are the same."
|
||||||
icon_state = "equal"
|
icon_state = "equal"
|
||||||
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
||||||
|
|
||||||
@@ -60,8 +60,8 @@
|
|||||||
name = "JK latch"
|
name = "JK latch"
|
||||||
desc = "This gate is a synchronized JK latch."
|
desc = "This gate is a synchronized JK latch."
|
||||||
icon_state = "jklatch"
|
icon_state = "jklatch"
|
||||||
inputs = list("J","K")
|
inputs = list("J" = IC_PINTYPE_ANY,"K" = IC_PINTYPE_ANY)
|
||||||
outputs = list("Q","!Q")
|
outputs = list("Q" = IC_PINTYPE_BOOLEAN,"!Q" = IC_PINTYPE_BOOLEAN)
|
||||||
activators = list("pulse in C" = IC_PINTYPE_PULSE_IN, "pulse out Q" = IC_PINTYPE_PULSE_OUT, "pulse out !Q" = IC_PINTYPE_PULSE_OUT)
|
activators = list("pulse in C" = IC_PINTYPE_PULSE_IN, "pulse out Q" = IC_PINTYPE_PULSE_OUT, "pulse out !Q" = IC_PINTYPE_PULSE_OUT)
|
||||||
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
||||||
var/lstate=FALSE
|
var/lstate=FALSE
|
||||||
@@ -91,8 +91,8 @@
|
|||||||
name = "RS latch"
|
name = "RS latch"
|
||||||
desc = "This gate is a synchronized RS latch. If both R and S are true, state will not change."
|
desc = "This gate is a synchronized RS latch. If both R and S are true, state will not change."
|
||||||
icon_state = "sr_nor"
|
icon_state = "sr_nor"
|
||||||
inputs = list("S","R")
|
inputs = list("S" = IC_PINTYPE_ANY,"R" = IC_PINTYPE_ANY)
|
||||||
outputs = list("Q","!Q")
|
outputs = list("Q" = IC_PINTYPE_BOOLEAN,"!Q" = IC_PINTYPE_BOOLEAN)
|
||||||
activators = list("pulse in C" = IC_PINTYPE_PULSE_IN, "pulse out Q" = IC_PINTYPE_PULSE_OUT, "pulse out !Q" = IC_PINTYPE_PULSE_OUT)
|
activators = list("pulse in C" = IC_PINTYPE_PULSE_IN, "pulse out Q" = IC_PINTYPE_PULSE_OUT, "pulse out !Q" = IC_PINTYPE_PULSE_OUT)
|
||||||
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
||||||
var/lstate=FALSE
|
var/lstate=FALSE
|
||||||
@@ -120,8 +120,8 @@
|
|||||||
name = "gated D latch"
|
name = "gated D latch"
|
||||||
desc = "This gate is a synchronized gated D latch."
|
desc = "This gate is a synchronized gated D latch."
|
||||||
icon_state = "gated_d"
|
icon_state = "gated_d"
|
||||||
inputs = list("D","E")
|
inputs = list("D" = IC_PINTYPE_ANY,"E" = IC_PINTYPE_ANY)
|
||||||
outputs = list("Q","!Q")
|
outputs = list("Q" = IC_PINTYPE_BOOLEAN,"!Q" = IC_PINTYPE_BOOLEAN)
|
||||||
activators = list("pulse in C" = IC_PINTYPE_PULSE_IN, "pulse out Q" = IC_PINTYPE_PULSE_OUT, "pulse out !Q" = IC_PINTYPE_PULSE_OUT)
|
activators = list("pulse in C" = IC_PINTYPE_PULSE_IN, "pulse out Q" = IC_PINTYPE_PULSE_OUT, "pulse out !Q" = IC_PINTYPE_PULSE_OUT)
|
||||||
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
||||||
var/lstate=FALSE
|
var/lstate=FALSE
|
||||||
@@ -147,7 +147,7 @@
|
|||||||
|
|
||||||
/obj/item/integrated_circuit/logic/binary/not_equals
|
/obj/item/integrated_circuit/logic/binary/not_equals
|
||||||
name = "not equal gate"
|
name = "not equal gate"
|
||||||
desc = "This gate compares two values, and outputs '1' if both are different."
|
desc = "This gate compares two values, and outputs TRUE if both are different."
|
||||||
icon_state = "not_equal"
|
icon_state = "not_equal"
|
||||||
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
||||||
|
|
||||||
@@ -156,7 +156,7 @@
|
|||||||
|
|
||||||
/obj/item/integrated_circuit/logic/binary/and
|
/obj/item/integrated_circuit/logic/binary/and
|
||||||
name = "and gate"
|
name = "and gate"
|
||||||
desc = "This gate will output '1' if both inputs evaluate to true."
|
desc = "This gate will output TRUE if both inputs evaluate to true."
|
||||||
icon_state = "and"
|
icon_state = "and"
|
||||||
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
||||||
|
|
||||||
@@ -165,7 +165,7 @@
|
|||||||
|
|
||||||
/obj/item/integrated_circuit/logic/binary/or
|
/obj/item/integrated_circuit/logic/binary/or
|
||||||
name = "or gate"
|
name = "or gate"
|
||||||
desc = "This gate will output '1' if one of the inputs evaluate to true."
|
desc = "This gate will output TRUE if one of the inputs evaluate to true."
|
||||||
icon_state = "or"
|
icon_state = "or"
|
||||||
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
||||||
|
|
||||||
@@ -174,7 +174,7 @@
|
|||||||
|
|
||||||
/obj/item/integrated_circuit/logic/binary/less_than
|
/obj/item/integrated_circuit/logic/binary/less_than
|
||||||
name = "less than gate"
|
name = "less than gate"
|
||||||
desc = "This will output '1' if the first input is less than the second input."
|
desc = "This will output TRUE if the first input is less than the second input."
|
||||||
icon_state = "less_than"
|
icon_state = "less_than"
|
||||||
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
||||||
|
|
||||||
@@ -184,7 +184,7 @@
|
|||||||
|
|
||||||
/obj/item/integrated_circuit/logic/binary/less_than_or_equal
|
/obj/item/integrated_circuit/logic/binary/less_than_or_equal
|
||||||
name = "less than or equal gate"
|
name = "less than or equal gate"
|
||||||
desc = "This will output '1' if the first input is less than, or equal to the second input."
|
desc = "This will output TRUE if the first input is less than, or equal to the second input."
|
||||||
icon_state = "less_than_or_equal"
|
icon_state = "less_than_or_equal"
|
||||||
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
||||||
|
|
||||||
@@ -194,7 +194,7 @@
|
|||||||
|
|
||||||
/obj/item/integrated_circuit/logic/binary/greater_than
|
/obj/item/integrated_circuit/logic/binary/greater_than
|
||||||
name = "greater than gate"
|
name = "greater than gate"
|
||||||
desc = "This will output '1' if the first input is greater than the second input."
|
desc = "This will output TRUE if the first input is greater than the second input."
|
||||||
icon_state = "greater_than"
|
icon_state = "greater_than"
|
||||||
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
||||||
|
|
||||||
@@ -204,7 +204,7 @@
|
|||||||
|
|
||||||
/obj/item/integrated_circuit/logic/binary/greater_than_or_equal
|
/obj/item/integrated_circuit/logic/binary/greater_than_or_equal
|
||||||
name = "greater_than or equal gate"
|
name = "greater_than or equal gate"
|
||||||
desc = "This will output '1' if the first input is greater than, or equal to the second input."
|
desc = "This will output TRUE if the first input is greater than, or equal to the second input."
|
||||||
icon_state = "greater_than_or_equal"
|
icon_state = "greater_than_or_equal"
|
||||||
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
|
||||||
|
|
||||||
|
|||||||
@@ -131,4 +131,5 @@ JStheguy = Game Master
|
|||||||
excessiveuseofcobby = Game Master
|
excessiveuseofcobby = Game Master
|
||||||
Plizzard = Game Master
|
Plizzard = Game Master
|
||||||
octareenroon91 = Game Master
|
octareenroon91 = Game Master
|
||||||
Serpentarium = Game Master
|
Serpentarium = Game Master
|
||||||
|
Averagejoe82 = Game Master
|
||||||
|
|||||||
Reference in New Issue
Block a user