Commit Graph

17710 Commits

Author SHA1 Message Date
Zuhayr
63a2fc6bff Fixes #8682 2015-04-01 07:05:58 -07:00
PsiOmegaDelta
015fb291fa Merge pull request #8698 from mwerezak/gun-icons
Fixes swapped STS-35 item states
2015-04-01 06:32:29 +02:00
PsiOmegaDelta
d430f928e8 Merge pull request #8694 from Yoshax/freejobfeedback
Adds feedback and logging for free job slot verb
2015-04-01 06:31:28 +02:00
mwerezak
5fe486dfe3 Fixes swapped STS-35 item states
Renames the states to prevent future confusion
2015-03-31 20:26:31 -04:00
Yoshax
25fa1a2258 Adds feedback and logging for free job slot. 2015-03-31 19:01:17 +01:00
Kelenius
524ea8aeb7 Fixes a typo 2015-03-31 18:37:15 +03:00
PsiOmega
9de5b19625 Fixes event weights not being affected by having been fired before.
This mainly due to using a completely incorrect list, event_last_fired (used by the old system) instead of last_event_time.
2015-03-31 15:53:16 +02:00
Zuhayr
299a977701 Merge pull request #8679 from Yoshax/tempgun
Fixes #8672
2015-03-31 15:17:47 +10:30
Zuhayr
3472513cf9 Merge pull request #8645 from mwerezak/gun-icons
Adds Skowron's inhand icons for various guns
2015-03-31 14:12:03 +10:30
Yosh
286dffcda0 Fixes #8672
Fixes #8672 however the temperature gun is still utterly and completely
useless, but hey, at least you can fire it now.
2015-03-30 21:59:59 +01:00
Chinsky
c1b3e935d6 Backwards check fixed 2015-03-30 23:28:30 +03:00
Chinsky
eb390ffde3 Fixes #8246 2015-03-30 23:20:09 +03:00
Chinsky
5429378703 Added check for second pAi for #8287 2015-03-30 22:55:17 +03:00
Chinsky
286e1cfc6b Merge pull request #8632 from PsiOmegaDelta/StopTheHurting
Fixes #8624.
2015-03-30 22:36:54 +03:00
Chinsky
c0b62fd94a Fixes #8488 2015-03-30 22:32:52 +03:00
Chinsky
1a94b6cc35 Fixes #8393 2015-03-30 22:26:46 +03:00
Chinsky
246fc62b1c Whoops missed a bracket 2015-03-30 22:23:29 +03:00
Chinsky
1e6e7b0146 Fixes #8580
Also fixed condition thing where having second pistol would lower chance of main one going off
2015-03-30 22:08:08 +03:00
Chinsky
1a93042226 Fixes #8548
Removed referenced to type of ammo used from descriptions.
2015-03-30 22:06:29 +03:00
Chinsky
40cf940f13 Fixes #8564 2015-03-30 22:04:13 +03:00
Chinsky
e3ad4dc013 Fixed #8602 2015-03-30 21:59:50 +03:00
Chinsky
dfdea36479 Fixes #8642 2015-03-30 21:36:41 +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
mwerezak
c59fac2e16 Adds unloaded item state for the STS-35. 2015-03-29 02:40:57 -04:00
mwerezak
ba9b8756da Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file 2015-03-29 01:52:26 -04:00
GinjaNinja32
e7b4370772 Fixes #8650 2015-03-28 22:01:02 +00:00
PsiOmega
c93c81e77c Fixes #8624
Synthetics are no longer described as being wounded when dragged.
2015-03-28 20:28:39 +01:00
mwerezak
36cf695256 Adds Skowron's inhand icons for various guns 2015-03-28 02:10:09 -04: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