Crazylemon64
7c8709b360
Brings over update_stat
2016-10-23 15:45:35 -07:00
Crazylemon64
8a6db8891f
Fox's requests
2016-10-23 15:45:35 -07:00
Crazylemon64
6a7f7394a8
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
Fox McCloud
da78a85781
Merge pull request #5804 from Markolie/morefixes
...
Pressure limit on disposal units
2016-10-23 17:22:48 -04:00
Fox McCloud
656a04ce3e
Merge pull request #5805 from Scribblon/pAIAtmosFix
...
Fix for pAI Atmosphere Sensor
2016-10-23 17:22:05 -04:00
Fox McCloud
c2b1de4499
Merge pull request #5807 from Markolie/sansfix
...
Fix Comic Sans HTML parsing
2016-10-23 17:21:20 -04:00
Markolie
199f6d91f1
Fix sans HTML parsing
2016-10-23 02:24:53 +02:00
Scriblon
db8d5ce158
Fix pAI Atmosphere Sensor
...
The problem was that in the old code, data["pressure"] was stored as a
String to round it. While NanoUI was programmed to use
helper.smoothRound() on that again which didn't like the String Object
pressure became.
As all data is integers and rouned in the UI, the fix chosen is to make
data["pressure"] a number again.
2016-10-22 21:05:40 +02:00
Markolie
9815f9e2c6
Pressure limit on disposal units
2016-10-22 20:51:49 +02:00
Fox McCloud
f110b9e6a5
Merge pull request #5803 from Scribblon/ScrubberFix
...
Scrubbers now respect air alarm settings.
2016-10-22 11:58:01 -04:00
TheDZD
062a14f2af
Merge pull request #5795 from Fox-McCloud/null-rod-cleanup
...
Nullrod istype Helpers
2016-10-22 09:35:16 -04:00
Scriblon
1f26c67031
Scrubbers now respect air alarm settings.
...
Scrubbers only worked when there was CO2, Toxins, or trace gasses in the
atmosphere, ignoring settings on the Air Alarm.
This commit fixes that and makes the scrubber respect the settings.
2016-10-22 15:25:44 +02:00
Markolie
3acde653d2
Fix cult girder layer
2016-10-21 18:04:00 +02:00
Markolie
4858136ca1
Cult wall fix
2016-10-21 17:59:47 +02:00
Markolie
010fa7d60f
Alien attack and organ fixes
2016-10-21 17:51:55 +02:00
Markolie
1a307cd8c9
Identity theft objective set fix, tank examine fix, proccall null return fix
2016-10-21 17:51:38 +02:00
Markolie
7173a8fe9f
Fix aliens double attacking, tank examining and ATM security level 0 interaction
2016-10-21 17:21:23 +02:00
Markolie
e853b66747
Minor wall deconstruction refactor
2016-10-21 17:05:49 +02:00
Markolie
87920451e8
Fix robot lockdown through console and jetpack examine
2016-10-21 17:02:16 +02:00
Fox McCloud
570b9b7ec0
Merge pull request #5793 from FlattestGuitar/names
...
Remember the clown names? Heee.....
2016-10-19 17:10:59 -04:00
Fox-McCloud
1da17e6863
Nullrod istype Helpers
2016-10-19 03:09:17 -04:00
FlattestGuitar
8229592986
fixes fixes
2016-10-18 20:20:47 +02:00
Fox McCloud
1f4faae739
Merge pull request #5763 from Markolie/nukefinish
...
Fixes
2016-10-17 22:16:42 -04:00
Fox McCloud
977d73740f
Merge pull request #5780 from Bone-White/master
...
Fix for issue #5768
2016-10-17 19:16:21 -04:00
Bone White
b40f37444c
Fix for issue #5768
...
Correctly un-wields defib paddles when dropping.
2016-10-16 15:36:01 +01:00
Markolie
e60e93e706
Fix light fixture frame progress bar
2016-10-15 12:47:38 +02:00
Markolie
268fbf4ffd
Drone emote fix
2016-10-15 12:28:10 +02:00
Markolie
cc780dcdf3
Fix traitors/operatives/mindslaves losing their status upon reconnect
2016-10-13 19:49:42 +02:00
Fox McCloud
4874d1c95c
Merge pull request #5695 from FlattestGuitar/logs
...
Renames some bullets so they're easier to track
2016-10-12 17:15:27 -04:00
FlattestGuitar
15684d4850
Only bullets now
2016-10-12 23:07:01 +02:00
Fox McCloud
dfde050407
Merge pull request #5644 from GeneralChaos81/Conveyors
...
Port of TGs conveyors
2016-10-11 20:27:46 -04:00
TheDZD
b108a639b7
Merge pull request #5762 from Fox-McCloud/power-gloves
...
Power Gloves Sound Fix
2016-10-11 16:52:26 -04:00
TheDZD
568e648bfb
Merge pull request #5581 from Fox-McCloud/cloning-update
...
Cloning Update
2016-10-11 16:51:34 -04:00
Markolie
d18ea76311
Fix space pod ion damage
2016-10-11 20:41:46 +02:00
Markolie
570088599e
Mecha damage fix
2016-10-11 20:36:20 +02:00
Markolie
30412c8db1
Cryo tubes no longer expel gas
2016-10-11 18:21:20 +02:00
Fox-McCloud
4df07bd3c3
Power Gloves Sound Fix
2016-10-11 11:51:59 -04:00
TheDZD
e9574ebf4a
Merge pull request #5627 from Fox-McCloud/game-mode-cleanup
...
Removes Unused Gamemodes
2016-10-10 21:00:33 -04:00
TheDZD
0b227c3d5b
Merge pull request #5646 from Fox-McCloud/grenade-tweak
...
Atmos Grenade Balance
2016-10-10 20:54:23 -04:00
Fox McCloud
e698390a4a
Merge pull request #5679 from Crazylemon64/rnd_console_fix
...
Makes the rnd console less prone to freezing
2016-10-10 20:44:19 -04:00
Fox McCloud
e0dd6c37b4
Merge pull request #5684 from shazbot194/master
...
Small fixes for foam force weapons and smg mags
2016-10-10 20:41:17 -04:00
TheDZD
810f2adfb4
Merge pull request #5685 from Fox-McCloud/alert-fixes
...
Fixes Alert Images
2016-10-10 20:38:07 -04:00
Fox McCloud
c943894282
Merge pull request #5706 from Codingale/BloodFix
...
Fixes #5673 (Can not inject blood of compeltely drained bodies)
2016-10-10 20:29:23 -04:00
Fox McCloud
ce04590e25
Merge pull request #5752 from Markolie/antaghud
...
AntagHUD fixes
2016-10-10 20:24:42 -04:00
Fox McCloud
74d475eaeb
Merge pull request #5758 from FlattestGuitar/actualnukiefix
...
Actually fixes the cyberimplants this time
2016-10-10 20:21:24 -04:00
Fox McCloud
1525b0c019
Merge pull request #5760 from Markolie/nukefinish
...
De-snowflakes Dronespeak
2016-10-10 20:21:06 -04:00
TheDZD
20078cbb48
Merge pull request #5755 from Fox-McCloud/loading-fixes
...
Fixes Dual Location Objects with Grinder and Biogenerator
2016-10-10 20:18:24 -04:00
Markolie
92bc8350ad
Handle Drone radio
2016-10-10 23:54:16 +02:00
Markolie
4528e4d469
De-snowflakes Dronespeak
2016-10-10 23:42:31 +02:00
Mieszko Jędrzejczak
a64f1849c0
Actually fixes the implants this time
2016-10-10 12:51:56 +02:00
