shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,749 Commits 5 Branches 0 Tags
33a6d7544fbcc24958dfea308a5cdb3de7377ca9
Commit Graph

6275 Commits

Author SHA1 Message Date
LetterJay
33a6d7544f Merge pull request #6800 from Citadel-Station-13/upstream-merge-37892 
[MIRROR] Fixes changeling runtime after ghosting
 2018-05-19 09:15:03 -05:00
LetterJay
cad56985a0 Merge pull request #6799 from Citadel-Station-13/upstream-merge-37894 
[MIRROR] Fixes dizziness on some drinks
 2018-05-19 09:14:46 -05:00
LetterJay
86dd14699d Merge pull request #6798 from Citadel-Station-13/upstream-merge-37822 
[MIRROR] Fixes experimentor pickweight and goo runtime
 2018-05-19 09:14:13 -05:00
LetterJay
bce4575679 Merge pull request #6795 from Citadel-Station-13/upstream-merge-37911 
[MIRROR] Fix runtimes in mood rejuventation
 2018-05-19 09:13:46 -05:00
LetterJay
579e7997ff Merge pull request #6794 from Citadel-Station-13/upstream-merge-37895 
[MIRROR] Fixes mulligan for mutants
 2018-05-19 09:13:32 -05:00
LetterJay
69b4813469 Merge pull request #6792 from Citadel-Station-13/upstream-merge-37874 
[MIRROR] Removes inherent toxin damage from lipolicide
 2018-05-19 09:12:42 -05:00
LetterJay
5886e5add7 Merge pull request #6788 from Citadel-Station-13/upstream-merge-37898 
[MIRROR] [s] Fixes oversight with foam
 2018-05-19 09:11:29 -05:00
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
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
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
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
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
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
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
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
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
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
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
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
Dax Dupont
eb29d86c5f Fixes wrong circuits (#37853) 
* Fixes wrong circuits

* this too
 2018-05-16 12:04:54 -05: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