Commit Graph

57 Commits

Author SHA1 Message Date
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
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
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
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
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
1fbff5f83b23d39d38b1dfcb4cac8d9b
8b6aeb242e Fix recycling the same assembly multiple times (#38275) 2018-06-05 06:48:05 +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
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
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
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
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
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
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
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
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
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
Jordan Brown
d282c60c7d Quote the armor lists (#35668) 2018-02-16 01:25:42 -05:00
Ashe Higgs
ebafefc610 Adds sounds and some small QoL improvements to the circuit imprinter, and allows them to recycle empty assemblies (#35131)
🆑 Xhuis
tweak: Removing and printing integrated circuits will now attempt to place them into a free hand.
tweak: You can now hit an integrated circuit printer with an unsecured electronic assembly to recycle all of the parts in the assembly en masse.
tweak: You can now recycle empty electronic assemblies in an integrated circuit printer!
soundadd: Integrated circuit printers now have sounds for printing circuits and assemblies.
/🆑

Some low-hanging fruit for circuits. I was trying them earlier, and these were the main things that I was surprised didn't exist, so I added them. I'm not sure about the assembly manipulation yet (may have been intentional?) but it feels a lot smoother to use, especially since misprints can be emptied out and then recycled instead of awkwardly removing each component and then disposing of the case.
2018-02-16 09:45:40 +13:00
Xhuis
2b522e154f Prevents RPG loot circuit debauchery 2018-02-15 09:59:39 -05:00
Dax Dupont
ce0b5f6357 Assblasts some power creep in circuit labs (#35506)
* Circuit printers no longer start upgraded.

* Replaces roundstart upgraded printer with regular printer

* Replaces roundstart upgraded printer with regular printer w\ key remap
2018-02-13 22:09:00 -05:00
ACCount
c6e607dc17 Refactors use_sound and changes the way tools play sounds (#35521)
* Adds list support to usesound, ports drills to usesound

* Adds more tool sounds, changes usesound usage to play_tool_sound

* fix
2018-02-12 17:16:47 +02:00
ShizCalev
bfde5ac057 [s] Fixes altclick exploits (#35456)
* Fixes altclick exploits

* Removed free spam, fixes monkey altclicks

* replaced named args with proper defines

* More cleanup and fixes

* Better yet

* Another exploit fix

* pet carrier fix
2018-02-11 16:06:12 +13:00
Trevor Serpas
db5173f896 Integrated Circutry Readability Improvements (#35449)
* Integrated Circutry Readability Improvements

* support for old save files and fix a var I missed
2018-02-10 11:04:34 -05:00
Evsey Antonovich
31c973f38c Circuit drone + grabber/thrower balance changes (#34834)
* makes grabbers bulky and inventory max bulky

* makes circuit drones bulky

* removes drone stacking

* made grabbers max w class based on drone assembly, changed their w class back to small

* review stuff

* makes throwers max_w_class depend on assembly size

* uh

* kills sheer heart attack

* fuck off

* FUCK

* GR
2018-02-08 22:10:48 +13:00
Iamgoofball
779e65b254 Cleans up wirer code. (#35116)
* Cleans up wirer code.

🆑 Iamgoofball
fix: Minor code cleanup on the wirer
/🆑
2018-01-30 20:16:39 +02:00
ChuckTheJittai
02033f1756 All color inputs use current color as default choice
Went through all the color inputs and made the "default" argument the current color of what is being selected.
2018-01-21 13:07:35 -05:00
arsserpentarium
c86fc91b55 [READY]Pulling claw 2 (#33817)
Pulling claw is integrated circuit,which allows drones to pull things.
2018-01-12 09:02:56 +13:00
kevinz000
05be346f8a Component Forensics, Blood Decals, and Cleaning 2017-12-24 18:19:43 -08:00
arsserpentarium
95b9e19cd9 [READY]Circuitry upgrades (#33579)
* heater,xenobio scan,smoker fix,kill vines,pathfinder

* 1.drag component
2.damage for bot and machines(?)
3.EPv2 scaner(takes ref to thing.returns adress of epv2 adress if there is one)
4.fix work of arithmetic pins

* Update input.dm

* fix, scaner

* grinder,juicer,smokefix, runtime fix

* lag

* Update game_options.txt

* Update reagents.dm

* Update assemblies.dm

* Update grown.dm

* Update grown.dm

* 111

* Delete electronic_components.dmi

* 222

* merge

* Update reagents.dm

* Update assemblies.dm

* concat unfuck

* concat unfuck 2

* reagents

* fixes

* fix2

* hooks

* math

* 111

* sense

* leave it for now.

* fix

* fix(2)

* requested

* okay

* uhhh

* sorry

* kevinz's smoker nerf is enought

* hooks2

* fix for reagents push ref.
2017-12-23 22:55:37 -05:00
Emmett Gaines
25080ff2c4 defines math (#33498) 2017-12-17 11:02:11 -05:00
JStheguy
ff87753167 Adds Additional Electronic_Assembly Designs (#33466)
* bloats electronic_setups.dmi

* new assembly naming scheme, redone legacy sprites
2017-12-13 22:09:55 -05:00
ACCount
15d4205dc0 Fixes integrated circuit reagent components not working while in mobs, adds new helper procs (#33434)
* New IC helpers

* Fixes some reagent IC components
2017-12-10 20:37:30 -05:00
ACCount
302ca397a8 IC fixes (#33215) 2017-12-04 11:53:02 +01:00