Commit Graph

288 Commits

Author SHA1 Message Date
CitadelStationBot
fd63838558 [MIRROR] Circuits constants chips now keep their data on save/load (#6012)
* Circuits constants chips now keep their data on save/load

* Fixes constants chips (#36315)
2018-03-19 21:08:24 -05:00
Ashe Higgs
ceea41b5fe 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:36 -06:00
ACCount
f0cf4ad29d [READY] NTNet airlocks 2018-03-08 22:42:46 -06:00
CitadelStationBot
59d61d5e0d [MIRROR] [READY]Circuit balance (#5760)
* [READY]Circuit balance

* [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-02 20:05:28 -06:00
CitadelStationBot
17b48041a7 [MIRROR] Fixes NTNet scanner component (#5743)
* Fixes NTNet scanner component (#36036)

* Fixes NTNet scanner component
2018-03-02 18:32:47 -06:00
deathride58
e721dfdc7c Merge pull request #5706 from Citadel-Station-13/upstream-merge-35754
[MIRROR] Fixes a runtime in "reference decoder" circuit
2018-02-25 21:41:54 +00:00
ACCount
7c5e9f968f Fixes a runtime in "reference decoder" circuit (#35754)
* Adds "safe" option to hextostr and hex2num

* Fixes a runtime in ICs
2018-02-25 14:51:41 -06:00
Ashe Higgs
063fc1a7af 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-25 14:47:06 -06:00
ShizCalev
d2ba2bf0c1 [s] Cameranet fixes (#35733) 2018-02-21 07:31:27 -06:00
deathride58
3779e384ec Merge pull request #5611 from Citadel-Station-13/upstream-merge-35507
[MIRROR] [READY]NTnet circuit fix
2018-02-20 15:25:59 +00:00
deathride58
79db3ba93d Merge pull request #5607 from Citadel-Station-13/upstream-merge-35578
[MIRROR] Adds a debug circuitry printer, along with some assorted circuit fixes and tweaks
2018-02-20 15:24:26 +00:00
oranges
950d18c8db Merge pull request #35507 from arsserpentarium/ntnetfix
[READY]NTnet circuit fix
2018-02-19 22:09:35 -06:00
Ashe Higgs
1fe801e155 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-19 22:09:01 -06:00
Trevor Serpas
108f1c85ff 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-19 22:07:16 -06:00
deathride58
fb65a98117 Merge pull request #5516 from Citadel-Station-13/upstream-merge-35668
[MIRROR] Quote the armor lists
2018-02-17 19:29:50 +00:00
vuonojenmustaturska
e4b037d6af Merge pull request #35720 from LetterN/patch-1
Pulling claw grammar fix
2018-02-17 10:04:26 -06:00
deathride58
57e6eb7b1e Merge pull request #5527 from Citadel-Station-13/upstream-merge-35696
[MIRROR] Fixes wizard RPG loot from making circuit analyzers useless
2018-02-16 14:15:12 +00:00
Jordan Brown
d6b493f2ec Merge pull request #35696 from Xhuis/circuit_rpg_loot
Fixes wizard RPG loot from making circuit analyzers useless
2018-02-16 07:52:59 -06:00
ACCount
93364c3af6 Fixes a runtime in NTNet scanner (#35656) 2018-02-16 00:46:33 -06:00
Jordan Brown
f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
Ashe Higgs
dc100371f3 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-15 14:46:06 -06:00
deathride58
4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045
TG Sync #4985279348672983476
2018-02-14 04:11:44 +00:00
Dax Dupont
98c9e0948f 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 21:09:35 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
ShizCalev
eb484edc2e Fixes scaner circuit typo (#35508) 2018-02-11 12:43:06 -06:00
CitadelStationBot
51d15518ae Merge pull request #5409 from Citadel-Station-13/upstream-merge-35456
[MIRROR] [s] Fixes altclick exploits
2018-02-11 09:43:09 -06:00
Dax Dupont
7992256bcb Grabbers can now only contain things smaller than the assembly. (#35462)
* Grabbers can now only contain things smaller than the assembly

* Good suggestion buggy

* fucking github broke
2018-02-11 05:08:41 -06:00
ShizCalev
f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
Trevor Serpas
86e5775599 Integrated Circutry Readability Improvements (#35449)
* Integrated Circutry Readability Improvements

* support for old save files and fix a var I missed
2018-02-10 10:04:42 -06:00
Evsey Antonovich
c066120fc0 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 03:11:12 -06:00
Iamgoofball
8e6aaf70c3 Cleans up wirer code. (#35116)
* Cleans up wirer code.

🆑 Iamgoofball
fix: Minor code cleanup on the wirer
/🆑
2018-01-30 22:44:49 -06:00
deathride58
8ee42a5282 Merge pull request #5090 from Citadel-Station-13/upstream-merge-34755
[MIRROR] All color inputs use current color as default choice
2018-01-26 15:44:23 +00:00
Jordan Brown
51e4d9f9db All color inputs use current color as default choice 2018-01-24 18:14:16 -06:00
Leo
2a0da701b2 Merge pull request #34801 from ShizCalev/DMM-viewer-fix
Fixes compatability issues with some third-party-java-based™ DMM viewers
2018-01-24 14:09:51 -06:00
kevinz000
54e9c47e99 Removes pulling claw instant messageless stun (#34742) 2018-01-22 15:45:15 -06:00
Jordan Brown
1639495adb Merge pull request #34637 from yorii/patch-1
Fixes empty IC syringe having 0 transfer amount
2018-01-19 08:52:41 -06:00
arsserpentarium
1d91243ae2 [READY]Pulling claw 2 (#33817)
Pulling claw is integrated circuit,which allows drones to pull things.
2018-01-11 14:03:52 -06:00
deathride58
3e937fcecf Merges #4679 , #4670 , and #4677 2018-01-07 15:29:42 -05:00
deathride58
5dc3f29ad4 modules - E to L 2018-01-04 00:53:38 -05:00
Leo
832b1d95df Merge pull request #34038 from ShizCalev/text-pad
Fixes text pad window title
2018-01-03 07:35:17 -06:00
LetterJay
a3ebaa5de8 Merge branch 'master' into upstream-merge-32311 2017-12-29 18:38:50 -06:00
oranges
269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
deathride58
6dc2d8f0eb Update reagents.dm 2017-12-24 18:02:13 -05:00
arsserpentarium
a893559c6b [READY]Circuitry upgrades 2017-12-24 15:03:45 -06:00
LetterJay
8518a9b3e5 Merge pull request #4479 from Citadel-Station-13/upstream-merge-33703
[MIRROR] Integrated circuit smoke circuit now requires atleast 10 units of reagents to generate smoke
2017-12-21 04:58:06 -06:00
LetterJay
3973b368de Merge branch 'master' into upstream-merge-33470 2017-12-21 03:24:03 -06:00
Jordan Brown
e3a3082596 Merge pull request #33703 from kevinz000/patch-407
Integrated circuit smoke circuit now requires atleast 10 units of reagents to generate smoke
2017-12-21 00:46:48 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
ACCount
522b8383d8 [READY]Refactors reagent container types 2017-12-18 22:54:51 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00