Commit Graph

17588 Commits

Author SHA1 Message Date
Chinsky
271977dd7e Fixes #8537
Apparently drying racks don't actually do anything, but at least now they can do nothing on all the grown fruits! Also added some darkening so people feel like they were slightly less cheated.
2015-04-13 07:19:40 +03:00
Chinsky
d6d005db6a Fixes #8550 2015-04-13 06:41:58 +03:00
Chinsky
d39cc9686d Fixes #8687 2015-04-13 06:25:30 +03:00
Chinsky
b436925a33 Fixes #8735 2015-04-13 03:54:29 +03:00
Chinsky
056c00fc9a Merge pull request #8671 from Yoshax/spellfixes
Updates spellbook descriptions and cooldowns
2015-03-30 21:15:08 +03:00
Chinsky
5837eb2675 Merge pull request #8668 from Yoshax/dev-freeze
Fixes #8652
2015-03-30 19:40:13 +03:00
PsiOmegaDelta
fefb55db93 Merge pull request #8674 from GinjaNinja32/rig_guns
Rig weapon fixes
2015-03-30 15:02:22 +02:00
Zuhayr
bdbb61f0f8 Merge pull request #8664 from Yoshax/MyWork
Changes ED-209 Construction to work with new armor vests
2015-03-30 17:52:35 +10:30
GinjaNinja32
e342bf8a3a Fixes #8673, also makes some messages clearer and removes the twin cooldowns on rig weapons 2015-03-30 03:54:18 +01:00
Yosh
c1b7ca3b89 Further description fixes 2015-03-30 01:17:57 +01:00
Yosh
e9125474dd Spellbook spell description update
Updates what obvious problems in the descriptions I could see.
2015-03-30 01:12:23 +01:00
Yosh
57a8822c43 Spellbook cooldown corrections
Displayed cooldowns in the wizard's spellbook were partially incorrect,
fixed now to display the correct cooldowns.
2015-03-30 01:01:12 +01:00
Zuhayr
2f60c4b82d Merge pull request #8638 from Zuhayr/vox
Removes the vox armalis.
2015-03-30 08:56:34 +10:30
Yosh
e4b827134e Fixes #8652
Fixes #8652
Took me long enough, I'm pretty retarded, and to answer Psi's question,
yes, this fixes it.
2015-03-29 23:19:21 +01:00
Yosh
42cb430f02 Changes ED-209 Construction to work with new armor vests
Changes ED-209 construction to accept any type of the newer armor vests
rather than the old mostly deprecated armor vests.
2015-03-29 18:05:07 +01:00
PsiOmega
59638b2300 Fixes #8661.
Now ghosts the AI before it's deleted, setting the respawn timer.
2015-03-29 16:53:48 +02:00
PsiOmegaDelta
84e4f6315f Merge pull request #8660 from Baystation12/master
Dev-freeze
2015-03-29 16:19:38 +02:00
GinjaNinja32
e7b4370772 Fixes #8650 2015-03-28 22:01:02 +00:00
mwerezak
09fea22231 Fixes camera wires
Seems like pulsing was mistakenly set to deactivate the camera during the wire datum update.
2015-03-27 23:35:38 -04:00
Chinsky
3cd206535a Merge pull request #8639 from mwerezak/holocarp-fix
Holopad fix, makes holodeck objects slightly transparent
2015-03-27 20:57:30 +03:00
mwerezak
486940c9e0 Makes holo objs slightly transparent 2015-03-27 10:32:41 -04:00
mwerezak
fb53dd7402 Fixes holopad not checking other holograms being projected from the same projector, if the first one was in range.
Simplifies holopad power usage.
2015-03-27 10:31:44 -04:00
PsiOmega
633db48082 Wizard mind transfer attack log.
Adds an attack log for the wizard mind transfer.
2015-03-27 09:08:09 +01:00
Zuhayr
59adbae59e Removes the vox armalis. 2015-03-27 16:41:32 +10:30
PsiOmegaDelta
ce414b2eba Merge pull request #8637 from mwerezak/holocarp-fix
Fixes holocarp not being transparent
2015-03-27 07:07:20 +01:00
mwerezak
872e0a0e84 Fixes holocarp not being transparent. 2015-03-27 01:36:36 -04:00
GinjaNinja32
05f9411910 Fixes webbings utilising bluespace storage for infinite storage (again) 2015-03-27 03:06:29 +00:00
Zuhayr
dda3fc8f02 Merge pull request #8469 from mwerezak/robot-emp
Reduces the effect of EMP on robot power cells, some other things
2015-03-26 19:00:39 +10:30
PsiOmega
b39a486e61 Fixes duplicate uplink reference.
This is the second time I have to fix it for the rifle. Stop breaking it.
2015-03-25 23:14:02 +01:00
PsiOmegaDelta
447cbab45f Merge pull request #8613 from mwerezak/gun-rewrite
Adjusts ammo autolathe costs
2015-03-24 21:54:49 +01:00
Zuhayr
260fb28827 Merge pull request #8575 from PsiOmegaDelta/AINaming
Fixes #8565.
2015-03-25 02:36:35 +10:30
Zuhayr
0bb2cd835c Merge pull request #8600 from mwerezak/bread-tube
Adds bread tube trash item, merc shuttle vendor
2015-03-25 00:54:16 +10:30
mwerezak
1ce81b91b1 Adds bread tube trash item 2015-03-24 04:03:06 -04:00
mwerezak
113498dc1e Makes bread tube nutriment content similar to comparable snacks 2015-03-24 03:57:17 -04:00
Zuhayr
7e615521ef Should fix issues with invisible seeds/products/plants. 2015-03-24 13:51:44 +10:30
Zuhayr
45f28d5372 Fixes #8485 2015-03-24 13:20:24 +10:30
Zuhayr
ef50918b9c Hackfix for #8588 2015-03-24 12:46:07 +10:30
PsiOmega
bd48c76620 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-23 21:14:32 +01:00
PsiOmegaDelta
c85e1ce786 Merge pull request #8592 from comma/maxlen
Readded missing check for paper editing
2015-03-23 21:13:43 +01:00
Chinsky
a9ee51bc64 Readded missing check for paper editing
Removed it back when HTML in paper was a thing again adn never put back in, can possibly cause issues.
Thanks @volas for noticing.
2015-03-23 23:02:43 +03:00
mwerezak
f8eb5ccb97 indent fix 2015-03-23 13:04:39 -04:00
Zuhayr
14950a7e3a Merge pull request #8584 from Kelenius/ofBorgsAndGlass
Fixed construction borg's Rglass
2015-03-23 21:34:36 +10:30
PsiOmega
1908ba59e2 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-23 11:45:32 +01:00
Kelenius
026ec265d4 Fixed construction borg's Rglass 2015-03-23 12:11:58 +03:00
mwerezak
dc1f05a9da Tweaks rig emp effect, breach_threshold 2015-03-23 02:49:34 -04:00
mwerezak
ceaa938b89 EMP deals burn instead of brute to silicons, and bypasses robot armour 2015-03-23 02:47:05 -04:00
mwerezak
28df26b36c Reduces the effect of EMP on robot power cells
Temporary fix to resolve #8454
2015-03-23 02:34:17 -04:00
mwerezak
8ff15108f9 Reduces 14.5mm ammo box cost to 2 TC, slight rename 2015-03-23 00:16:48 -04:00
mwerezak
a60921326e Adjusts ammunition autolathe costs, makes 7.62 mags printable 2015-03-23 00:06:28 -04:00
Zuhayr
a454e77444 Merge pull request #8573 from PsiOmegaDelta/StrayCharacter
Fixes stray character.
2015-03-23 10:55:08 +10:30