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
Zuhayr
93746b9b67
Merge pull request #8657 from PsiOmegaDelta/Medkits
...
Fixes #8615 .
2015-03-30 02:20:48 +10:30
Zuhayr
d7a19d5977
Merge pull request #8663 from PsiOmegaDelta/WipeAI
...
Fixes #8661 .
2015-03-30 02:20:36 +10:30
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
PsiOmega
284c31502c
Fixes #8615 .
...
Relocates blood supply cabinet.
2015-03-29 15:02:19 +02:00
Zuhayr
49f83aded4
Merge pull request #8651 from GinjaNinja32/patch-1
...
Fixes #8650
2015-03-29 12:28:09 +10:30
GinjaNinja32
e7b4370772
Fixes #8650
2015-03-28 22:01:02 +00:00
Zuhayr
6f5b5bfdd2
Merge pull request #8644 from mwerezak/camera-fix
...
Fixes camera wires
2015-03-28 17:22:01 +10:30
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
Zuhayr
0d5d3e1aab
Merge pull request #8640 from PsiOmegaDelta/WizardAttackLog
...
Wizard mind transfer attack log.
2015-03-28 10:46:20 +10:30
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
Zuhayr
6d5b24bef1
Merge pull request #8636 from GinjaNinja32/webbing
...
Fixes webbings utilising bluespace storage for infinite storage (again)
2015-03-27 16:24:21 +10:30
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
Zuhayr
cecc1ee86d
Merge pull request #8620 from PsiOmegaDelta/Dupe
...
Fixes duplicate uplink reference.
2015-03-26 14:02:53 +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
Zuhayr
3bdd352b13
Merge pull request #8597 from Zuhayr/dev-freeze
...
Fixes
2015-03-24 23:14:22 +10:30
mwerezak
5d006467b3
Fixes merc shuttle cigarette machine, adds some rations so the mercs don't go hungry.
...
Fixes merc shuttle cigarette machine requiring credits that the mercs can pay (having no accounts). Adds 4 liquidfood rations and 4 bread tubes to the merc shuttle lockers.
2015-03-24 04:13:44 -04:00
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
PsiOmegaDelta
19af11fb2f
Merge pull request #8593 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2015-03-23 21:15:07 +01:00
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
