Commit Graph

174 Commits

Author SHA1 Message Date
deathride58
ea9eaedf1a Ports BeeStation/BeeStation-Hornet#345 2019-08-21 22:16:44 -04:00
kevinz000
4d39d28f74 Update output.dm 2019-06-30 03:55:03 -07:00
kevinz000
2f2885f1d6 Merge pull request #8558 from Ghommie/Ghommie-cit35
Ports in the container_type to reagents flags refactor.
2019-06-08 01:26:28 -07:00
deathride58
aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Ghommie
4d5332346e Compiling was too slow. 2019-06-07 06:37:03 +02:00
Ghommie
7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
kevinz000
e63f9f385b Merge pull request #8359 from Useroth/pneumatic-and-stun-buff
[MERGE READY]Reduces the complexity of the two new circuits: pneumatic cannon and stunner.
2019-05-31 19:18:53 -07:00
kevinz000
843bfc3a3e Merge pull request #8427 from CalamaBanana/quick-fix-for-importing-custom-colored-circuits
Removes color-whitelist blocking custom-colored circuit blueprints from being imported
2019-05-27 03:30:07 -07:00
deathride58
4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00
CalamaBanana
fc5b617ca0 Input-check for the color 2019-05-25 21:18:17 +02:00
deathride58
9d240d3375 [s] fixes concatenator circuits being able to crash the server 2019-05-24 13:37:53 -04:00
CalamaBanana
d9cc539948 Removed color whitelist 2019-05-24 17:46:48 +02:00
Useroth
c0cdc4c3ef Update weaponized.dm 2019-05-23 22:49:21 +02:00
CalamaBanana
1e7b537166 Update code/modules/integrated_electronics/core/detailer.dm
Prettier list

Co-Authored-By: Useroth <37159550+Useroth@users.noreply.github.com>
2019-05-16 00:42:05 +02:00
Useroth
c18756dec4 Well, that's it. 2019-05-15 23:24:12 +02:00
CalamaBanana
9e00562e68 Added custom option
Added custom option to the color selection
2019-05-15 13:13:17 +02:00
CalamaBanana
7cd74e6601 Adds pink to the circuit coloring tool 2019-05-15 00:07:53 +02:00
kevinz000
a3114d830a Merge pull request #8336 from BurgerLUA/Integrated-Circuit-Fixes-and-Additions
Adds Stun Circuit, Pneumatic Cannon Circuit. Makes Extinguisher and Smoke Reagent circuits work.
2019-05-14 13:48:54 -07:00
BurgerLua
34cb661211 Requested changes 2019-05-12 13:44:23 -07:00
BurgerLua
6df27ef2a3 Updated integrated circuits 2019-05-09 15:25:48 -07:00
Useroth
b80bb21219 Dildo-shaped circuit assemblies. Because that's what the community needs. 2019-05-09 08:45:47 +02:00
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
deathride58
905f32b193 further optimizes performance by making all of the meta gas properties use their own individual lists instead of being in a messy nested list 2019-04-14 16:40:37 -04:00
deathride58
41375d9737 Increases performance significantly by turning garbage collection into a define 2019-04-14 11:33:28 -04:00
deathride58
2c9deab42e removes add_gas() and assert_gas(). next up: do further testing with garbage_collect() present and not present 2019-04-14 10:33:39 -04:00
deathride58
8b75240d89 fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive 2019-04-11 17:07:11 -04: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