Commit Graph

16546 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
1bd1687c81 Fixes runtime error: pick() from empty list 2015-01-13 13:37:07 -08:00
Ravensdale
759373ac0a Fixes runtime with hand labelers 2015-01-13 09:52:14 -08:00
Loganbacca
985d410657 Air tank interface fix
- Allows tanks to be toggled on and off as internals from their UI.
- If internals are off, all tanks capable of being used for internals
will display "tank is connected to a mask".
- If internals are on, only the tank that is actively supplying air is
listed as "connected" and "open". All others will display as "not
connected".
- Tanks inside rigs will correctly display their status in their UI (if
you open it before putting it in the rig, but cannot be toggled on
through the interface. Toggling them on with the internals button works.
2015-01-13 23:19:58 +13: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
Zuhayr
7866d78b4b Merge pull request #7797 from Baystation12/master
Master into dev-freeze
2015-01-12 21:17:04 +10:30
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
tkdrg
2d2c376f2f Fixes XSS vuln in changeling mimic voice
See https://github.com/tgstation/-tg-station/issues/6975
2015-01-11 19:54:42 -03:00
Zuhayr
9f7df7045e Merge pull request #7771 from GinjaNinja32/robot_storage
Fix robot storage units dropping security borgs' taser/laser on storage, slight refactor.
2015-01-12 07:39:49 +10:30
ginjaninja32
4717c3a575 Span classes? Span classes.
Also removes a pair of redundant \impropers.
2015-01-11 21:00:03 +00:00
Zuhayr
61d35bd474 Merge resolution. 2015-01-12 07:17:02 +10:30
GinjaNinja32
30cb5f5cc7 Revert test code 2015-01-11 12:29:14 +00:00
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
b9fa2c0c50 Fixes #7663.
Corrects inconsistent turret anchor/on settings.
Correctly sets access ERT turret permissions.
Corrects invisibility level on turret pop down.
2015-01-11 12:21:45 +01:00
Zuhayr
6db4cef894 Merge pull request #7784 from PsiOmegaDelta/Shutters
Fixes  #7723.
2015-01-11 21:10:25 +10:30
PsiOmega
4a68f6097d Fixes #7743.
Makes syndicate and vox shuttle areas radiation safe.
2015-01-11 11:28:24 +01:00
PsiOmega
7f54ff97ef Fixes #7723.
Blast doors again use the same layering method as doors.
2015-01-11 11:20:51 +01:00
Loganbacca
a53922307b Fixed lying mobs not updating gravity state
Also removed a few colons from turf.dm
2015-01-11 22:43:15 +13: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
146fb2f6ad Fixes lighting not updating when turfs are changed 2015-01-11 21:03:27 +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
ginjaninja32
1936410a91 Fix robot storage units dropping security borgs' taser/laser on storage, slight refactor. 2015-01-10 04:15:55 +00: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
ccomp5950
2816d3c02b Fixes PDA locking up after receiving a " in conversation.
Long story short, the json encoding doesn't know how to handle "
Adding a check specifically for it breaks other stuff, after banging my head against it for an hour
this is the best means of fixing the problem without breaking and fixing a lot of other things.
2015-01-09 22:27:15 -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
PsiOmegaDelta
4735419c6f Merge pull request #7741 from Tramziller/Bugfixes
Response to #7724
2015-01-08 23:29:46 +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