Commit Graph

12705 Commits

Author SHA1 Message Date
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
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
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
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
Fox-McCloud
900211db2f pill limit 2016-03-26 01:03:24 -04:00
Tastyfish
c7a2ce2d09 Makes chatrooms only work if working telecomms on level 2016-03-25 18:30:40 -04:00
Fox-McCloud
035b11a1b6 Robotics Sterile Surgery 2016-03-25 14:07:34 -04:00
TheDZD
ea4db4963d Makes coffee less addictive, and fake cheese non-addictive 2016-03-25 14:02:43 -04:00
KasparoVy
c871629eca Slime People can now use Underwear and Undershirts, Fixes 2016-03-24 20:05:35 -04:00
Fox-McCloud
b56aeb9cd8 Chem Fire+Brute Fixes 2016-03-24 19:51:51 -04:00
TheDZD
85e8ec4ab8 Merge pull request #3985 from Tastyfish/pdafix23
Fixes doing the pda chat link things while sleepy/dead
2016-03-24 18:17:49 -04:00
Tastyfish
d7d659bd4d Fixes doing the chat box things while sleepy 2016-03-24 18:04:14 -04:00
Fox-McCloud
5194cf773a fixes 2016-03-24 17:50:34 -04:00
Fox McCloud
558d3a82a2 Merge pull request #3967 from Crazylemon64/shoulda_added_notifications
Adds notification to admin ghost incarnation
2016-03-24 13:06:07 -04:00
Fox McCloud
80b79f1752 Merge pull request #3975 from Tastyfish/rename-self
Improves rename_self() aka namepick
2016-03-24 13:05:56 -04:00
Fox McCloud
6716d6ec4e Merge pull request #3970 from Tastyfish/sdqlmore
Even more SDQL things
2016-03-24 13:05:46 -04:00
Fox McCloud
070bc9a453 Merge pull request #3983 from Crazylemon64/googlecode_what_were_you_on
Fixes organs and cyborg upgrades popping up in your screen
2016-03-24 13:05:05 -04:00
Fox McCloud
aac7986622 Merge pull request #3972 from FlattestGuitar/confetti_2_sigh
Adds party grenades
2016-03-24 13:03:34 -04:00
Crazylemon64
f1184367b5 Fixes the cyborg module icon loss, and fixes module icons
for engineering, and various other cyborg models.

Brobot gets a special module icon.
2016-03-23 22:49:13 -07:00