Commit Graph

9705 Commits

Author SHA1 Message Date
Chinsky
45a35ced8e Merge pull request #7772 from mwerezak/events
Moderate level event weightings and balance
2015-01-14 18:56:06 +03:00
Ravensdale
807348b814 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into runtimeFixes 2015-01-13 13:41:32 -08:00
Ravensdale
759373ac0a Fixes runtime with hand labelers 2015-01-13 09:52:14 -08:00
Loganbacca
cac7f64fdc Robot module fix
Thanks mwerezak
2015-01-13 22:16:20 +13:00
Loganbacca
5d0d5d0aba Fixes robot modules not regenerating
- Also added a type check
2015-01-13 16:34:15 +13:00
PsiOmegaDelta
94126b8caa Merge pull request #7795 from mwerezak/fixes
Fixes bad gear datum paths
2015-01-12 11:54:58 +01:00
mwerezak
aeec54aece Fixes bad gear datum paths 2015-01-12 00:19:01 -05:00
mwerezak
b069bfb658 Adjusts infection chances
After some discussion on IRC this seems like a better starting value.
2015-01-12 00:05:47 -05:00
Zuhayr
61d35bd474 Merge resolution. 2015-01-12 07:17:02 +10:30
Loganbacca
527e83a4e3 Blood/oil stain fixes
- Fixed item descriptions calling oil-stained items "bloody"
- Fixed mob examine describing oil-stained bare hands and feet as "bloody"
- Fixed blood overlays on shoes not updating after walking through different colored blood
- Removed some colons
2015-01-12 01:08:28 +13:00
PsiOmega
4a68f6097d Fixes #7743.
Makes syndicate and vox shuttle areas radiation safe.
2015-01-11 11:28:24 +01:00
Loganbacca
bc57c8b55d Made thaler bundle merging code more sane
Both bundles are dropped, then the merged one is put in the users hands
2015-01-11 21:44:12 +13:00
Loganbacca
441ee30bfb Fixes multiplying grape soda
Also cleaned up some indenting
2015-01-11 19:14:59 +13:00
Loganbacca
baf763c324 Runtime fix 2015-01-11 19:01:38 +13:00
mwerezak
03e95ecbcf Fixes UI event weighting display 2015-01-10 13:29:19 -05:00
Chinsky
4b3ffa864c Merge pull request #7768 from mwerezak/fixes
Fixes
2015-01-10 21:24:13 +03:00
mwerezak
e49a3a86ae Delays events by 15 minutes on crew autotransfer 2015-01-10 12:48:03 -05:00
mwerezak
d61c808fef Cleans up infect_virus2() typecheck 2015-01-10 12:29:35 -05:00
mwerezak
8ac0450c01 Sets chance_maxm for several disease effects
Also lengthens the time to get from stage 1 to stage 2
2015-01-10 12:26:12 -05:00
mwerezak
cf0c0c29bb Randomizes carp spawning locations 2015-01-10 11:49:10 -05:00
mwerezak
654769016e Fixes virus events failing because of lack of compatible species 2015-01-10 03:18:52 -05:00
mwerezak
1c5ca01dae Restricts Gibbingtons, Suicide, and Monkism syndromes
Restricts Gibbingtons, Suicide, and Monkism syndromes from even greater
diseases. Admins can still generate diseases with these syndromes
through secrets.

Fixes virus events potentially having people share the same virus datum.
2015-01-10 03:08:42 -05:00
mwerezak
b0440b9c28 Adjusts moderate level event weightings 2015-01-10 01:27:18 -05:00
mwerezak
3a4fca8ed3 Gridcheck event now only announces sometimes
Requested by Ravensdale
2015-01-10 01:26:49 -05:00
mwerezak
9b5eded546 Fixes major virus event generating lesser viruses, makes lesser viruses actually less severe
Makes more of a distinction between lesser and greater viruses by
restricting lesser viruses to only have the "Nil" syndrome for stage 4.
2015-01-10 01:25:19 -05:00
mwerezak
7f64d9ce13 Adjusts the amount of carp spawned for moderate level carp 2015-01-09 22:42:52 -05:00
mwerezak
905a832957 Fixed #7763 2015-01-09 22:28:16 -05:00
Amunak
0d87cb3d4d Fixes typo in engineering research description
It has been there since, like, forever.
2015-01-10 04:25:50 +01:00
mwerezak
0c9107afff Fixes hostile simple mobs targeting distant mechs 2015-01-09 21:36:44 -05:00
Zuhayr
6a6332437a Merge pull request #7750 from Amunak/patch-1
Reverted "say error helper" before there is a better implementation or option to toggle it
2015-01-09 14:11:05 +10:30
Amunak
8fa2fdb51b Reverted "say" error helper
Commented out the "say error helper" before we have a better implementation or before it can at least be toggleable. Current state doesn't fit way too many edge casess.
2015-01-09 03:56:58 +01:00
Zuhayr
5bbe1ecaa8 Amends nymph pulling fix to add higher w_class. Adds fail messages to pAI and nymphs trying to drag non-items. 2015-01-09 08:59:38 +10:30
Zuhayr
fd311a412f Fixes #7742. 2015-01-09 08:58:11 +10:30
Zuhayr
f43f58380c Fixes #7703 2015-01-09 08:26:53 +10:30
Zuhayr
683c8b50a8 Fixes #7702 2015-01-09 08:09:46 +10:30
Zuhayr
7c88b54404 Fixes #7722 2015-01-09 07:30:48 +10:30
Zuhayr
a4fca84e3e Fixes #7726 2015-01-09 06:44:09 +10:30
Zuhayr
a01592d5b7 Fixes #7740 2015-01-09 06:25:27 +10:30
Zuhayr
7e0610e31c Fixes #7684 2015-01-09 04:18:42 +10:30
Zuhayr
8d2d3302bd Fixes #7720 2015-01-09 04:07:08 +10:30
Zuhayr
c3756e3a03 Fixes #7701 2015-01-09 04:05:11 +10:30
Zuhayr
29435d8750 Fixes #7700 2015-01-09 03:56:12 +10:30
Zuhayr
cd53ed613c Fixes #7691 2015-01-09 03:51:47 +10:30
mwerezak
08cda65973 Adjusts major event weightings 2015-01-08 00:00:57 -05:00
mwerezak
c3413bc7d7 Fixes meteor event 2015-01-07 23:29:52 -05:00
Tramziller
29a0ae2ad6 Response to #7686 2015-01-06 21:48:56 +01:00
Zuhayr
cb88860f6b Merge resolution. 2015-01-07 03:43:12 +10:30
Zuhayr
66759eff3c Adds Borer bantype, halves borer resist time, comments out Devour Brain verb, expands borer welcome text. 2015-01-06 11:11:34 +10:30
Tramziller
06e6277dc6 Fixed bug of peridaxon healing robotic organs 2015-01-05 22:17:40 +01:00
Ccomp5950
c78ad9666a Merge pull request #7649 from Kelenius/ofDionaeAndDrugs
Fixes a tiny typo and a comment
2015-01-03 17:43:32 -05:00