Commit Graph

10269 Commits

Author SHA1 Message Date
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 dc9b7d78f6 Merge pull request #6455 from Citadel-Station-13/upstream-merge-37282
[MIRROR] Fixes capacitor not being consumed when building a gygax
2018-04-22 02:45:32 -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 68a1d541b1 Merge pull request #6441 from Citadel-Station-13/upstream-merge-37223
[MIRROR] Fixes some defines and value
2018-04-22 02:43:26 -05:00
LetterJay 26cb8d0fe3 Merge pull request #6439 from Citadel-Station-13/upstream-merge-37236
[MIRROR] .. > ... moodie grammar fix
2018-04-22 02:43:09 -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 d0db0f0c85 Merge pull request #6436 from Citadel-Station-13/upstream-merge-37141
[MIRROR] Repeat of "I don't recall an arcade machine being th... GLORF (Chameleon Projector Change)"
2018-04-22 02:41:57 -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 80f4522967 Merge pull request #6450 from Citadel-Station-13/upstream-merge-37252
[MIRROR] Fixes lavaland syndie base rads + SSU compartment issues
2018-04-22 02:34:03 -05:00
LetterJay 15829a658c Merge pull request #6448 from Citadel-Station-13/upstream-merge-37266
[MIRROR] Fixes trophies.
2018-04-22 02:33:40 -05:00
LetterJay 3d4acf38a1 Merge pull request #6446 from Citadel-Station-13/upstream-merge-37216
[MIRROR] Esword cig lighting messages fix
2018-04-22 02:32: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
LetterJay d4538ce920 Merge pull request #6443 from Citadel-Station-13/upstream-merge-37229
[MIRROR] Add team objective support to the centcom antag datum
2018-04-22 02:30:55 -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
Jordan Brown 0586f69637 Merge pull request #37312 from DaxDupont/tendril
[s] You can no longer buckle anchored mobs to things.
2018-04-20 10:47:28 -05:00
AnturK b0e97784da Removes random spawn (#37280) 2018-04-19 05:46:39 -05:00
Emmett Gaines a465733b1c Removes old decal system (#37281) 2018-04-19 05:45:25 -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
kachnov 03c9996bc4 Fixes Kudzu growing in space (#36701)
* initial commit

* adds a macro

* a small change

* Update spacevine.dm
2018-04-19 03:13:47 -05:00
AlexTheSysop42 19f315db9c Fixes capacitor not being consumed when building a gygax (#37282)
* Comments out code to try to fix a bug

* protip: next time don't commit to master

* Fixes gygax construction not using the capacitor
2018-04-18 15:46:25 -05:00
Jordie 8ee5092210 removes href log from admin investigate 2018-04-18 15:46:16 -05:00
ShizCalev 79863a5ffb Adds new window spawners 2018-04-18 13:51:53 -05:00
Jordan Brown 44df2b780e Merge pull request #37268 from ShizCalev/scp-ruin-fix
Fixes SCP ruin turret faction, fixes hostile mobs attacking turrets in the same faction
2018-04-18 11:34:06 -05:00
vuonojenmustaturska 32fe9d4fd6 Couple of fixes for situations involving mechas and the clock cult gamemode (#37218)
* couple of mech fixes

* safety

* gateway, gravity gen

* Restores oingo-boingo punch-nuke
2018-04-18 09:33:31 -05:00
81Denton 7caad40e3f Fixes lavaland syndie base rads + SSU compartment issues (#37252)
* radsuit SSU, syndie lava base rad protection

* re-adds missing combat gloves

* defines radsuit SSU name by the obj
2018-04-18 07:02:10 -05:00
AnturK 68c6848a70 Fixes trophies. (#37266) 2018-04-17 05:25:41 -05:00
PKPenguin321 ddb6f7ebae Esword cig lighting messages fix (#37216)
* fix esword cig lighting message

`Jeb Ray swings their the energy sword. They light the cigarette in the process.` becomes `Jeb Ray swings their energy sword. They light their cigarette in the process.`

* fix desword cig lighting message

`Jeb Ray swings his the double-bladed energy sword (Wielded). he lights the cigarette in the process.` becomes `Jeb Ray swings their double-bladed energy sword (Wielded). They light their cigarette in the process.`

* check fix

* desword check fix

* suggested message replacement

* suggested message change desword
2018-04-16 19:20:26 -05:00
MrDoomBringer 846aa734e8 fixes fuckup in expressconsole preventing packs being ordered when credits are low (#37239)
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* fixes my errors
2018-04-16 19:14:08 -05:00
kevinz000 6cd18fd5c5 My adventures in getFlatIcon performance (#36890) 2018-04-16 17:59:41 -05:00
Jordan Brown 889f8ddb06 Merge pull request #37229 from vuonojenmustaturska/centcommission
Add team objective support to the centcom antag datum
2018-04-16 16:17:42 -05:00
AnturK 31efa96a01 Fixes some defines. (#37223) 2018-04-16 08:32:48 -05:00
Armhulen 5cbff26d24 Grammar (#37236) 2018-04-16 07:45:28 -05:00
vuonojenmustaturska 65c8fea74e Merge pull request #37209 from ninjanomnom/admin-shuttles
Makes admin loaded shuttles work again
2018-04-16 07:40:09 -05:00
vuonojenmustaturska d2b4b6d2f0 Merge pull request #37214 from AnturK/imighthavebraindamage
Fixes adjusting brain damage.
2018-04-16 07:39:54 -05:00
Grandmother of 50 0fca7cf7f0 Repeat of "I don't recall an arcade machine being th... GLORF (Chameleon Projector Change)" (#37141)
* Update chameleonproj.dm

* Pseudo Lings need not apply

* Update chameleonproj.dm

* Update chameleonproj.dm
2018-04-16 04:39:57 -05:00
vuonojenmustaturska ed201bc65d Gives mining bots back their mesons (#37196)
* Gives mining bots back their mesons

* qdel
2018-04-16 04:36:40 -05:00
pigeons 4d0597ad5b Parenthesizes some macros (#37212)
* parenthesizes some macros

* A couple more macro definition parenthesizing
2018-04-16 03:47:46 -05:00
Tad Hardesty 09cf7216b2 Fix grammar in lightbulb shatter message (#37207) 2018-04-15 22:43:54 -05:00
Jordan Brown edf4488c6b Merge pull request #37201 from kevinz000/patch-483
Adds missing arguments to eye insert procs
2018-04-15 22:25:14 -05:00