Commit Graph

14447 Commits

Author SHA1 Message Date
KasparoVy
b8c6e5c6e5 Fixes 2 Bugs with PR #5416
First bug: Changing your alt head in CMA wouldn't update it correctly.
You had to proc update_body(1, 1) twice in order to do it because of
where the head_organ.handle_alt_icon() proc call was placed in
organ_icons. Resolved

Second bug: Lack of sanity and inability to select head marking styles
with "all" alt heads allowed. Resolved
2016-10-23 23:14:53 -04:00
Fox McCloud
45ba4d157a Merge pull request #5416 from KasparoVy/tail_markings_mark2
Marking Refactor, Adds tail markings + Alt heads + Secondary (F)Hair themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
2016-10-23 19:29:54 -04: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
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
Fox McCloud
570b9b7ec0 Merge pull request #5793 from FlattestGuitar/names
Remember the clown names? Heee.....
2016-10-19 17:10:59 -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
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
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
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
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
Fox McCloud
45974cf6bd Merge pull request #5721 from FalseIncarnate/bug_fix
Arcade duplication fix
2016-10-09 14:17:59 -04:00
Fox-McCloud
f7f1e493ed Fixes Dual Location Objects with Grinder and Biogenerator 2016-10-09 14:04:52 -04:00
Fox McCloud
0646ace084 Merge pull request #5641 from LittleBigKid2000/numbers-in-char-names
Character names can now have numbers
2016-10-09 12:58:42 -04:00
Fox McCloud
ab8f0d7b5d Merge pull request #5753 from Markolie/master
AI fixes
2016-10-09 12:41:48 -04:00
Fox McCloud
f5b1fd6011 Merge pull request #5744 from FlattestGuitar/unequip
NODROP items won't spam horribly when being held with a broken hand.
2016-10-09 12:41:09 -04:00
Markolie
8a2a9ee3b0 Fixes multiple holograms being active at the same time, fixes AI's being unable to set wanted status. 2016-10-09 18:20:20 +02:00
Fox McCloud
24fa19782b Merge pull request #5748 from FlattestGuitar/cluwnefix
Fixes clowns getting their old name in the assasinate objective :v
2016-10-09 11:54:40 -04:00
Markolie
514222b6d7 Fixes silicons not having their antag powers/antagHUD removed properly. Fixes traitors/abductors not having their antagHUD added at roundstart. 2016-10-09 16:36:09 +02:00
FlattestGuitar
f07f476a3c Fixes cluwnes forever 2016-10-07 10:56:36 +02:00
FlattestGuitar
176d6cffae no more nodrop spam 2016-10-05 15:44:01 +02:00
Isaac Erwin
0cc8a94d5d Fine 2016-10-04 17:49:42 -04:00
Fox McCloud
0b2b631b68 Merge pull request #5735 from FlattestGuitar/rutime-fix
Fixes a hallucination runtime
2016-10-02 10:47:41 -04:00
Mieszko Jędrzejczak
89dff895bb makes it work 2016-10-02 00:48:31 +02:00
Mieszko Jędrzejczak
5296df4473 adds a neat uniform 2016-10-01 22:02:27 +02:00
Fox McCloud
f824a540a8 Merge pull request #5701 from Crazylemon64/maploader_missing_file_yell
Map reader now yells when given bad path/empty file
2016-09-29 13:16:51 -04:00
FalseIncarnate
977950b1c2 type-check instead of variable check 2016-09-28 18:57:43 -04:00
Crazylemon64
11a37ae960 Should make the rnd console less prone to freezing
"wait_message" is now guaranteed to be unset provided that the timer
controller doesn't go down, and it'll be reset anyways by the `spawn` if
nothing runtimes in there
2016-09-27 14:12:15 -07:00
FalseIncarnate
755b282b6d Arcade duplication fix
Arcade machines should no longer spawn additional arcade machines after
spawning additional arcade machines after spawning additional...
2016-09-26 23:48:50 -04:00
KasparoVy
3e653a6279 Conflict resolution. 2016-09-26 12:17:35 -04:00