From 00f5570ccf3cc5a930970ad5f751f8a1cedab98a Mon Sep 17 00:00:00 2001 From: Trevor Serpas Date: Wed, 11 Apr 2018 07:21:06 -0500 Subject: [PATCH 1/2] Integrated Circuits Parameter Fixes --- .../integrated_electronics/subtypes/input.dm | 16 +- .../integrated_electronics/subtypes/logic.dm | 34 ++--- config/admins.txt | 138 ++++++++++++++++++ 3 files changed, 163 insertions(+), 25 deletions(-) diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm index b9ab32194f..e2d7f10938 100644 --- a/code/modules/integrated_electronics/subtypes/input.dm +++ b/code/modules/integrated_electronics/subtypes/input.dm @@ -81,7 +81,7 @@ desc = "A very small version of the common medical analyser. This allows the machine to know how healthy someone is." icon_state = "medscan" complexity = 4 - inputs = list("\ target") + inputs = list("target" = IC_PINTYPE_REF) outputs = list( "total 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." icon_state = "medscan_adv" complexity = 12 - inputs = list("\ target") + inputs = list("target" = IC_PINTYPE_REF) outputs = list( "total 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." icon_state = "medscan_adv" complexity = 12 - inputs = list("\ target") + inputs = list("target" = IC_PINTYPE_REF) outputs = list( "colour" = IC_PINTYPE_STRING, "adult" = IC_PINTYPE_BOOLEAN, @@ -197,7 +197,7 @@ It cannot scan seeds nor fruits, only plants." icon_state = "medscan_adv" complexity = 12 - inputs = list("\ target") + inputs = list("target" = IC_PINTYPE_REF) outputs = list( "plant type" = IC_PINTYPE_STRING, "age" = IC_PINTYPE_NUMBER, @@ -258,7 +258,7 @@ extended_desc = "This allows the machine to scan plants in trays for reagent and trait genes. \ It cannot scan seeds nor fruits, only plants." inputs = list( - "\ target" = IC_PINTYPE_REF + "target" = IC_PINTYPE_REF ) outputs = 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 \ 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." - inputs = list("desired type ref") - outputs = list("located ref") + inputs = list("desired type ref" = IC_PINTYPE_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) 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 \ random. The second pin is a radius." 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) spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH power_draw_per_use = 30 diff --git a/code/modules/integrated_electronics/subtypes/logic.dm b/code/modules/integrated_electronics/subtypes/logic.dm index 702ab588c5..5ca10106c6 100644 --- a/code/modules/integrated_electronics/subtypes/logic.dm +++ b/code/modules/integrated_electronics/subtypes/logic.dm @@ -3,7 +3,7 @@ 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." complexity = 1 - outputs = list("result") + outputs = list("result" = IC_PINTYPE_BOOLEAN) activators = list("compare" = IC_PINTYPE_PULSE_IN) category_text = "Logic" power_draw_per_use = 1 @@ -12,7 +12,7 @@ push_data() /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) /obj/item/integrated_circuit/logic/binary/do_work() @@ -31,7 +31,7 @@ return FALSE /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) /obj/item/integrated_circuit/logic/unary/do_work() @@ -46,7 +46,7 @@ /obj/item/integrated_circuit/logic/binary/equals 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" spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH @@ -57,8 +57,8 @@ name = "JK latch" desc = "This gate is a synchronized JK latch." icon_state = "jklatch" - inputs = list("J","K") - outputs = list("Q","!Q") + inputs = list("J" = IC_PINTYPE_ANY,"K" = IC_PINTYPE_ANY) + 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) spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH var/lstate=FALSE @@ -88,8 +88,8 @@ name = "RS latch" desc = "This gate is a synchronized RS latch. If both R and S are true, state will not change." icon_state = "sr_nor" - inputs = list("S","R") - outputs = list("Q","!Q") + inputs = list("S" = IC_PINTYPE_ANY,"R" = IC_PINTYPE_ANY) + 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) spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH var/lstate=FALSE @@ -117,8 +117,8 @@ name = "gated D latch" desc = "This gate is a synchronized gated D latch." icon_state = "gated_d" - inputs = list("D","E") - outputs = list("Q","!Q") + inputs = list("D" = IC_PINTYPE_ANY,"E" = IC_PINTYPE_ANY) + 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) spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH var/lstate=FALSE @@ -144,7 +144,7 @@ /obj/item/integrated_circuit/logic/binary/not_equals 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" spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH @@ -153,7 +153,7 @@ /obj/item/integrated_circuit/logic/binary/and 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" spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH @@ -162,7 +162,7 @@ /obj/item/integrated_circuit/logic/binary/or 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" spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH @@ -171,7 +171,7 @@ /obj/item/integrated_circuit/logic/binary/less_than 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" spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH @@ -180,7 +180,7 @@ /obj/item/integrated_circuit/logic/binary/less_than_or_equal 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" spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH @@ -189,7 +189,7 @@ /obj/item/integrated_circuit/logic/binary/greater_than 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" spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH @@ -198,7 +198,7 @@ /obj/item/integrated_circuit/logic/binary/greater_than_or_equal 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" spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH diff --git a/config/admins.txt b/config/admins.txt index ca77fd3f4a..8d3fa91763 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -1,3 +1,4 @@ +<<<<<<< HEAD ############################################################################################### # Basically, ckey goes first. Rank goes after the "=" # # Case is not important for ckey. # @@ -7,3 +8,140 @@ # NOTE: if the rank-name cannot be found in admin_ranks.txt, they will not be adminned! ~Carn # # NOTE: syntax was changed to allow hyphenation of ranknames, since spaces are stripped. # ############################################################################################### +======= +############################################################################################### +# Basically, ckey goes first. Rank goes after the "=" # +# Case is not important for ckey. # +# Case IS important for the rank. # +# All punctuation (spaces etc) EXCEPT '-', '_' and '@' will be stripped from rank names. # +# Ranks can be anything defined in admin_ranks.txt # +# NOTE: if the rank-name cannot be found in admin_ranks.txt, they will not be adminned! ~Carn # +# NOTE: syntax was changed to allow hyphenation of ranknames, since spaces are stripped. # +# If SQL-based admin loading is enabled, admins listed here will always be loaded first # +# and will override any duplicate entries in the database. # +############################################################################################### +Optimumtact = Host +NewSta = Game Master +Expletives = Game Master +kingofkosmos = Game Master +MrStonedOne = Lazy Master +microscopics = Game Master +Gun Hog = Game Master +KorPhaeron = Game Master +razharas = Game Master +Lordpidey = Game Master +Niknakflak = Game Master +rolan7 = Game Master +quarxink = Game Master +adrix89 = Game Master +tle = Game Master +xsi = Game Master +scaredofshadows = Game Master +neofite = Game Master +trubblebass = Game Master +mport2004 = Game Master +deuryn = Game Master +agouri = Game Master +errorage = Game Master +superxpdude = Game Master +petethegoat = Game Master +nodrak = Game Master +carnwennan = Game Master +ikarrus = Game Master +cheridan = Game Master +giacomand = Game Master +rockdtben = Game Master +sieve = Game Master +aranclanos = Game Master +intigracy = Game Master +dumpdavidson = Game Master +kazeespada = Game Master +malkevin = Game Master +incoming = Game Master +demas = Game Master +fleure = Game Master +ricotez = Game Master +misterperson = Game Master +crimsonvision = Game Master +iamgoofball = Game Master +zelacks = Game Master +androidsfv = Game Master +miggles = Game Master +jordie0608 = Game Master +s0ldi3rkr4s0 = Game Master +ergovisavi = Game Master +vistapowa = Game Master +miauw62 = Game Master +rumia29 = Game Master +bobylein = Game Master +sirbayer = Game Master +hornygranny = Game Master +yota = Game Master +firecage = Game Master +donkieyo = Game Master +argoneus = Game Master +paprka = Game Master +cookingboy3 = Game Master +limeliz = Game Master +steelpoint = Game Master +phil235 = Game Master +CorruptComputer = Game Master +xxnoob = Game Master +tkdrg = Game Master +Cuboos = Game Master +thunder12345 = Game Master +wjohnston = Game Master +mandurrh = Game Master +thurgatar = Game Master +xerux = Game Master +dannno = Game Master +lo6a4evskiy = Game Master +vekter = Game Master +Ahammer18 = Game Master +ACCount12 = Game Master +fayrik = Game Master +shadowlight213 = Game Master +drovidicorv = Game Master +Dunc = Game Master +MMMiracles = Game Master +bear1ake = Game Master +CoreOverload = Game Master +Jalleo = Game Master +ChangelingRain = Game Master +FoxPMcCloud = Game Master +Xhuis = Game Master +Astralenigma = Game Master +Tokiko1 = Game Master +SuperSayu = Game Master +Lzimann = Game Master +As334 = Game Master +neersighted = Game Master +Swankcookie = Game Master +Ressler = Game Master +Folix = Game Master +Bawhoppennn = Game Master +Anturke = Host +Lumipharon = Game Master +bgobandit = Game Master +coiax = Game Master +RandomMarine = Game Master +PKPenguin321 = Game Master +TechnoAlchemist = Game Master +Aloraydrel = Game Master +Quiltyquilty = Game Master +SnipeDragon = Game Master +Fjeld = Game Master +kevinz000 = Game Master +Tacolizard = Game Master +TrustyGun = Game Master +Cyberboss = Game Master +PJB3005 = Game Master +Sweaterkittens = Game Master +Feemjmeem = Game Master +JStheguy = Game Master +excessiveuseofcobby = Game Master +Plizzard = Game Master +octareenroon91 = Game Master +Serpentarium = Game Master +Averagejoe82 = Game Master +>>>>>>> f0a8f4f... Integrated Circuits Parameter Fixes (#37073) From baf8c6967d23a29afd7ba435bb0db93cbb0a0e8d Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 11 Apr 2018 17:31:04 -0400 Subject: [PATCH 2/2] Update admins.txt --- config/admins.txt | 138 ---------------------------------------------- 1 file changed, 138 deletions(-) diff --git a/config/admins.txt b/config/admins.txt index 8d3fa91763..ca77fd3f4a 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -1,4 +1,3 @@ -<<<<<<< HEAD ############################################################################################### # Basically, ckey goes first. Rank goes after the "=" # # Case is not important for ckey. # @@ -8,140 +7,3 @@ # NOTE: if the rank-name cannot be found in admin_ranks.txt, they will not be adminned! ~Carn # # NOTE: syntax was changed to allow hyphenation of ranknames, since spaces are stripped. # ############################################################################################### -======= -############################################################################################### -# Basically, ckey goes first. Rank goes after the "=" # -# Case is not important for ckey. # -# Case IS important for the rank. # -# All punctuation (spaces etc) EXCEPT '-', '_' and '@' will be stripped from rank names. # -# Ranks can be anything defined in admin_ranks.txt # -# NOTE: if the rank-name cannot be found in admin_ranks.txt, they will not be adminned! ~Carn # -# NOTE: syntax was changed to allow hyphenation of ranknames, since spaces are stripped. # -# If SQL-based admin loading is enabled, admins listed here will always be loaded first # -# and will override any duplicate entries in the database. # -############################################################################################### -Optimumtact = Host -NewSta = Game Master -Expletives = Game Master -kingofkosmos = Game Master -MrStonedOne = Lazy Master -microscopics = Game Master -Gun Hog = Game Master -KorPhaeron = Game Master -razharas = Game Master -Lordpidey = Game Master -Niknakflak = Game Master -rolan7 = Game Master -quarxink = Game Master -adrix89 = Game Master -tle = Game Master -xsi = Game Master -scaredofshadows = Game Master -neofite = Game Master -trubblebass = Game Master -mport2004 = Game Master -deuryn = Game Master -agouri = Game Master -errorage = Game Master -superxpdude = Game Master -petethegoat = Game Master -nodrak = Game Master -carnwennan = Game Master -ikarrus = Game Master -cheridan = Game Master -giacomand = Game Master -rockdtben = Game Master -sieve = Game Master -aranclanos = Game Master -intigracy = Game Master -dumpdavidson = Game Master -kazeespada = Game Master -malkevin = Game Master -incoming = Game Master -demas = Game Master -fleure = Game Master -ricotez = Game Master -misterperson = Game Master -crimsonvision = Game Master -iamgoofball = Game Master -zelacks = Game Master -androidsfv = Game Master -miggles = Game Master -jordie0608 = Game Master -s0ldi3rkr4s0 = Game Master -ergovisavi = Game Master -vistapowa = Game Master -miauw62 = Game Master -rumia29 = Game Master -bobylein = Game Master -sirbayer = Game Master -hornygranny = Game Master -yota = Game Master -firecage = Game Master -donkieyo = Game Master -argoneus = Game Master -paprka = Game Master -cookingboy3 = Game Master -limeliz = Game Master -steelpoint = Game Master -phil235 = Game Master -CorruptComputer = Game Master -xxnoob = Game Master -tkdrg = Game Master -Cuboos = Game Master -thunder12345 = Game Master -wjohnston = Game Master -mandurrh = Game Master -thurgatar = Game Master -xerux = Game Master -dannno = Game Master -lo6a4evskiy = Game Master -vekter = Game Master -Ahammer18 = Game Master -ACCount12 = Game Master -fayrik = Game Master -shadowlight213 = Game Master -drovidicorv = Game Master -Dunc = Game Master -MMMiracles = Game Master -bear1ake = Game Master -CoreOverload = Game Master -Jalleo = Game Master -ChangelingRain = Game Master -FoxPMcCloud = Game Master -Xhuis = Game Master -Astralenigma = Game Master -Tokiko1 = Game Master -SuperSayu = Game Master -Lzimann = Game Master -As334 = Game Master -neersighted = Game Master -Swankcookie = Game Master -Ressler = Game Master -Folix = Game Master -Bawhoppennn = Game Master -Anturke = Host -Lumipharon = Game Master -bgobandit = Game Master -coiax = Game Master -RandomMarine = Game Master -PKPenguin321 = Game Master -TechnoAlchemist = Game Master -Aloraydrel = Game Master -Quiltyquilty = Game Master -SnipeDragon = Game Master -Fjeld = Game Master -kevinz000 = Game Master -Tacolizard = Game Master -TrustyGun = Game Master -Cyberboss = Game Master -PJB3005 = Game Master -Sweaterkittens = Game Master -Feemjmeem = Game Master -JStheguy = Game Master -excessiveuseofcobby = Game Master -Plizzard = Game Master -octareenroon91 = Game Master -Serpentarium = Game Master -Averagejoe82 = Game Master ->>>>>>> f0a8f4f... Integrated Circuits Parameter Fixes (#37073)