Commit Graph

5950 Commits

Author SHA1 Message Date
deathride58
e33dc09b83 Merge pull request #6495 from Citadel-Station-13/upstream-merge-37308
[MIRROR] Desc fix
2018-04-27 09:27:58 +00: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
deathride58
00ef1a9f84 Merge pull request #6488 from Citadel-Station-13/upstream-merge-37362
[MIRROR] Replaces plant/peel Crossed procs with the slippery component, where needed
2018-04-27 09:18:15 +00:00
LetterJay
d679d27766 Merge pull request #6505 from Citadel-Station-13/upstream-merge-37378
[MIRROR] Fixes brain tumor. Again.
2018-04-27 00:12:14 -05:00
LetterJay
72ddaee4a3 Merge pull request #6502 from Citadel-Station-13/upstream-merge-37363
[MIRROR] Makes radiation collectors buildable
2018-04-27 00:10:52 -05:00
LetterJay
a4bc2c0b95 Merge pull request #6500 from Citadel-Station-13/upstream-merge-37398
[MIRROR] Fixes cargo scanner being invis.
2018-04-27 00:09:17 -05: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
AnturK
1ba045e5f5 Fixes brain tumor. Again. (#37378) 2018-04-24 09:58:36 -05:00
Dax Dupont
d5c2d37e39 Makes radiation collectors buildable (#37363)
* Makes radiation collectors buildable

* capitalism at it's finest

* a
2018-04-24 07:13:16 -05:00
Dax Dupont
a88caf87aa Fixes cargo scanner being invis. 2018-04-23 18:28:41 -05:00
Jalleo
ac8b645461 Desc fix (#37308)
* Removes a unused helper

* Fixes a description so people stop getting confused with certain mining upgrades.

* Updates to say research console.

* missed a dot.

* My bad.
2018-04-23 09:20:15 -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
vuonojenmustaturska
c7e3b72888 It started in a tavern on the edge of Macke town (#37362) 2018-04-23 07:35:09 -05:00
Poojawa
0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
Poojawa
832f071b59 mob stuff 2018-04-23 02:26:53 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
LetterJay
86e3cac966 Merge pull request #6480 from Citadel-Station-13/upstream-merge-37324
[MIRROR] Makes engine goggle numbers more visible
2018-04-22 22:22:38 -05:00
LetterJay
fb267270ec Merge pull request #6478 from Citadel-Station-13/upstream-merge-37315
[MIRROR] Gives beer and soda dispensers their own circuitboards and Design ID's
2018-04-22 22:22:03 -05:00
LetterJay
de2ab536d1 Merge pull request #6477 from Citadel-Station-13/upstream-merge-37320
[MIRROR] Fixes pAI's breaking drone static.
2018-04-22 22:21:45 -05:00
LetterJay
f3fb253713 Merge pull request #6476 from Citadel-Station-13/upstream-merge-37321
[MIRROR] Fixes CTF cheating
2018-04-22 22:21:21 -05:00
LetterJay
8170e2b6c1 Merge pull request #6475 from Citadel-Station-13/upstream-merge-37314
[MIRROR] Mapping component helper
2018-04-22 22:20:58 -05:00
LetterJay
7f90eaf89c Merge pull request #6471 from Citadel-Station-13/upstream-merge-36270
[MIRROR] [READY] A few additions, tweaks, and fixes for integrated circuits
2018-04-22 22:19:28 -05:00
LetterJay
73e798b281 Merge pull request #6470 from Citadel-Station-13/upstream-merge-37304
[MIRROR] Fixes buildmode trying to build in nullspace.
2018-04-22 22:19:06 -05:00
LetterJay
7cc2aeea8f Merge pull request #6469 from Citadel-Station-13/upstream-merge-37301
[MIRROR] Flatten the map transition edges
2018-04-22 22:18:47 -05:00
KorPhaeron
b36d88900f Makes engine goggle numbers more visible (#37324) 2018-04-22 19:21:13 -05:00
iksyp
e8698ab798 Gives beer and soda dispensers their own circuitboards and Design ID's (#37315)
* new boards

* new boards installed

* new designs (wow) (woah)

* added the new design ids to the biotech node

* tested

it works, also, that typo fucking stopped it from compiling
2018-04-22 19:19:51 -05:00
AnturK
e36c44be5c Fixes pAI's breaking drone static. (#37320) 2018-04-22 19:19:43 -05:00
KorPhaeron
0c6aea73d3 Can't push CTF flag carriers (#37321) 2018-04-22 19:19:32 -05:00
AnturK
8a3caaae6b Mapping component helper (#37314)
* Mapping component helper

* GetAllContents so you can manipulate things in crates/onmobs/whatever

* More verbose warning.
2018-04-22 19:18:17 -05:00
LetterJay
e022564fca Merge pull request #6467 from Citadel-Station-13/upstream-merge-37300
[MIRROR] fixes skateboards giving infinite metal
2018-04-22 02:47:07 -05:00
LetterJay
52a8708cb7 Merge pull request #6458 from Citadel-Station-13/upstream-merge-37237
[MIRROR] Fix cycle-linked airlocks on shuttles
2018-04-22 02:46:01 -05:00
LetterJay
eac582c79a Merge pull request #6457 from Citadel-Station-13/upstream-merge-36701
[MIRROR] Fixes Kudzu growing in space
2018-04-22 02:45:47 -05:00
LetterJay
5688049a7c Merge pull request #6454 from Citadel-Station-13/upstream-merge-37246
[MIRROR] Removes href log from admin investigate
2018-04-22 02:45:14 -05:00
LetterJay
8cdbc9ef5e Merge pull request #6452 from Citadel-Station-13/upstream-merge-37268
[MIRROR] Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
2018-04-22 02:44:56 -05:00
LetterJay
76001518d8 Merge pull request #6438 from Citadel-Station-13/upstream-merge-37209
[MIRROR] Makes admin loaded shuttles work again
2018-04-22 02:42:28 -05:00
LetterJay
e30d3540b1 Merge pull request #6437 from Citadel-Station-13/upstream-merge-37214
[MIRROR] Fixes adjusting brain damage.
2018-04-22 02:42:13 -05:00
LetterJay
c6d5050fe7 Merge pull request #6435 from Citadel-Station-13/upstream-merge-37196
[MIRROR] Gives mining bots back their mesons
2018-04-22 02:41:25 -05:00
LetterJay
82fd7e8067 Merge pull request #6431 from Citadel-Station-13/upstream-merge-37212
[MIRROR] Parenthesizes some macros
2018-04-22 02:39:43 -05:00
LetterJay
ca7bc589d9 Merge pull request #6429 from Citadel-Station-13/upstream-merge-37207
[MIRROR] Fix grammar in lightbulb shatter message
2018-04-22 02:39:18 -05:00
LetterJay
7bf009b52c Merge pull request #6427 from Citadel-Station-13/upstream-merge-37201
[MIRROR] Adds missing arguments to eye insert procs
2018-04-22 02:38:39 -05:00
LetterJay
bc0afc3c09 Merge pull request #6426 from Citadel-Station-13/upstream-merge-37206
[MIRROR] Correct some pixel_z issues
2018-04-22 02:37:42 -05:00
LetterJay
d2ce7da6cb Merge pull request #6453 from Citadel-Station-13/upstream-merge-37251
[MIRROR] Adds new window spawners
2018-04-22 02:35:09 -05:00
LetterJay
96a461e384 Merge pull request #6451 from Citadel-Station-13/upstream-merge-37218
[MIRROR] Couple of fixes for situations involving mechas and the clock cult gamemode
2018-04-22 02:34:53 -05:00
LetterJay
3635cd9c71 Merge pull request #6445 from Citadel-Station-13/upstream-merge-37239
[MIRROR] fixes fuckup in expressconsole preventing packs being ordered when credits are low
2018-04-22 02:32:38 -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
AnturK
dbf50b0783 Fixes buildmode trying to build in nullspace. 2018-04-22 02:31:01 -05:00
Emmett Gaines
23cfbcf6e9 Flatten the map transition edges (#37301) 2018-04-22 02:30:48 -05:00
imsxz
2361ba7625 fixes the laws of matter conservation (#37300) 2018-04-20 15:32:32 -05:00
oranges
20823c0c1b Merge pull request #37237 from AutomaticFrenzy/patch/shuttle-airlocks
Fix cycle-linked airlocks on shuttles
2018-04-19 03:15:01 -05:00