Commit Graph
124 Commits
Author SHA1 Message Date
ShizCalevandCitadelStationBot 6415ecdbe9 Shows assemblies some love. ♥ 2018-05-06 16:37:40 -05:00
LetterJayandGitHub 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 McCloudandCitadelStationBot 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 SerpasandCitadelStationBot 66f79a61c4 constant chip fix (#37636)
removes extra pins from constant chip
2018-05-03 19:13:20 -05:00
deathride58andGitHub 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
deathride58andGitHub e26f1cd78b Merge pull request #6553 from Citadel-Station-13/upstream-merge-37165
[MIRROR] NTNet improvements!
2018-05-02 01:17:10 +00:00
Jordan BrownandCitadelStationBot 9c9b2feefc Merge pull request #37510 from JJRcop/throw_myself
Circuits can't throw themselves
2018-04-30 13:04:19 -05:00
LetterJayandGitHub 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
kevinz000andCitadelStationBot 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 AntonovichandCitadelStationBot 6df3ffcddf IC weapons only works on turfs (#37496) 2018-04-30 01:31:06 -05:00
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
kevinz000andCitadelStationBot 6ed120aad4 NTNet improvements! 2018-04-27 20:24:28 -05:00
NichandCitadelStationBot 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
deathride58andGitHub 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
LetterJayandGitHub d496d78169 Merge pull request #6486 from Poojawa/4-22-sync
Hard TG Sync 4/22
2018-04-27 00:08:38 -05:00
NichandCitadelStationBot 2a40af1bf2 Fixes a thing (#37427) 2018-04-25 13:29:13 -05:00
Jordan BrownandCitadelStationBot 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
SailorDaveandCitadelStationBot 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 GinnaneandCitadelStationBot 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
LetterJayandGitHub 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
NichandCitadelStationBot 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
robbymandCitadelStationBot 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
deathride58andGitHub 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 SerpasandCitadelStationBot 00f5570ccf Integrated Circuits Parameter Fixes 2018-04-11 07:22:11 -05:00
arsserpentariumandCitadelStationBot 0f23e55927 Fix logic circuits runtime (#37044)
* 1011101 fix fix fix xif xif xif 1011101

* Update logic.dm
2018-04-11 05:23:28 -05:00
orangesandkevinz000 4b34949340 Merge pull request #37071 from kevinz000/patch-480
Fixes constants chips getting scrambled by EMPs
2018-04-10 16:22:49 -07:00
Poojawaanddeathride58 5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
robbymandCitadelStationBot a4e5a1d02c Fixes null reference not pulsing the 'not scanned' output (#36973) 2018-04-06 03:44:32 -05:00
robbymandCitadelStationBot 1e34269e0c 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 22:03:12 -05:00
vuonojenmustaturskaandCitadelStationBot cf3826f3bf Merge pull request #36864 from robbym/master
Cleaned up tile pointer circuit and converted to absolute coordinates
2018-04-01 08:19:52 -05:00
Jordan BrownandCitadelStationBot 447008e625 Merge pull request #36795 from robbym/master
Fixes custom ticker logic (#36792)
2018-03-31 06:17:00 -05:00
vuonojenmustaturskaandCitadelStationBot 7020c19dff Merge pull request #36736 from fludd12/light-up-the-night
Assemblies with lighting circuits now properly update light position.
2018-03-28 12:16:56 -05:00
arsserpentariumandCitadelStationBot 303272319a [READY]pathfinding circuitry upgrade (#36398)
* all in one

* fixfixfix

* uhhhh

* demuxdemuxdemuxdemux

* wire eriw

* icon noci

* tihsxifixshit

* rewopower

* fixif

* screeneercs

* returnruter
2018-03-26 11:01:22 -05:00
CitadelStationBotandPoojawa 889ff6fa08 [MIRROR] circuit diagnostic status icon changes (#6019)
* circuit diagnostic status icon changes

* circuit diagnostic status icon changes (#36218)

* circuit diagnostic hud revisit

warning icon replaced with red versions of prefered icons, new icons added to the AR interface

* did this fix it?

* ok how about now

put all the new icons at the end of the file instead of at different places inside
2018-03-19 21:16:26 -05:00
CitadelStationBotandPoojawa 009f95db42 [MIRROR] Electronic assembly changes and additions (#6014)
* Electronic assembly changes and additions

* Electronic assembly changes and additions (#36394)

* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there
2018-03-19 21:11:23 -05:00
CitadelStationBotandPoojawa 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 HiggsandCitadelStationBot 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
ACCountandCitadelStationBot f0cf4ad29d [READY] NTNet airlocks 2018-03-08 22:42:46 -06:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 17b48041a7 [MIRROR] Fixes NTNet scanner component (#5743)
* Fixes NTNet scanner component (#36036)

* Fixes NTNet scanner component
2018-03-02 18:32:47 -06:00
deathride58andGitHub 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
ACCountandCitadelStationBot 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 HiggsandCitadelStationBot 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
ShizCalevandCitadelStationBot d2ba2bf0c1 [s] Cameranet fixes (#35733) 2018-02-21 07:31:27 -06:00
deathride58andGitHub 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
deathride58andGitHub 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
orangesandCitadelStationBot 950d18c8db Merge pull request #35507 from arsserpentarium/ntnetfix
[READY]NTnet circuit fix
2018-02-19 22:09:35 -06:00
Ashe HiggsandCitadelStationBot 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 SerpasandCitadelStationBot 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