Commit Graph

135 Commits

Author SHA1 Message Date
Ling
0dc88a31e3 Merge pull request #1794 from yogstation13/upstream-merge-39168
[MIRROR] makes integrated circuits less window spammy
2018-07-20 13:41:50 +02:00
Tlaltecuhtli
b9b479671b makes integrated circuits less window spammy (#39168)
putting a cell and other not intended actions dont open the circuit window
2018-07-18 17:35:06 +01:00
AnturK
f657d9b5fa Fixes circuit throwing from grabber (#39191) 2018-07-18 17:28:29 +01:00
Shdorsh
3780e54684 Add UI to circuit printers (#39148)
The ugly white with text looks kinda ugly, so let's add some css to it and make
it borderline bearable for eyes.

Because the interface is kinda hard to look at as it is now and it can be
confusing to get into circuitry that way.
2018-07-17 10:05:09 +01:00
kevinz000
411b246582 Update time.dm (#39140) 2018-07-16 03:04:07 +01:00
Shdorsh
47a675fd2d Added max and min circuit (#39013)
* Added max and min circuit

This now has a max and min circuit which checks all values and returns the highest/lowest of them. Tested and working.

* update: saving lines of code

The more compact min max. you may as well want to try the same with addition and substraction.

* Reformated code and improved proc

As you said, added early continue, put the vars low and changed the logic on the result.

* Update arithmetic.dm
2018-07-13 23:15:58 +01:00
1fbff5f83b23d39d38b1dfcb4cac8d9b
929426566d Removes underscore from name of greater than or equal circuit (#38976)
* Update logic.dm

* Adds misnamed circuit back for backwards compatibility 

Screw web editor on phone

* Makes indentation consistent

* okay, fine
2018-07-10 07:44:20 +01:00
Jordan Brown
703d9c0943 Merge pull request #38938 from ninjanomnom/b-b-bump
Converts collide back to bump and fixes double bumping in another way
2018-07-09 19:51:07 +01:00
Trevor Serpas
6d395a672f Afterattack() Signal (#38606)
* adds signal and modifies each call of afterattack to call it's inherited proc

* uses new macro for sendsignal()

* map fuck

* skip precommithooks

* combine and negate 2 ifs
2018-07-07 07:01:19 +01:00
Thunder12345
e26090692e Adds a colour picker component for circuits (#38804)
* added color picker IC component

* added sprite for color picker
2018-07-01 17:24:14 +01:00
BlueNothing
907854700a Grabber and Cavity Implant Interaction Nerf (#38748)
* Shrinks the internal cavity, allowing only singletanks, small, and smaller items to be implanted in the chest (heavily nerfs 'chestgun' circuits). Additionally, prevents circuits from grabbing or throwing in storage implants. As part of this change, grabbers can now hold items up to assembly size (shouldn't be problematic, since they cannot hold TTVs or two-handed weapons, and can no longer function inside of a storage implant).

* Un-nerfs cavity implants, while preventing medium circuits from functioning as storage implants or chestguns.

A later PR soon should add logging for throwers and examine text for implanted small weapon circuits.
2018-06-29 17:20:04 +01:00
Nich
6c879778b6 spellchecks tg whatever 2018-06-28 21:26:38 +02:00
Dax Dupont
6813133171 Allows admins to scan circuits + more logging (#38762)
* Allows admins to scan circuits

* Adds logging to screens that actually output to nearby

* incase they manually spam it

* Throw logs
2018-06-28 19:18:32 +01:00
Dax Dupont
90d43ec7c7 [READY] General Circuit Improvements (#38742)
* [WIP] General circuit improvements

* Fix

* s

* Adds sound logging

* oops

* mob user
2018-06-27 15:01:48 +01:00
Nich
bc089bdc3e Merge pull request #1396 from yogstation13/upstream-merge-38621
[MIRROR] Prevents grabbers from holding circuit assemblies.
2018-06-21 10:10:49 +02:00
BlueNothing
50b091fd87 Preventing grabbers from holding other circuits is a simple (one-line) fix that strongly nerfs so-called 'uberthrower' circuits, dropping their damage output drastically. Uberthrower circuits are one of the most famous unintended uses of circuits. (#38621) 2018-06-21 08:42:08 +01:00
1fbff5f83b23d39d38b1dfcb4cac8d9b
d94c248f6a Adds atmos circuit (#38111)
* Adds gas circuits

* Integrated connector

* Filters, tanks, some balancing

* fixed fucky wucky in tank size

* maybe they'll appreciate you more one day

* this code was written by a gibbon
2018-06-20 21:39:05 +01:00
JStheguy
495c0524bf [READY] Helps data disks stop being unemployed (#38319)
* data cards actually have a function now

* Adds data cards to the IC printer for real rea

* more cards, less shitty code

* how the fuck did I miss that

adds a missing ..()

* wait wrong use of ..() fuck
2018-06-19 18:22:11 +01:00
ShizCalev
771548d36d puts a / at the start of some obj instances (#38545) 2018-06-17 17:11:12 +01:00
Jordan Brown
4fb44aa0ba Merge pull request #38535 from DaxDupont/circuits
[s] Removes circuit exploit
2018-06-16 22:03:31 +01:00
Jordan Brown
71a417065f Merge pull request #38456 from theo2003/circuit_scan
Players who edited a circuit assembly can scan it as a ghost.
2018-06-15 20:04:13 +01:00
oranges
424a65b3e6 Merge pull request #38360 from ShizCalev/key-cleanup
Cleans up some logging
2018-06-12 00:49:00 +01:00
1fbff5f83b23d39d38b1dfcb4cac8d9b
8b6aeb242e Fix recycling the same assembly multiple times (#38275) 2018-06-05 06:48:05 +01:00
theo2003
ec4f7f7509 Fixed hydroponics tray weed light not turning off when weeds are removed by an integrated circuits device. (#38246) 2018-06-03 18:59:49 +01:00
vuonojenmustaturska
77410bd84b Move NODROP_1, DROPDEL_1, ABSTRACT_1 and NOBLUDGEON_1 to item_flags where they belong (#38171)
* (mostly) nodrop

* (mostly) dropdel

* (mostly) abstract

* nobludgeon

* things i missed

* forgot one

* unintended changes

* energy handcuffs
2018-06-01 15:48:10 +02:00
Nich
dbbd605a50 Merge branch 'master' into prsfixed 2018-05-24 13:01:20 +02:00
Nich
ec74ea5771 Merge pull request #942 from yogstation13/upstream-merge-37671
[MIRROR] Adds an EMP protection component, allowing ANYTHING to be protected from EMP
2018-05-24 12:48:35 +02:00
Trevor Serpas
91341c364e Some circuitry fixes and qol (#37755)
* some circuit fixes

I removed the ability for you to save whether or not an assembly is open since you always want the assebly to be open when its printed so you can put a battery in. I fixed the other three issues because they were bugs.

* tells user when they use a sensor or scanner

* oops

* revert last commit

* usr -> user
2018-05-24 12:30:45 +02:00
vuonojenmustaturska
ddd4409133 Adds an EMP protection component, allowing ANYTHING to be protected from EMP (#37671)
The component is initialized with any combination of three flags, EMP_PROTECT_SELF protects against effects that target the object itself, EMP_PROTECT_WIRES protects against wires being messed with similar to the NO_EMP_WIRES_1 flag which this PR removes, EMP_PROTECT_CONTENTS protects against things that are inside the object like organs, internal "non-virtual" power cells and the like

This enables (but doesn't introduce) new mechanics such as adding EMP shielding at runtime to any atom, or taking it away.
2018-05-22 21:35:29 +01:00
Jordan Brown
f7752c8cd6 Merge pull request #37972 from 1fbff5f83b23d39d38b1dfcb4cac8d9b/patch-1
Fixes an oops in circuit printer description check
2018-05-21 22:44:07 +01:00
r-esistor
2c94f0afcf Circuit Labels (sorta understanding git edition) (#37633)
* Customizable circuit names/descriptions

* Circuit descriptions are now copied

* Prevents code injection through the desc
2018-05-21 11:38:17 +01:00
Alexch2
b0d6258d89 Improves descriptions of Integrated Circuits (#37678)
* Fixes a ton of typos, inaccuracies, poor grammar, and confusing weirdnesses from the descriptions of almost every integrated circuit.
For example, the reagent filter:

Before:
"This is a filter which will move liquids from the source to the target. It will move all reagents, except those in the unwanted list, given the fourth pin if amount value is positive, or it will move only desired reagents if amount is negative. The third pin determines how much reagent is moved per pulse, between 0 and 50. Amount is given for each separate reagent."

After:
This is a filter which will move liquids from the source to its target.
If the amount in the fourth pin is positive, it will move all reagents except those in the unwanted list.
If the amount in the fourth pin is negative, it will only move the reagents in the wanted list.
The third pin determines how many reagents are moved per pulse, between 0 and 50. Amount is given for each separate reagent."

* fixed, ready

* Actually fixed and ready.

* Reverts the name of the coordinate pathfinder circuit back to "coordinte"

* Fixes a few missed, or poorly rewritten parts.

* Update smart.dm
2018-05-19 23:11:33 +01:00
Trevor Serpas
14b673eb17 Circuit gun inhands and grabber fix (#37836)
* Grabbers update when a thrower uses its inventory and throwers and gun circuits need to use the gun assembly

* visible_messages
2018-05-17 18:54:51 +01:00
PKPenguin321
43fb5bf378 Integrated Circuits: String parsing update (#37571)
* circuit tweaks
two new variants of concatenators: small and large. each have corresponding complexity and inputs
find text circuit now has two pulse outs, one for if it finds the text, one for if it does not. may break some old circuits but should be easy to fix

* readds after search pulse out

* adds length circuit for strings

* null delimiter in exploder returns list of all chars

* adds indexer circuit

* actual null check

* better descs

* addresses review

removed unneeded var

* moves concatenator pin setup to initialize
2018-05-09 06:45:17 +01:00
ShizCalev
18e0e7a1ad Shows assemblies some love. ♥ (#37632)
* Shows assemblies some love.

* TRUE

* More cleanup and fixes

* feedback

* does needful

* true
2018-05-06 13:05:39 +01:00
Nich
c070c450e9 Merge pull request #697 from yogstation13/upstream-merge-37432
[MIRROR] Fixes Several Machines Materials Insertion
2018-05-04 12:09:51 +02:00
Fox McCloud
61517ab0ee Fixes Several Machines Materials Insertion (#37432)
* Fixes Several Machines Materials Insertion

* attackby disable and show on examine fix
2018-05-04 10:40:39 +01:00
Trevor Serpas
18eb663e53 constant chip fix (#37636)
removes extra pins from constant chip
2018-05-04 01:12:38 +01:00
Jordan Brown
4abf75e7cc Merge pull request #37510 from JJRcop/throw_myself
Circuits can't throw themselves
2018-04-30 19:06:38 +01:00
kevinz000
14cfa55957 Fixes circuits being able to detect ghosts and fix pinless guns (#37437)
* Circuit exploit fixes

* Update input.dm
2018-04-30 10:57:07 +01:00
Evsey Antonovich
70c7f647f8 IC weapons only works on turfs (#37496) 2018-04-30 07:33:44 +01:00
kevinz000
283695b2d4 More integrated circuits and NTNET upgrade! (#37165)
rscadd: Circuit ntnet components buffed. Added a new low level ntnet component that can send custom data instead of just the two plaintext and one passkey format, which things will use by default. Ntnet now uses a list for their data instead of three variables. they also have lowered complexity for the now weakened normal network component, and has lower cooldowns.
2018-04-28 09:48:42 +01:00
Nich
264face62c you can now print tools using the integrated circuit printer again (#37445)
* you can now print tools again

* I'm severely mentally retarded

* Update printer.dm
2018-04-27 11:18:04 +01:00
Nich
a4820594d3 Fixes a thing (#37427) 2018-04-25 19:29:01 +01:00
Ling
cb434847ae Merge pull request #468 from yogstation13/upstream-merge-37297
[MIRROR] Kills off /obj/item/device
2018-04-23 20:37:59 +02:00
Jordan Brown
ed41f875a2 Merge pull request #37364 from Jalleo/Inducer_change
Removes the ability for inducers and circuits to charge energy weapons.
2018-04-23 17:52:09 +01:00
Fox McCloud
d42a67da02 Kills off /obj/item/device (#37297)
* Kills off /obj/item/device

* whoops

* whoops

* Fix
2018-04-23 14:01:33 +01:00
SailorDave
fade44bd7c [READY] A few additions, tweaks, and fixes for integrated circuits (#36270)
* A few additions, tweaks, and fixes for integrated circuits, and some very minor tweaks to hydroponics and carbon/silicon examine() to support those changes.

🆑 SailorDave
rscadd: A new manipulation circuit, the Seed Extractor. Extracts seeds from produce, and outputs a list of the extracted seeds.
rscadd: A new list circuit, the List Filter. Searches through a list for anything matching the desired element and outputs two lists: one containing just the matches, and the other with matches filtered out.
rscadd: A new list circuit, the Set circuit. Removes duplicate entries from a list.
tweak: The Plant Manipulation circuit can now plant seeds, and outputs a list of harvested plants.
tweak: Reagent circuits can now irrigate connected hydroponic trays and inject blood samples into Replica pods.
tweak: The Examiner circuit outputs worn items and other examined details of carbon and silicon mobs into the description pin.
tweak: List Advanced Locator circuit now accepts refs as well as strings.
bugfix: Fixed the Power Transmitter circuit not properly displaying a message when activated.
bugfix: Medical Analyzer circuit can now properly scan non-human mobs.
/🆑

Additional details:
- Plant Manipulation: obj/item/seeds harvest() proc and obj/machinery/hydroponics attack_hand() procs were adjusted slightly to allow this, returning a list when harvested.

- Seed Extractor Module: obj/machinery/seed_extractor /proc/seedify() was adjusted to return a list of seeds.

- Hydroponics replica pod was adjusted to be injectable|drawable, and use reagents and on_reagent_change() rather than a hardcoded attackby(), so other injection methods can use it to allow blood sampling/future reagent reactions regardless of type.

- IC Examiner Module returns a list of examine() messages from mob/living/carbon, mob/living/carbon/human, mob/living/carbon/silicon, and mob/living/carbon/silicon/ai in the description data pin, rather than outputting null since they had an empty desc var. The relevant examine procs were adjusted to return their messages.

 - IC get_data() and set_pin_data() adjusted to return text/num properly and to WEAKREF/un-WEAKREF the contents of passed lists.

* fixes errors from screwy merge conflicts and replaces illegal proc name

* re-added a traits tag that accidentally got removed

* review changes

* plant analyzer outputs irrigation status and connected trays, search circuit uses 2 Cx down from 6

* examiner outputs the occupied turf of the examined object and can also scan turfs

* string inputs on circuit pins now use multiline input; fixed edit/remove not working on list pins; fixed large screens not outputting visible messages when held

* locomotion now has a cooldown of 0.1sec and their complexity + pathfinder complexity reduced

* assemblies can open doors they have access to from a card reader through collision

* Merge master branch; fixes pathfinder AStar runtime; fixes tile pointer; fixes material manager self-ref; various grammar touchups

* review changes

* fixes improper weakref type checking

* fixes seed extractor merge confict, removes unnecessary weakref change

* dang ol merge undoing my changes HECK

* updated to robbym's tile pointer PR with clearer var names

* added missing "not scanned" results to tile analyzer, removes duplicate circuit entries(???? how)
2018-04-21 14:01:42 +01:00
John Ginnane
9308514865 Reorganised component controls (#37054)
* Reorganised component controls

* Simplied menu further

Removed "rename" and "copy ref", renamed "remove" to just "-"

* Added similar changes to "built in" components and added "Rename"
2018-04-15 10:32:03 +01:00
Nich
b33b222717 Merge branch 'master' into upstream-merge-36696 2018-04-14 23:26:21 +02:00