Commit Graph

108 Commits

Author SHA1 Message Date
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
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
Nich
a1bdca1927 Makes the PI circuit use the PI define (#37161)
* Makes the PI circuit use PI

* I'm a moron :()

* Update arithmetic.dm

* Update arithmetic.dm

* forgot the parentheses

* that's another commit
2018-04-13 18:45:10 +01:00
robbym
a4ac8f5299 Fixes tile analyzer (#36942)
* Fixes tile analyzer

* Added requested changes

* Changed turf content filter to /obj

* Added loop to add mobs to scan list
2018-04-12 17:50:42 +01:00
kevinz000
9ba8e6df20 Component Storage, Experimental attack_hand and [ui_]interact() refactors (#36696) 2018-04-12 12:46:50 +01:00
Nich
7e7e63b59e Merge pull request #330 from yogstation13/upstream-merge-37044
[MIRROR] Fix logic circuits runtime
2018-04-11 18:42:52 +02:00
arsserpentarium
62fe5eff22 Fix logic circuits runtime (#37044)
* 1011101 fix fix fix xif xif xif 1011101

* Update logic.dm
2018-04-11 15:44:45 +01:00
Trevor Serpas
5ae1b53a80 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.
2018-04-11 15:41:41 +01:00
oranges
438bfd85cc Merge pull request #37071 from kevinz000/patch-480
Fixes constants chips getting scrambled by EMPs
2018-04-11 02:55:51 +02:00
robbym
db04fddd02 Fixes null reference not pulsing the 'not scanned' output (#36973) 2018-04-06 15:31:26 +02:00
robbym
ebbd68e5ff Fixes 0 value not being saved in constant memory circuits (#36867)
* Fixes 0 value not being saved in constant memory circuits

* Fixes 0 value not being loaded in constant memory circuits

* Switched to isnull proc for null checks
2018-04-03 11:01:12 +01:00
vuonojenmustaturska
01a4ce0a4d Merge pull request #36864 from robbym/master
Cleaned up tile pointer circuit and converted to absolute coordinates
2018-04-01 14:20:59 +01:00
Jordan Brown
cde0589d80 Merge pull request #36795 from robbym/master
Fixes custom ticker logic (#36792)
2018-03-30 17:12:27 +01:00
vuonojenmustaturska
42710f14c6 Merge pull request #36736 from fludd12/light-up-the-night
Assemblies with lighting circuits now properly update light position.
2018-03-27 21:21:41 +01:00
arsserpentarium
c575ebbe7a [READY]pathfinding circuitry upgrade (#36398)
* all in one

* fixfixfix

* uhhhh

* demuxdemuxdemuxdemux

* wire eriw

* icon noci

* tihsxifixshit

* rewopower

* fixif

* screeneercs

* returnruter
2018-03-26 17:02:44 +01:00
AsV9
d338cac150 Merge remote-tracking branch 'tgstation/master'
Not sure if this worked. Used a wonky special snowflake strat to merge.
2018-03-24 08:57:13 +01:00
Ashe Higgs
73b05034f9 Fixes slow circuit cloning breaking with some circuits, and makes it use world time checks instead of decrementing countdowns (#36255)
* Fixes slowcloning breaking with nonints

* Refactors to use timestamps and not seconds
2018-03-10 14:37:03 -06:00
ACCount
1f5b59190d NTNet airlocks (#35947)
* Standardizes access checks

* Makes SS Networks init before SS Atoms to prevent NTNet interfaces from initializing before them

* Adds passkey support to NTNet packets

* Adds NTNet support to airlocks, makes door remote use NTNet

* Access levels given by jobs are now shuffled

* Access code improvements

* Adds IC card readers

* Fixes a delay issue with opening/closing airlocks with NTNet or signalers

* code review memes

* Renames plaintext_passkey to encrypted_passkey

* death by thousand nitpicks
2018-03-08 18:39:17 -05:00
arsserpentarium
09051ddae5 [READY]Circuit balance (#35931)
* cooldowns, power cell,disks

* NUMBERS NUMBERS NUMBERS

* 1 8 9

* PR PR PR

* DESC DESCDSCDCC

* <br>

* GET ALL CONTENTS

* Update power.dm

* Update power.dm

* Update time.dm
2018-03-03 01:08:05 +02:00
ACCount
9a6d386164 Fixes NTNet scanner component (#36036) 2018-03-02 15:31:51 +01:00
ACCount
076ed1a221 Fixes a runtime in "reference decoder" circuit (#35754)
* Adds "safe" option to hextostr and hex2num

* Fixes a runtime in ICs
2018-02-26 09:50:38 +13:00
Ashe Higgs
fdabc2bedd Circuit cloning balance: Timed cloning, reduced upgrade disk material cost (#35657)
* Printing compromise

* Adds fast cloning to the upgraded printer

* sorry this took so long
2018-02-26 09:46:33 +13:00
ShizCalev
d0f10d151e [s] Cameranet fixes (#35733) 2018-02-21 10:30:27 -03:00
Trevor Serpas
8b86e3b495 Adds circutry to diagnostic hud, adds action flags to circuits (#35718)
cl
add: Circuits integrity, charge, and overall circuit composition is displayed on diagnostic huds. If the assembly has dangerous circuits then the status icon will display exclamation points, if the assembly can communicate with something far away a wifi icon will appear next to the status icon, and if the circuit can not operate the status icon will display an 'X'.
add: AR interface circuit which can modify the status icon if it is not displaying the exclamation points or the 'X'.
tweak: Locomotive circuits can no longer be added to assemblies that can't use them.
spellcheck: Fixed a typo in the grenade primer description.
code: Added flags to circuits that help group subsets of circuits and regulate them.
/cl

The diagnostic hud addition is meant to allow more counter play to circuits by seeing the assemblies's healths and how dangerous they are. The flags are a useful addition to the code because players shouldn't be able to put circuits in assemblies if the assembly can't use that circuit (this can also be used later for other assemblies which could use unique circuits).

The following circuits are flagged as dangerous:
weapon firing mechanism
grenade primer
thrower

The following circuits are flagged as long range:
NTNet networking circuit
integrated signaler
video camera circuit

possible AR interface displays:
default
alert
move
2018-02-20 14:33:11 +13:00
Ashe Higgs
89bee1115b Adds a debug circuitry printer, along with some assorted circuit fixes and tweaks (#35578)
* Some more circuitry foolin'

* Fixes blood draw not working
2018-02-20 09:45:58 +13:00
oranges
78f0ac6d6a Merge pull request #35507 from arsserpentarium/ntnetfix
[READY]NTnet circuit fix
2018-02-20 09:36:24 +13:00
vuonojenmustaturska
ef7ab18130 Merge pull request #35720 from LetterN/patch-1
Pulling claw grammar fix
2018-02-17 18:03:37 +02:00
Jordan Brown
95cbf9b7f2 Merge pull request #35696 from Xhuis/circuit_rpg_loot
Fixes wizard RPG loot from making circuit analyzers useless
2018-02-16 08:52:14 -05:00
Letter N
23058f65ac Update manipulation.dm 2018-02-16 20:06:41 +08:00