Commit Graph

12533 Commits

Author SHA1 Message Date
LetterJay f0a8499efe Merge pull request #6787 from Citadel-Station-13/upstream-merge-37875
[MIRROR] Fixes radimmune mobs being killed by high bursts of radiation
2018-05-19 09:11:08 -05:00
LetterJay 88ad927838 Merge pull request #6772 from Citadel-Station-13/upstream-merge-37870
[MIRROR] Fixes decon message pronouns
2018-05-19 09:10:29 -05:00
ShizCalev 4e4e07e8bb Fixes mindswap book runtime (#37881) 2018-05-19 05:32:45 -05:00
ShizCalev 1a64bb27e9 Fixes changeling runtime after ghosting (#37892) 2018-05-19 05:32:36 -05:00
Mickyan 3e0eaa5e65 fixes g.blaster, neurotoxin, nuka cola dizzines (#37894) 2018-05-19 05:32:28 -05:00
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
81Denton 5ed28b5cd2 Adds "proper" solar/gold/silver crates (#37890)
* adds solar/gold/silver crates

* replaces pubbystation crates

* hhhh

* forgot adding spaces

* travis pls
2018-05-19 02:14:00 -05:00
Tad Hardesty 36d4fe8866 Fix runtimes in mood rejuventation (#37911) 2018-05-19 01:51:21 -05:00
Dax Dupont 6eb9d6daaa Fixes mulligan for mutants (#37895) 2018-05-18 19:52:19 -05:00
Nich ed556b2c0e Removes the ability for RD's to steal hand teles (#37908) 2018-05-18 19:51:06 -05:00
Iamgoofball 7f66ccfc2b Removes inherent toxin damage from lipolicide (#37874)
* Removes inherent toxin damage from lipolicide

* Update description of lipolicide
2018-05-18 16:47:20 -05:00
81Denton 8235db8b5c this violates the space geneva convention (#37903) 2018-05-18 16:46:05 -05:00
ShizCalev 1788558264 Cleans up clap bodypart check 2018-05-18 09:18:23 -05:00
Dax Dupont 0dcd8fb37a Fixes oversight with foam (#37898)
braaap

TRUE FALSE

false false
2018-05-18 08:29:48 -05:00
ShizCalev 5ddcd7133f Fixes radimmune mobs being killed by radiation (#37875) 2018-05-18 06:15:33 -05:00
LetterJay 5ea6164bbc Update revolution.dm 2018-05-17 23:50:25 -05:00
LetterJay 329aabf301 Update cult.dm 2018-05-17 23:50:17 -05:00
LetterJay cceb549243 Update clockcult.dm 2018-05-17 23:50:08 -05:00
LetterJay 047fc2a858 Update boozeomat.dm 2018-05-17 23:45:11 -05:00
LetterJay 204043bc26 Update borghydro.dm 2018-05-17 23:44:58 -05:00
LetterJay 348b350295 Update alcohol_reagents.dm 2018-05-17 23:44:47 -05:00
LetterJay 2b0a4f6737 Update drinks_recipes.dm 2018-05-17 23:44:36 -05:00
LetterJay eb96fe9d02 Update bottle.dm 2018-05-17 23:44: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 77f897e91c Fixes soulstone runtime 2018-05-17 10:59:12 -05: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 9037a9745a Fixes decon message pronouns 2018-05-17 10:27:16 -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
ThePainkiller e2bcf82341 Adds Fernet, a digestif that reduces your satiety. 2018-05-17 10:19:40 -05:00