Commit Graph

12725 Commits

Author SHA1 Message Date
ProperPants bca3c683e2 Cyborg versions of stacks that didn't already have them. Increased cyborg starting rods to one full stack (60 rods). 2016-03-30 20:55:57 -04:00
TheDZD cc6e89ace8 Merge pull request #4030 from Fox-McCloud/advanced-camera-port
Ports Advanced Cameras
2016-03-30 18:48:16 -04:00
Fox-McCloud 9127c357e9 further thingssssssssssssssssssssssss 2016-03-30 18:17:55 -04:00
Fox McCloud d83391fa68 Merge pull request #4005 from FlattestGuitar/alcohol
Alcohol percentages!
2016-03-30 16:44:41 -04:00
Fox McCloud ec9a7a486d Merge pull request #3927 from Crazylemon64/metal_foam_space_flooring
Metal foam walls will now also produce plating on space tiles
2016-03-30 16:26:56 -04:00
Fox McCloud 0f8085e1d8 Merge pull request #3980 from Aurorablade/ArtsAndCrafts
Fethas Carnival of Horrors:Rusty Iron Chef
2016-03-30 16:25:27 -04:00
Fox-McCloud c345b8a761 forcemove 2016-03-29 21:36:58 -04:00
TheDZD 4e5dca681b Merge pull request #4024 from Tastyfish/clickyclick
Makes clicking a filled inventory slot's square be treated like clicking the item
2016-03-29 17:14:39 -04:00
TheDZD feec3ea1d8 Merge pull request #4025 from tigercat2000/20slots
Change max character slots to 20
2016-03-29 17:14:20 -04:00
TheDZD efab653008 Merge pull request #4021 from Fox-McCloud/toy-tyrant
Ends Science's Toy Tyranny
2016-03-29 17:13:57 -04:00
Fox-McCloud 6648175a63 Ports Advanced Cameras 2016-03-29 06:05:59 -04:00
Crazylemon64 d113fc63e9 Removes dumbness 2016-03-28 23:47:50 -07:00
Crazylemon64 7aa519723b Merge branch 'master' of https://github.com/Crazylemon64/Paradise into metal_foam_space_flooring 2016-03-28 23:13:43 -07:00
Crazylemon64 00a39f5c83 Fixes stuff and stuff 2016-03-28 23:03:17 -07:00
Fox McCloud 65eab3d8c8 Merge pull request #4017 from ProperPants/WorkingBranch
Additions to Engineering Cyborg and Maintenance Drones
2016-03-29 00:17:23 -04:00
ProperPants c1affcd02b Cyborg versions of some stuff.
Added a line in some commentary that should have been there, but wasn't.
2016-03-28 23:36:03 -04:00
TheDZD e827881c01 Merge pull request #4029 from Fox-McCloud/puke-fix
Puke Fix
2016-03-28 22:46:18 -04:00
TheDZD 5c800cec04 Merge pull request #4010 from Fox-McCloud/lusty-xeno-maid
Ports Lusty Xenomorph Maid
2016-03-28 22:45:41 -04:00
ProperPants 937a4c7479 Forgot something else 2016-03-28 22:42:12 -04:00
Fox-McCloud c2fe562ad2 Puke Fix 2016-03-28 22:39:53 -04:00
Fox-McCloud 6b5e1904f5 tweaks 2016-03-28 22:28:19 -04:00
ProperPants b5c073e58b Removes plasteel from drones and borgs. 2016-03-28 21:32:46 -04:00
TheDZD afcdb0c40a Merge pull request #4011 from Fox-McCloud/xeno-brain-fix
Xeno Brain Fixes
2016-03-28 17:45:49 -04:00
ProperPants 0d9fc37065 Forgot a comma. 2016-03-28 17:16:31 -04:00
ProperPants f8f132d2f1 Should make robots unable to build anything out of plasteel and only plasteel. Here's hoping. 2016-03-28 17:06:38 -04:00
Fox McCloud 77fe56d9b9 Merge pull request #4023 from Tastyfish/progress
Ports tg's smooth progress bars
2016-03-28 16:55:37 -04:00
Tigercat2000 0a44d41005 Change max character slots to 20 2016-03-28 08:57:42 -07:00
Tastyfish 53728f95fe Clicking a filled inventory slot's background is now treated like clicking the item. 2016-03-28 05:24:00 -04:00
Tastyfish d37f077e2c Ports tg smooth progress bars 2016-03-28 04:40:36 -04:00
Tastyfish 08da2260a0 Ports tg's smooth progress bars 2016-03-28 04:24:26 -04:00
Tastyfish 24679ae276 Makes Poly use the say/radio prefix system correctly 2016-03-28 03:29:23 -04:00
Fox-McCloud 70d97b6e44 Ends Science's Toy Tyranny 2016-03-28 01:25:12 -04:00
ProperPants f928b62492 Surprise commit. Fixed my borking of engi borg reduced cable coil. Removed plasteel from engi borg. Formatting fixes. 2016-03-27 23:23:38 -04:00
ProperPants f79d33d47b This should add magboots and plasteel to maintenance drones. This should also add plasteel to engineers, and make synthetics capable of using plasteel. 2016-03-27 21:26:45 -04:00
KasparoVy 2825de2173 Allows you to close incisions made within embedded object removal surgery. 2016-03-26 23:35:24 -04:00
Fox-McCloud 57a7680d8e Xeno Brain Fixes 2016-03-26 20:56:42 -04:00
Fox-McCloud f215ab650f Ports Lusty Xenomorph Maid 2016-03-26 20:29:37 -04:00
TheDZD 2b462793ef Merge pull request #3963 from Fox-McCloud/dental-implants
Ports Dental Implants
2016-03-26 17:38:29 -04:00
TheDZD cc98621757 Merge pull request #3986 from Fox-McCloud/shadowling-update
Shadowling update
2016-03-26 17:38:19 -04:00
TheDZD 6c130db64b Merge pull request #3998 from Fox-McCloud/surgery-robotics
Robotics Sterile Surgery
2016-03-26 17:33:31 -04:00
Fox McCloud b19e870570 Merge pull request #3996 from Tastyfish/chatroom-fix-234132423
Makes chatrooms only work if telecomms is functional at location
2016-03-26 17:30:27 -04:00
Fox McCloud ca0709909a Merge pull request #3997 from TheDZD/addicted-to-slaughtering-RNG-bullshit
Makes Coffee Less Addictive and Fake Cheese Non-addictive
2016-03-26 17:30:10 -04:00
Mieszko Jędrzejczak f79ef6deca Does the same thing to synthanol 2016-03-26 22:14:31 +01:00
Mieszko Jędrzejczak 1a30fa8478 Removes an old bit of code. 2016-03-26 22:07:08 +01:00
Fox McCloud 3a77748aec Merge pull request #4004 from Tastyfish/wiznerd
Fixes Timestop Spell
2016-03-26 15:41:17 -04:00
Tastyfish 9d9639dff6 Fixes AI doing stuff while out of power or dead 2016-03-26 15:34:01 -04:00
Mieszko Jędrzejczak a04ef39c9d Whoops 2016-03-26 14:45:57 +01:00
Mieszko Jędrzejczak dbff5d765d Adds proper ethanol percentages to stuff. 2016-03-26 14:39:00 +01:00
Tastyfish 077395f606 Fixes Timestop 2016-03-26 08:37:50 -04:00
Fox McCloud 1cdc406d7d Merge pull request #3989 from KasparoVy/slime-undies
Slime People can now use Underwear and Undershirts, Fixes #3966
2016-03-26 01:09:01 -04:00