Commit Graph

10516 Commits

Author SHA1 Message Date
AlexTheSysop42 ce400e716c Fixes experimentor pickweight and goo runtime (#37822)
The experimentor is less likely to produce food when it transforms an item

The experimentor no longer breaks when the toxic waste malfunction occurs multiple times and isn't cleaned up

The experimentor irridiate function actually chooses what item to make properly rather than picking from the start of the list


The food weight change is because the probweight var wasn't effective because food was added to the list before anything that would increase the var, it's so low because there's a ton of food and it should be possible to get other things. I tested it in game and food is still the most common thing to get, I could bump up the prob for non-food things if needed.

The toxic waste runtime would make the experimentor unfixable except for reconstructing, and that resets the experiments.

The previous method of picking was broken and pretty poorly coded, I moved it to an associative list and the existing and non-broken pickweight function (not sure if this is also a code change).
2018-05-19 04:48:27 -05:00
LetterJay bfcaceb4e1 Merge pull request #6785 from Citadel-Station-13/upstream-merge-37838
[MIRROR] Query debug logging
2018-05-17 22:50:19 -05:00
Jordan Brown a61457cd47 Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox
Query debug logging
2018-05-17 21:38:41 -05:00
ShizCalev abc57b0e53 Capitalized Current Quirks (#37877) 2018-05-17 20:54:23 -05:00
deathride58 649314c455 Merge pull request #6682 from Citadel-Station-13/upstream-merge-37429
[MIRROR] Update DMAPI to version 3.2.1.0
2018-05-17 18:14:54 +00:00
deathride58 986ea603e9 Merge pull request #6686 from Citadel-Station-13/upstream-merge-37719
[MIRROR] [s] Fix wallets acting as though they still contain removed IDs
2018-05-17 18:13:28 +00:00
deathride58 146f953966 Merge pull request #6694 from Citadel-Station-13/upstream-merge-37423
[MIRROR] [s] Hallucinations 4.0
2018-05-17 18:12:57 +00:00
deathride58 290a4ef1de Merge pull request #6757 from Citadel-Station-13/upstream-merge-37850
[MIRROR] Fixes fireaxe butchering.
2018-05-17 18:12:33 +00:00
deathride58 97b72c0289 Merge pull request #6758 from Citadel-Station-13/upstream-merge-37853
[MIRROR] Fixes wrong circuits
2018-05-17 18:12:16 +00:00
deathride58 baec90fe11 Merge pull request #6759 from Citadel-Station-13/upstream-merge-37840
[MIRROR] Fixes meteors hitting qdeleted stuff.
2018-05-17 18:11:57 +00:00
deathride58 cee67a7706 Merge pull request #6760 from Citadel-Station-13/upstream-merge-37602
[MIRROR] [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping
2018-05-17 18:11:24 +00:00
deathride58 5398828bb9 Merge pull request #6762 from Citadel-Station-13/upstream-merge-37860
[MIRROR] [s] Fixes bioware surgery exploit
2018-05-17 18:10:29 +00:00
deathride58 583de894f3 Merge pull request #6763 from Citadel-Station-13/upstream-merge-37863
[MIRROR] Fixes changeling team objectives (a bit)
2018-05-17 18:10:01 +00:00
deathride58 93a9afcf88 Merge pull request #6764 from Citadel-Station-13/upstream-merge-37839
[MIRROR] Fixes minor cleanbot runtime.
2018-05-17 18:09:31 +00:00
deathride58 5242d1ad4b Merge pull request #6768 from Citadel-Station-13/upstream-merge-37866
[MIRROR] Client topics only check for deleted objects when an object was actually passed
2018-05-17 18:09:00 +00:00
deathride58 cbac22ccb7 Merge pull request #6769 from Citadel-Station-13/upstream-merge-37868
[MIRROR] Fixes parallax runtime
2018-05-17 18:08:40 +00:00
deathride58 b1d0d14834 Merge pull request #6771 from Citadel-Station-13/upstream-merge-37872
[MIRROR] Fixes Adminorazine killing ash lizards
2018-05-17 18:08:16 +00:00
deathride58 db6fdc0f48 Merge pull request #6773 from Citadel-Station-13/upstream-merge-37836
[MIRROR] Circuit gun inhands and grabber fix
2018-05-17 18:07:46 +00:00
deathride58 24d87f2884 Merge pull request #6774 from Citadel-Station-13/upstream-merge-37871
[MIRROR] Fixes sharp weapons deconverting revs
2018-05-17 18:06:45 +00:00
deathride58 df9184cce2 Merge pull request #6776 from Citadel-Station-13/upstream-merge-37887
[MIRROR] Fixes vent_clog bad chem id runtime
2018-05-17 18:06:05 +00:00
ShizCalev 0e819cb1fc Fixes container_resist runtimes (#37888) 2018-05-17 10:57:48 -05:00
ShizCalev 394fbf09e3 Fixes vent_clog bad chem id runtime (#37887)
* Fixes vent_clog bad chem id runtime

* sodiumchloride
2018-05-17 10:56:35 -05:00
ShizCalev e425a8514e Fixes sharp weapons deconverting revs (#37871)
* Fixes sharp weapons deconverting revs

* enhanced commentary
2018-05-17 10:28:38 -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
ShizCalev a7f13f15cf Fixes Adminorazine killing ash lizards (#37872)
* Fixes Adminorazine killing ash lizards

* this should do it...
2018-05-17 10:24:59 -05:00
CitrusGender a00fc47d1e Update parallax.dm (#37868)
removes the parallelx runtimes
2018-05-17 10:17:26 -05:00
Kyle Spier-Swenson 085066d555 Client topics only check for deleted objects when an object was actually passed (#37866) 2018-05-17 10:15:12 -05:00
vuonojenmustaturska 7429a7ef6a Merge pull request #37839 from AnturK/rr1
Fixes minor cleanbot runtime.
2018-05-16 14:37:03 -05:00
vuonojenmustaturska aa7a27420c Merge pull request #37863 from AnturK/rr4
Fixes changeling team objectives (a bit)
2018-05-16 14:35:49 -05:00
Dax Dupont 48c37df7cd [s] Fixes bioware surgery exploit (#37860)
* Fixes bioware surgery

* my ass must blast
2018-05-16 14:34:36 -05:00
81Denton 0333a50552 [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping 2018-05-16 12:18:36 -05:00
LetterJay 8efc7711a7 Merge branch 'master' into upstream-merge-37423 2018-05-16 12:17:57 -05:00
AnturK b111088140 Fixes meteors hitting qdeleted stuff. (#37840)
* Fixes meteors hitting qdeleted stuff.

* I made a typo in one line change, time to die.

* Better solution ?
2018-05-16 12:06:06 -05:00
Dax Dupont eb29d86c5f Fixes wrong circuits (#37853)
* Fixes wrong circuits

* this too
2018-05-16 12:04:54 -05:00
AnturK 593919a85a Fixes fireaxe butchering. (#37850) 2018-05-16 12:04:45 -05:00
deathride58 4d3ead744a Update wallets.dm 2018-05-16 12:15:29 -04:00
deathride58 ca36def4e6 Merge pull request #6754 from Citadel-Station-13/upstream-merge-37823
[MIRROR] Makes cult items less of a vomit coaster
2018-05-16 16:09:21 +00:00
LetterJay 3103119f6b Update soulstone.dm 2018-05-16 09:04:51 -05:00
LetterJay fe93e1ccbd Update cult_items.dm 2018-05-16 09:04:39 -05:00
vuonojenmustaturska 5e48fcd275 Merge pull request #37846 from DaxDupont/axe-time
Small cult nerf do not be alarmed robustin think about your heart
2018-05-16 04:46:59 -05:00
Dax Dupont 79b5e412f1 Makes cult items less of a vomit coaster 2018-05-15 12:18:00 -05:00
LetterJay 08fab3adaa Update client_procs.dm 2018-05-15 10:25:58 -05:00
LetterJay 24b6ee5a6c should make life simpler 2018-05-15 10:05:56 -05:00
LetterJay d421ad846a Merge pull request #6751 from Citadel-Station-13/upstream-merge-37715
[MIRROR] Cleans up touch spells
2018-05-15 06:53:54 -05:00
LetterJay ce98f9c444 Merge pull request #6746 from Citadel-Station-13/upstream-merge-37785
[MIRROR] Replaces loose tech storage boards with spawners
2018-05-15 06:53:25 -05:00
LetterJay 49b22d2673 Merge pull request #6745 from Citadel-Station-13/upstream-merge-37810
[MIRROR] Adds basic electronics to techwebs
2018-05-15 06:53:11 -05:00
LetterJay f86af0ab41 Merge pull request #6743 from Citadel-Station-13/upstream-merge-37818
[MIRROR] Fix some missing icons
2018-05-15 06:52:32 -05:00
LetterJay 7c3c270e2a Merge branch 'master' into upstream-merge-37749 2018-05-15 00:50:13 -05:00
LetterJay 0877bdd4e5 Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646
[MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
2018-05-15 00:47:59 -05:00
AnturK a379391dd3 Cleans up touch spells (#37715)
* Cleans up touch spells

* Silent param

* Oh god i'm blind.
2018-05-15 00:35:41 -05:00