cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-21 23:11:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,680 Commits 28 Branches 2 Tags
8ea7ac01c3619b3134bd4e8ab3f35a22b5ae36d2
Commit Graph

20673 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
Fox McCloud
5abd9d3ea8 Merge pull request #3848 from Tastyfish/tanknozzle 
Allows tank nozzle to be pulled out while on janicart
 2016-03-13 20:42:25 -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
Aurorablade
cb20a1ca4f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DemonicUpdate 2016-03-12 00:57: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
588b533745 Merge pull request #3822 from Fox-McCloud/slot-machine 
Slot Machine Update
 2016-03-11 21:26: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
abe9e54e1b Merge pull request #3842 from Tastyfish/doorprocess 
Makes doors not process unless controlled by an airlock controller
 2016-03-11 21:19:22 -05:00
Fox-McCloud
b6a6b54ff8 final touchups 2016-03-11 21:13:38 -05:00
Tastyfish
033b3d82ab Allows tank nozzle to be pull outable while your hands are free but buckled eg to a janicart 2016-03-11 18:59:56 -05:00
Tastyfish
1030cd1c4d Fixes admin removing vamp 2016-03-11 18:32:37 -05:00
monster860
f6ccfc9ae7 Merge branch 'master' into fuckyougit 2016-03-11 06:17:16 -05:00
Tastyfish
dd248b4bc0 Makes doors not process unless controlled by an airlock controller, fixes fire alarm processing leak 2016-03-11 04:44:39 -05:00
Crazylemon64
bd2b5f11b6 Makes the decloner possible to create again 2016-03-10 23:27:50 -08:00
Aurorablade
848a590930 daemon 2016-03-11 01:48:09 -05: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
0645119e8c Merge pull request #3818 from Crazylemon64/better_sci_objectives 
Modifies science and robotics objectives
 2016-03-11 00:21:17 -05:00
Fox-McCloud
c5aa787a8c because people want shitty things and ask for shitty things and like shitty things they get shitty things 2016-03-11 00:17:56 -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
Tastyfish
b3e1abd884 Rejuventate spelling 2016-03-10 23:32:35 -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
Aurorablade
747dc09999 eyeballs 2016-03-10 20:42:54 -05:00
Aurorablade
70c510280a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DemonicUpdate 2016-03-10 20:19:08 -05:00