Commit Graph

7835 Commits

Author SHA1 Message Date
Aurorablade
2c6a4cabfc screan 2017-09-07 18:37:24 -04:00
Crazy Lemon
75ad492830 Merge pull request #8001 from Birdtalon/flipping-heck
Flips have a chance to fail! How embarrassing...
2017-09-02 19:04:39 -07:00
Fox McCloud
5fdca7b4ec Merge pull request #8009 from matt81093/cyborg_module_patch
Allows medical cyborgs to diagnose IPC's with robutt analyzer
2017-08-28 18:39:55 -04:00
tigercat2000
f747d4948b Merge pull request #7920 from Fox-McCloud/musics
Adds a Bunch of Instruments
2017-08-28 14:21:39 -07:00
Matthew Kelley
88e989e5d2 Allows medical cyborgs to diagnose IPC's 2017-08-24 03:37:10 -05:00
Birdtalon
f5c91f6a70 implied sauce 2017-08-22 21:20:27 +01:00
Birdtalon
b0635fcb43 flips now have a chance to fail! 2017-08-22 21:14:18 +01:00
Fox McCloud
13c112358a Merge pull request #7534 from Kyep/ssd_button
Admin 'List SSDs' verb & cryo option
2017-08-16 19:58:52 -04:00
Fox-McCloud
881c0e9d92 Merge remote-tracking branch 'upstream/master' into musics 2017-08-16 19:12:46 -04:00
Fox-McCloud
cf4735a069 Merge remote-tracking branch 'upstream/master' into HUNKE 2017-08-16 18:36:30 -04:00
tigercat2000
ebabda1223 Merge pull request #7366 from KasparoVy/mob_rgb_to_hex
Converts Mob Colours to Hexadecimal
2017-08-16 12:52:13 -07:00
Fox McCloud
5fa583aaea Merge pull request #7984 from Birdtalon/swarming
AI Damage Sanity check (Prevents swarmers killing it)
2017-08-15 22:27:49 -04:00
Birdtalon
808c35a7ab sanity checking for AI damage 2017-08-15 18:27:17 +01:00
Fox McCloud
4da7fba866 Merge pull request #7986 from Birdtalon/medbutts
Hacky "Fix" for medbot internal beakers
2017-08-14 23:02:27 -04:00
Birdtalon
d19d319eb1 horrible hacky fix 2017-08-14 19:32:18 +01:00
Birdtalon
e3c98f79c4 remove trailing newline 2017-08-14 11:40:46 +01:00
Birdtalon
44aca352cf prevents swarmers from attacking the AI 2017-08-14 11:37:27 +01:00
Birdtalon
ba7c5467c8 allows spiderbots to pass tables 2017-08-12 17:42:03 +01:00
Crazy Lemon
21bd7e7f24 Merge pull request #7919 from Fox-McCloud/hydro-updates
Updates Hydroponics, Nerfs it, Adds Onions
2017-08-06 06:45:36 -07:00
Fox McCloud
1c64b71a5c Merge pull request #7885 from shazbot194/Drone_gibber
Changes the icon for the matter decompiler
2017-08-06 08:39:39 -04:00
Fox-McCloud
b366f5e598 Makes has_brain_worms cheaper 2017-08-04 23:37:17 -04:00
Fox-McCloud
d7da6cb94c Adds a Bunch of Instruments 2017-08-02 03:19:03 -04:00
Crazy Lemon
c85acf0a81 Merge pull request #7875 from Fox-McCloud/sound-update
Sound Update/Refactor
2017-08-01 22:09:46 -07:00
Crazy Lemon
5d85b6697c Merge pull request #7870 from Fox-McCloud/tweaks/fixes/organ/stuff
Various little fixes/refactors
2017-08-01 21:41:13 -07:00
Fox-McCloud
ca49a28f02 Updates Hydroponics, Nerfs it, Adds Onions 2017-08-01 17:58:23 -04:00
Kyep
acc26bdcf2 TRUE and FALSE 2017-07-29 21:59:52 -07:00
Kyep
8aca3fad06 Also prevents mother wandering through, dying, and summoning horde 2017-07-29 21:44:15 -07:00
Kyep
bb089e2056 Prevents TS spiderlings traversing gateawy 2017-07-29 21:39:07 -07:00
Fox-McCloud
99ad3db8ba Fixes Dead Hearts Allowing you to live. 2017-07-29 19:28:38 -04:00
shazbot194
757706db6b Changes the icon for the matter decompiler
^^
2017-07-26 21:22:36 -08:00
Fox-McCloud
f78c507122 Sound Update/Refactor 2017-07-25 20:35:38 -04:00
Fox-McCloud
81d3acb6d6 Merge remote-tracking branch 'upstream/master' into removes-cryobags 2017-07-25 15:21:28 -04:00
Crazy Lemon
e5a6d4a96c Merge pull request #7849 from Fox-McCloud/remove-comments
Removes All Comments about auto-correction and Finddeclaration.exe
2017-07-25 10:41:02 -07:00
Fox McCloud
14da673a8b Merge pull request #7782 from Kyep/emag_syndi_drone
Makes emagged drones more identifiable
2017-07-25 12:26:29 -04:00
Fox-McCloud
8c91244ea8 better 2017-07-25 08:34:35 -04:00
Fox-McCloud
b34c14739b Various little fixes/refactors 2017-07-25 08:15:25 -04:00
Fox McCloud
42818caad9 Merge pull request #7860 from Kyep/corgi_eat_tweak
Ian is no longer Kirby
2017-07-25 06:52:23 -04:00
Crazy Lemon
7a206292d4 Merge pull request #7853 from Fox-McCloud/pointing
Can Point While Lying Down
2017-07-25 03:42:56 -07:00
Crazy Lemon
0d64bdd655 Merge pull request #7854 from Fox-McCloud/stat-improvements
Reduces Stat Calls
2017-07-25 03:40:31 -07:00
Crazy Lemon
d9a64e23bf Merge pull request #7333 from FlattestGuitar/taste-test
Adds a taste system!
2017-07-24 11:53:35 -07:00
Fox McCloud
6eaf1b59c5 Merge pull request #7691 from Kyep/fix_pirate_sentience
Fixes being able to sentience potion pirates & other sentient simple_animals
2017-07-24 10:23:16 -04:00
Kyep
028d885ee0 Fixes Ian being able to spam eat 2017-07-23 16:48:41 -07:00
Fox-McCloud
f924ea15a4 Reduces Stat Calls 2017-07-23 04:56:05 -04:00
Fox-McCloud
46b8b05b10 Can Point While Lying Down 2017-07-23 04:25:46 -04:00
KasparoVy
a6bb591b46 Converts Mob Colours to Hexadecimal
No front-end changes. This just means that mob colours now take up less columns in the database, incur less processing (reduced rgb() calls) and reduces the amount of code dedicated to them.
2017-07-22 19:59:58 -04:00
FlattestGuitar
97c2c10b13 o7 2017-07-22 23:53:46 +02:00
Fox-McCloud
027e7619f5 Removes All Comments about auto-correction and Finddeclaration.exe 2017-07-22 02:54:45 -04:00
Crazy Lemon
6a4e69f741 Merge pull request #7845 from Fox-McCloud/organsss
Fixes IPC and Diona Knockdown Immunity
2017-07-21 23:05:00 -07:00
Fox McCloud
7cda52c713 Merge pull request #7818 from Crazylemon64/item_stumbling
Item stumbling refactor
2017-07-22 01:55:19 -04:00
Fox McCloud
b37c1cf4e7 Merge pull request #7814 from Crazylemon64/many_fixes
Runtime killer v2
2017-07-22 00:39:10 -04:00