Commit Graph

12500 Commits

Author SHA1 Message Date
Fox McCloud
8ea7ac01c3 Merge pull request #3838 from Crazylemon64/slime_blood_work_right_dangit
Skeletons, Slime people, and other bloodless races no longer bleed
2016-03-13 21:08:47 -04:00
Fox McCloud
846f6deae5 Merge pull request #3861 from VampyrBytes/SyringeFix
Fixes syringes (#3855)
2016-03-13 21:08:40 -04:00
Fox McCloud
71067d3503 Merge pull request #3864 from Tastyfish/virofix
Fixes virology db entries with bad tabs
2016-03-13 21:06:27 -04:00
Tastyfish
090ccd56f7 Fixes virology db entries with bad tabs 2016-03-13 10:13:45 -04:00
VampyrBytes
906a3185a9 Fixes syringes (#3855) 2016-03-13 08:37:39 +00:00
TheDZD
de8fb4345c Merge pull request #3836 from Fox-McCloud/chem-tweaks
Chem tweaks
2016-03-12 20:20:33 -05:00
TheDZD
df8073f12e Merge pull request #3851 from Fox-McCloud/xeno-fixes
Facehugger and Embryo Fixes
2016-03-12 11:29:45 -05:00
Fox McCloud
5b6851bd5d Merge pull request #3839 from Tastyfish/awaymissions
Fixes some things for away missions, and a few missions themselves
2016-03-12 05:45:20 -05:00
Fox McCloud
ee67a63aca Merge pull request #3841 from Crazylemon64/decloner_re_add
Makes the decloner possible to create again
2016-03-12 05:40:49 -05:00
Fox-McCloud
8ec79caf7f double-processing fix 2016-03-12 05:18:20 -05:00
Fox-McCloud
0dc0ada004 Facehugger and Embryo Fixes 2016-03-12 03:00:54 -05:00
Fox-McCloud
28b285754f teslium 2016-03-11 23:15:00 -05:00
Fox McCloud
29f827b98c Merge pull request #3815 from taukausanake/Green_Mile
Picking up mice was easier than I though...
2016-03-11 22:21:00 -05:00
TheDZD
2cfe7bb3e1 Merge pull request #3821 from Crazylemon64/slime_regrow_buff
Slime people can now regrow their limbs at a lower nutrition cost
2016-03-11 21:28:21 -05:00
TheDZD
bdf26d9910 Merge pull request #3832 from monster860/fuckyougit
Spesspod Mining Laser - "Fuck You Git" edition
2016-03-11 21:27:53 -05:00
TheDZD
350086fc85 Merge pull request #3823 from Fox-McCloud/nukies-cybernetics
Implements Nuke Ops Cybernetics
2016-03-11 21:26:44 -05:00
Fox McCloud
6c48c5cc90 Merge pull request #3824 from Tastyfish/vamppow
Refactors vampire abilities, also some vamp fixes
2016-03-11 21:22:44 -05:00
Fox McCloud
dd02e5ac80 Merge pull request #3831 from FalseIncarnate/botany
Xeno-Botany Quality of Life Changes
2016-03-11 21:22:27 -05:00
Fox-McCloud
b6a6b54ff8 final touchups 2016-03-11 21:13:38 -05:00
monster860
f6ccfc9ae7 Merge branch 'master' into fuckyougit 2016-03-11 06:17:16 -05:00
Crazylemon64
bd2b5f11b6 Makes the decloner possible to create again 2016-03-10 23:27:50 -08:00
Crazylemon64
40012496ff I unborked it 2016-03-10 22:36:20 -08:00
Crazylemon64
23a6c70b7b ahahahaha it finally works 2016-03-10 22:01:07 -08:00
taukausanake
880f115d56 I DID IT!
Added a check for mice in get_scooped(). Shouldn't conflict with pAI but might argue it's "snowflake" code. Well fuck that, it WORKS
2016-03-10 23:58:45 -06:00
Dylan Larkins
c6b6221c6a Remove binary radio message from description
Binary speak ( :b ) was removed from positronic brains, but the message sent to players when initially becoming one still said that they could use it. I've gone ahead and removed that line of the message so people won't get confused.
2016-03-11 00:52:33 -05:00
Tastyfish
5e5083ba23 Fixes some things for away missions, and a few missions themselves 2016-03-11 00:42:22 -05:00
Fox McCloud
b97237b97f Merge pull request #3834 from Aurorablade/SLINGTHRALL
EMERGENCY FIX:SHADOWLING DEHTRALLING
2016-03-11 00:24:50 -05:00
Fox McCloud
9ac4b13f4f Merge pull request #3830 from Aurorablade/specialeyes
MAH BRAND
2016-03-11 00:15:59 -05:00
Aurorablade
610e8ad190 i canspull good 2016-03-11 00:09:23 -05:00
Aurorablade
29c460d64b ARGH 2016-03-10 23:41:18 -05:00
Fox-McCloud
798e81f7ee last touch ups 2016-03-10 23:40:50 -05:00
Fox-McCloud
76ee7168dc part III 2016-03-10 23:03:39 -05:00
Aurorablade
dcbe168d16 still no. 2016-03-10 22:58:27 -05:00
Aurorablade
0d2640b20e no 2016-03-10 21:48:49 -05:00
FalseIncarnate
474dbb6b82 Buildable Xenobotany Machines
A long-requested feature, you can now build the two xenobotany machines
- Lysis-Isolation Centrifuge
- Requires 1 matter bin, 1 scanning module, and 1 console screen
- Upgrading the scanning module causes less degradation when extracting
genes, meaning seeds last longer
- Bioballistic Delivery System
- Requires 1 matter bin, 1 manipulator, and 1 console screen
- Upgrading the manipulator decreases the degradation caused by splicing
genes, meaning you can (theoretically) splice more onto a pack before it
fails
2016-03-10 21:46:07 -05:00
Crazylemon64
d3694a221c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into slime_blood_work_right_dangit 2016-03-10 18:33:19 -08:00
monster860
f4191293eb Spesspod Mining Laser - Fuck You Git edition 2016-03-10 21:24:21 -05:00
Crazylemon
d9d0fff5a2 Exotic blood other than water will work now, and slime people will now
absorb water as blood
2016-03-10 17:13:29 -08:00
Aurorablade
bc1c680352 eyethings 2016-03-10 20:10:09 -05:00
Crazylemon
1eba9a6df1 Skeletons and slime people should no longer bleed "blood" when hit 2016-03-10 17:03:25 -08:00
FalseIncarnate
a0978e6442 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into botany 2016-03-10 19:39:58 -05:00
FalseIncarnate
7f846845f8 Makes Xenobotany User-friendly
Removes the gene masking from xenobotany in favor of more readable
labels.
- No changes to how things work, just removes the obfuscation that
existed simply to make you push a bunch of buttons before you could do
anything meaningful with them.
2016-03-10 19:39:14 -05:00
TheDZD
c00b89e2af Merge pull request #3805 from Fox-McCloud/science-nerf
Heavily Rebalances Science
2016-03-10 19:16:38 -05:00
TheDZD
3f19379196 Merge pull request #3812 from Crazylemon64/godmode_bomb_immune
Godmode provides bomb immunity
2016-03-10 19:07:11 -05:00
Fox-McCloud
b19e558d78 Implements Nuke Ops Cybernetics 2016-03-10 07:10:29 -05:00
Tastyfish
1bb98edc0d Refactors vampire abiliies to be spells 2016-03-10 07:01:31 -05:00
Crazylemon64
7301940238 Buffs the nutrition pump to work for repeatable limb regrowth 2016-03-10 01:28:45 -08:00
Crazylemon64
a647de7a6b Slime people can now regrow their limbs at a lower nutrition cost 2016-03-10 01:19:29 -08:00
Fox McCloud
2abd5acd41 Merge pull request #3813 from Aurorablade/Ialsoownyourspleen
yet more organ fixes
2016-03-10 03:56:30 -05:00
Fox McCloud
37ad1e286c Merge pull request #3806 from Tastyfish/super-fart
Makes super fart mutation act as a spell, instead of via emote
2016-03-10 03:55:04 -05:00