GinjaNinja32
08b967c9e0
Move NanoUI cache update to client/New()
2014-10-11 18:40:09 +01:00
Snapshot
e67e37b010
Merge pull request #6640 from Mloc/bs12-overflow
...
fixes #6200
2014-10-09 20:44:25 -07:00
Zuhayr
4223cc6596
Merge pull request #6642 from DeeUnderscore/fix-disposal-bin
...
Fix detached disposal bins never changing to attached
2014-10-10 09:31:28 +10:30
D Anzorge
7c8e810774
Fix detached disposal bins never changing to attached
2014-10-09 08:09:04 -04:00
Mloc
5b71ca0aeb
fixes #6200
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-09 12:35:11 +01:00
PsiOmega
3560531d58
Silicons attempting to delete camera images no longer causes runtime errors
2014-10-09 08:21:07 +02:00
Zuhayr
a730561b76
Merge pull request #6621 from Raptor1628/master
...
Custom item fixes/adjustments
2014-10-08 00:30:24 +10:30
Zuhayr
51e7f95b72
Merge pull request #6610 from SparklySheep/patch-7
...
Replaces Vox telebaton with a stun baton
2014-10-08 00:30:02 +10:30
Raptor1628
0314cbd8d1
Custom item fixes/adjustments
...
Polishes a few sprites and item defines.
2014-10-06 22:49:02 -04:00
Mloc
056fbd79d1
fixes #6599
...
also small improvements to the loadout system
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-06 09:57:01 +01:00
SparklySheep
9efc817896
Replaces Vox telebaton with a stun baton
...
Since the telebaton nerf, the vox lost their ability for stuns so this should give them the ability to whack folks and take prisoners again. As well, the telebaton was pretty worthless as a weapon.
2014-10-05 23:17:17 -05:00
GinjaNinja32
24d43ef509
Fixes #6597
2014-10-04 18:15:13 +01:00
GinjaNinja32
9ac8f3ccef
Fixes #6587 and #6590
2014-10-04 17:57:37 +01:00
Chinsky
06126c4f69
Merge pull request #6594 from mwerezak/runtime
...
Fixes #6592
2014-10-04 13:03:58 +04:00
mwerezak
d721673d8d
Fixes #6592
2014-10-04 02:11:51 -04:00
Snapshot
9162a183eb
Merge pull request #6586 from Mloc/bs12-fan
...
fixes #6035
2014-10-03 07:32:42 -07:00
Mloc
37b5aa1c50
fixes #6035
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-02 13:26:28 +01:00
Zuhayr
61c0f6e1b7
Merge pull request #6574 from Mloc/bs12-fan
...
more fixes
2014-10-02 19:04:07 +09:30
Zuhayr
c3c5c68890
Merge pull request #6576 from GinjaNinja32/anomaly
...
Changes Alden-Saraspova behaviour to wait for new results before outputting
2014-10-02 12:17:52 +09:30
Zuhayr
a0ad04f520
Merge pull request #6564 from TwistedAkai/master
...
Add round start check to Declare Ready
2014-10-02 11:44:07 +09:30
GinjaNinja32
2b16022ee0
Changes Alden-Saraspova counter behaviour to wait for new results before outputting
2014-10-01 22:32:45 +01:00
Mloc
58953a3d31
fixes #6499
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-01 17:48:21 +01:00
Mloc
dbff924849
fixes #6562
...
fixes #6571
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-01 17:48:17 +01:00
Akai Alonkai
4c5665d4fd
Add round start check to Declare Ready
...
Added a check to 'declare ready' to prevent readying up after the round
started. Allowing this to happen caused a bug where the player would be
unable to change their character setup if they declared ready after the
round started, such as to look at the manifest to see which character
would be best to play, until after reconnecting.
2014-10-01 06:16:29 -04:00
Chinsky
dd9b3fe613
Merge pull request #6565 from Mloc/bs12-fan
...
small fixes 2
2014-10-01 13:39:35 +04:00
Chinsky
a3dba06c0e
Merge pull request #6563 from mwerezak/cargo
...
Fixes supply shuttle state when returning
2014-10-01 13:39:29 +04:00
Zuhayr
c3e63b1ad0
Merge pull request #6560 from Mloc/bs12-efab
...
small fixes
2014-10-01 18:52:59 +09:30
Mloc
d43dbaa7b5
resolves #6260
...
chance was being checked twice, for some reason.
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-01 10:13:15 +01:00
Mloc
39781326cc
fix for artifact teleportation effect
...
will no longer teleport you inside random objects.
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-01 09:54:39 +01:00
Chinsky
a26185dd9e
Merge pull request #6553 from atlantiscze/android-roundstart-fix
...
Android roundstart fix
2014-10-01 10:01:39 +04:00
mwerezak
d81670edfb
Fixes supply shuttle state when returning
...
When returning to centcom, the supply shuttle's state was not being set
to INTRANSIT.
2014-10-01 00:48:16 -04:00
Mloc
61394d3921
fixes #6561
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-09-30 22:18:25 +01:00
Mloc-Argent
6fb1667b44
fixes #4742
...
not a full fix, there's too many small cases where OPENCONTAINER
isn't checked, but this is everything in the report
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-09-30 20:52:00 +01:00
Atlantiscze
ff9f79acfc
Cleaner version of previous commit.
2014-09-30 09:15:21 +02:00
Atlantiscze
8d58fc2e97
Android Roundstart NameFix
...
- Positronic Brains in Androids now have proper posibrain-like name, instead of using MMI-like name.
- Example: (Tes Ter -> SINA-123)
2014-09-30 08:56:28 +02:00
Chinsky
6eea41bcc1
Merge pull request #6535 from Hubblenaut/master
...
Fixes rolled down jumpsuits not adjusting body flags
2014-09-28 21:22:00 +04:00
Hubblenaut
79c0d3470a
Fixes non-used flavor text causing line breaks
2014-09-28 15:48:39 +02:00
Hubblenaut
1212338c2e
Fixes rolled down jumpsuits now adjusting body flags
2014-09-28 15:48:38 +02:00
Zuhayr
9a01da0519
Merge pull request #6437 from atlantiscze/Supermatter-O2-Fix
...
Supermatter Tweak
2014-09-28 22:12:21 +09:30
Chinsky
a2351ab952
Merge pull request #6529 from mwerezak/language
...
Fixes #6520
2014-09-27 14:21:29 +04:00
mwerezak
7a2b3b6661
Fixes #6520
2014-09-27 03:00:26 -04:00
Zuhayr
b78e2b0c79
Fixes #6297
2014-09-25 21:49:20 +09:30
Zuhayr
9272bc4542
Fixes #6351 and #6350 .
2014-09-25 21:19:35 +09:30
Zuhayr
c232b4e921
Fixes #5451 by stealing JimTheCactus' and VampyrBytes' work - thanks dudes.
2014-09-25 20:07:11 +09:30
Zuhayr
cddbce688d
Fix for potential infinite splint farming exploit in previous commit.
2014-09-25 19:43:17 +09:30
Zuhayr
e41c584ace
Fixes #6325
2014-09-25 19:33:46 +09:30
Zuhayr
6bdf515ef3
Makes species mutation a bit easier.
2014-09-25 18:48:29 +09:30
Zuhayr
7682711442
Fixes #6474
2014-09-25 18:45:27 +09:30
Zuhayr
8e9fc05b67
Fixes #6484
2014-09-25 18:36:25 +09:30
Zuhayr
b32d25b1bd
Fixes #6503
2014-09-25 18:01:46 +09:30
