Commit Graph

149 Commits

Author SHA1 Message Date
kevinz000
6291185422 Merge pull request #8259 from deathride58/fuckpaicircuits
Minor circuit balance tweaks - limits locomotion circuits to jogging speed and doubles the complexity of mmi/pai connector circuits
2019-04-20 16:29:35 -07:00
deathride58
8f021d4143 Minor circuit balance tweaks - limits locomotion circuits to jogging speed and doubles the complexity of mmi/pai connector circuits 2019-04-18 21:44:43 -04:00
BurgerLua
7ff2b6817b No more seperate whatever 2019-04-16 21:06:57 -07:00
kevinz000
44e07e35b0 Merge pull request #8194 from Zandario/zandario-circuit-port
Hippie Circuit Port
2019-04-04 00:01:48 -07:00
Zandario
264733b5d4 Removed Chem Drain Circuit - We don't have Chempiles 2019-04-02 13:58:27 -05:00
deathride58
c8d51c4231 Attempts to improve the performance of /mob/Stat() by using defines instead of procs for grabbing the current time 2019-04-02 01:11:29 -04:00
Zandario
6e900d2a9d Hippie Circuit Port 2019-04-01 13:19:35 -05:00
Poojawa
12a9989a7c runtime fixes 2018-09-22 04:06:06 -05:00
Poojawa
d231018a3a Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
Thunder12345
8c58a28a60 Adds a colour picker component for circuits (#38804)
* added color picker IC component

* added sprite for color picker
2018-07-01 05:40:43 -05:00
JStheguy
02744c59a5 [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 09:23:33 -05:00
CitadelStationBot
db25067491 adds missing /'s at the starts of some obj instances (#7169) 2018-06-18 11:53:33 -07:00
Jordan Brown
3bee10c653 Merge pull request #38456 from theo2003/circuit_scan
Players who edited a circuit assembly can scan it as a ghost.
2018-06-16 06:18:46 -05:00
oranges
1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup
Cleans up some logging
2018-06-11 22:29:27 -05:00
1fbff5f83b23d39d38b1dfcb4cac8d9b
d3c7dd3802 Fix recycling the same assembly multiple times (#38275) 2018-06-05 04:13:44 -05:00
theo2003
805852e1df Fixed hydroponics tray weed light not turning off when weeds are removed by an integrated circuits device. (#38246) 2018-06-03 12:59:27 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
Jordan Brown
b7fd3a37e2 Merge pull request #37972 from 1fbff5f83b23d39d38b1dfcb4cac8d9b/patch-1
Fixes an oops in circuit printer description check
2018-05-21 16:43:42 -05:00
r-esistor
63e472050c 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 02:11:50 -05:00
Alexch2
f172fed3e2 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 17:12:34 -05:00
Trevor Serpas
61e1529e18 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 10:27:25 -05:00
PKPenguin321
b873222eba 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 00:44:59 -05:00
ShizCalev
6415ecdbe9 Shows assemblies some love. ♥ 2018-05-06 16:37:40 -05:00
LetterJay
24776123f0 Merge pull request #6637 from Citadel-Station-13/upstream-merge-37636
[MIRROR] constant chip fix
2018-05-04 22:59:57 -05:00
Fox McCloud
f5031bc4f7 Fixes Several Machines Materials Insertion (#37432)
* Fixes Several Machines Materials Insertion

* attackby disable and show on examine fix
2018-05-04 04:40:56 -05:00
Trevor Serpas
66f79a61c4 constant chip fix (#37636)
removes extra pins from constant chip
2018-05-03 19:13:20 -05:00
deathride58
9c1a4303f9 Merge pull request #6597 from Citadel-Station-13/upstream-merge-37510
[MIRROR] Circuits can't throw themselves
2018-05-02 01:25:23 +00:00
deathride58
e26f1cd78b Merge pull request #6553 from Citadel-Station-13/upstream-merge-37165
[MIRROR] NTNet improvements!
2018-05-02 01:17:10 +00:00
Jordan Brown
9c9b2feefc Merge pull request #37510 from JJRcop/throw_myself
Circuits can't throw themselves
2018-04-30 13:04:19 -05:00
LetterJay
372e363257 Merge pull request #6588 from Citadel-Station-13/upstream-merge-37437
[MIRROR] Fixes circuits being able to detect ghosts and fix pinless guns
2018-04-30 11:02:58 -05:00
kevinz000
7feea76eee Fixes circuits being able to detect ghosts and fix pinless guns (#37437)
* Circuit exploit fixes

* Update input.dm
2018-04-30 04:55:55 -05:00
Evsey Antonovich
6df3ffcddf IC weapons only works on turfs (#37496) 2018-04-30 01:31:06 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
kevinz000
6ed120aad4 NTNet improvements! 2018-04-27 20:24:28 -05:00
Nich
c9702d2a5c 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 05:17:42 -05:00
deathride58
35e8ac1240 Merge pull request #6492 from Citadel-Station-13/upstream-merge-37364
[MIRROR] Removes the ability for inducers and circuits to charge energy weapons.
2018-04-27 09:21:07 +00:00
LetterJay
d496d78169 Merge pull request #6486 from Poojawa/4-22-sync
Hard TG Sync 4/22
2018-04-27 00:08:38 -05:00
Nich
2a40af1bf2 Fixes a thing (#37427) 2018-04-25 13:29:13 -05:00
Jordan Brown
e52fafcbb7 Merge pull request #37364 from Jalleo/Inducer_change
Removes the ability for inducers and circuits to charge energy weapons.
2018-04-23 08:47:55 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
SailorDave
187fb97388 [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-22 02:31:10 -05:00
John Ginnane
e67467b919 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 04:31:16 -05:00
LetterJay
26636ece0d Merge pull request #6400 from Citadel-Station-13/upstream-merge-37161
[MIRROR] Makes the PI circuit use the PI define
2018-04-14 07:43:11 -05:00
Nich
47c783ec71 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 12:44:13 -05:00
robbym
b7023e1bbb 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 11:48:28 -05:00
deathride58
2502bb79bf Merge pull request #6353 from Citadel-Station-13/upstream-merge-37044
[MIRROR] Fix logic circuits runtime
2018-04-11 21:32:17 +00:00
Trevor Serpas
00f5570ccf Integrated Circuits Parameter Fixes 2018-04-11 07:22:11 -05:00