Commit Graph

16519 Commits

Author SHA1 Message Date
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
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
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
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
Tramziller
11ff174636 Old link was replaced by new one 2015-01-08 22:26:31 +01:00
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
b36b41a2f5 Fixes #7656 2015-01-09 03:58:43 +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
Zuhayr
0d071e7f9d Fixes #7683 2015-01-09 03:48:46 +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
07298fa31a Merge pull request #7697 from Tramziller/dev-freeze
Shot airlock fix
2015-01-07 06:02:06 +10:30
Zuhayr
ab711b5080 Merge pull request #7695 from Amunak/patch-1
Makes LOOC dark turquoise, fixes #7681
2015-01-07 04:33:56 +10:30
Zuhayr
cb88860f6b Merge resolution. 2015-01-07 03:43:12 +10:30
Mloc
7570cf7ea7 Merge pull request #7708 from comma/master
Fixes #7707
2015-01-06 15:28:32 +00:00
Chinsky
38c69bab64 Fixes #7707 2015-01-06 13:14:20 +03:00
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
Tramziller
be48eccad2 Airlock that are BROKEN (shot or like) can have their electronics removed (for repairs) even when their bolts are dropped 2015-01-05 20:39:00 +01:00
Amunak
c34a8ee859 Admin name colour msay colour fix
Admin name colour in msay now matches their default OOC colour. Hopefully fixes some concerns presented in #7657.
2015-01-05 18:40:52 +01:00
Amunak
e5512518bb Makes LOOC dark turquoise, fixes #7681 2015-01-05 13:48:22 +01:00
mkalash
559e224446 Allows the autolathe maintenance panel to be accessed even if disabled. Fixes #7677. Adds feedback when a someone tries to interact with a disabled autolathe with the panel closed. 2015-01-04 22:43:20 -05:00
mkalash
f9e352b768 Gets rid of the white wire in Omega's new wire system. The background of the UI is white, so you can't read the wire's name. I replace it with dark red. 2015-01-04 22:26:41 -05:00
mkalash
536e4bd237 Adds missing paranthesis in logic for airlock's hasPower(). Fixes #7653 2015-01-04 22:09:00 -05:00