PsiOmega
4326b8c5d8
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-04-03 09:22:23 +02:00
mwerezak
a560acd3da
Makes reflex shooting more obvious
...
Reflex shooting now has a different colour than regular shooting, to prevent mixups
2015-04-02 21:54:35 -04:00
Chinsky
8af8383732
Merge pull request #8691 from PsiOmegaDelta/EventFixes
...
Fixes event weights not being affected by having been fired before.
2015-04-02 23:43:24 +03:00
PsiOmega
ca70ac1efe
Fixes #8582 .
...
simple_animal/Life() did not terminate properly on death.
Caused issues with bears that would update their icons if Life() returned true (despite having called death).
2015-04-02 09:47:20 +02:00
Zuhayr
1070a8f63c
Adds weedkiller smoke checks to hydro trays and spreading plants.
2015-04-01 07:25:09 -07:00
Zuhayr
5326abb67d
Fixes #8611
2015-04-01 07:24:53 -07:00
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
286e1cfc6b
Merge pull request #8632 from PsiOmegaDelta/StopTheHurting
...
Fixes #8624 .
2015-03-30 22:36:54 +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
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
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
PsiOmega
59638b2300
Fixes #8661 .
...
Now ghosts the AI before it's deleted, setting the respawn timer.
2015-03-29 16:53:48 +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
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
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
PsiOmegaDelta
447cbab45f
Merge pull request #8613 from mwerezak/gun-rewrite
...
Adjusts ammo autolathe costs
2015-03-24 21:54:49 +01:00
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
