Commit Graph

9706 Commits

Author SHA1 Message Date
Kelenius
6f7a7177f2 Adds drying racks and updates pipes
You can now dry plants using a special machine, and you can now stuff
those plants into pipes to smoke then. It slowly transfers the reagents
from the plant into the smoker.
2015-01-16 02:57:59 +03:00
Zuhayr
d65c8f366e Merge pull request #7791 from Baystation12/dev-freeze
Dev freeze
2015-01-12 09:05:45 +10:30
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
Chinsky
4b3ffa864c Merge pull request #7768 from mwerezak/fixes
Fixes
2015-01-10 21:24:13 +03: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
a539780086 Merge pull request #7759 from Baystation12/dev-freeze
Dev < Dev freeze
2015-01-10 04:58:48 +10:30
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
Zuhayr
0d56551319 Merge pull request #7729 from Baystation12/dev-freeze
Dev freeze
2015-01-07 18:15:03 +10:30
Tramziller
29a0ae2ad6 Response to #7686 2015-01-06 21:48:56 +01:00
ccomp5950
27765f799f Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
Conflict resolution.

Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
2015-01-06 12:36:28 -05: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
Kelenius
c1d07cd77b Fixes a tiny typo and a comment
So basically toxins are not processed like all other reagents - instead
that is handled to the liver. Since dionae/dionas have no liver, toxins
would never leave their system. There is a check for aliens to
forcefully call ..(), but due to a typo it was only called if the drug
had any toxpwr. Since mindbreaker (and several others) has toxpwr = 0,
such drugs would never leave a poor diona's... khm, system.

The question to how diona even get affected by those in the first place
stays open.

Fixes #6994.
2015-01-03 23:19:14 +03:00
Kelenius
4c63e6a3ea Restores monkey's ability to ventcrawl
Fixes #7474.
2015-01-03 22:41:57 +03:00
Zuhayr
982998d08d Fixes #7636 2015-01-03 06:53:29 +10:30
Zuhayr
014729a001 Addendum to previous commits. 2015-01-03 05:52:29 +10:30
Zuhayr
a34a1f66cf Fixes #7632 2015-01-03 05:23:44 +10:30
Chinsky
5e0676df49 Merge pull request #7631 from Zuhayr/dev-freeze
More fixes.
2015-01-02 20:52:27 +03:00
Chinsky
f30981ab71 Merge pull request #7610 from Loganbacca/trainfixes
Cargo train fixes
2015-01-02 20:51:19 +03:00
Loganbacca
f3b893942f More cargo train fixes
- Fixes #5906
- Fixes #5939
- Fixes #6282
- Fixes #6634 (properly this time)
- Fixed a bug with updating train stats (causing trains to be super slow if hitched while running)
- Updated train verbs (start/stop/remove key) to only show up if you are in the same turf
- Moved all train specific verbs to their own verb category: "Vehicle"
2015-01-03 01:27:10 +13:00
Zuhayr
e63798ea4e Fixes oversight with decompiler. 2015-01-02 20:42:59 +10:30
Zuhayr
261f3f935c Fixes #7627 2015-01-02 19:19:01 +10:30
Zuhayr
89955dbb36 Fixes #7628 2015-01-02 19:02:11 +10:30
Zuhayr
041cd3f3f3 Fixes #7629 2015-01-02 18:58:52 +10:30
Zuhayr
6cae51a945 Fixes #7625 2015-01-02 18:48:06 +10:30
mwerezak
f9344a5a2d Atmos machine update
Takes a pass at updating ATMOSPHERICS to take advantage of the new powernet changes.

Also removes var/on definitions from many atmos machines. Machines generally shouldn't
be doing "on" things if they aren't using power, and most players don't expect a machine
to use power if it isn't "on," so I guess this is fair game.

Also, further refactoring.
2015-01-02 01:46:18 -05:00