Commit Graph

233 Commits

Author SHA1 Message Date
TheDZD
0ac7c0d4cd Merge pull request #3915 from Crazylemon64/multibrain_fix_v2
Fixes multibrain weirdness... Again.
2016-03-17 17:23:59 -04:00
Crazylemon64
09f10f3e98 Fixes multibrain weirdness 2016-03-17 13:44:21 -07:00
TheDZD
723e150d28 Merge pull request #3896 from Fox-McCloud/heart
Heart Tweaks
2016-03-16 21:45:59 -04:00
TheDZD
0f7b5462f4 Merge pull request #3862 from Fox-McCloud/spider-eggs
Implements Infectious Spider Eggs
2016-03-15 20:59:05 -04:00
Fox-McCloud
35607d76da Heart Tweaks 2016-03-15 13:15:09 -04:00
Fox-McCloud
bb9aab416e Fix Eye Augment EMP 2016-03-14 06:20:21 -04:00
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
336ec1fc55 Implements Infectious Spider Eggs 2016-03-13 04:59:37 -04: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
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
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
350086fc85 Merge pull request #3823 from Fox-McCloud/nukies-cybernetics
Implements Nuke Ops Cybernetics
2016-03-11 21:26:44 -05:00
Crazylemon64
23a6c70b7b ahahahaha it finally works 2016-03-10 22:01:07 -08: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
Aurorablade
dcbe168d16 still no. 2016-03-10 22:58:27 -05:00
Aurorablade
0d2640b20e no 2016-03-10 21:48:49 -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
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
Fox-McCloud
b19e558d78 Implements Nuke Ops Cybernetics 2016-03-10 07:10:29 -05:00
Crazylemon64
7301940238 Buffs the nutrition pump to work for repeatable limb regrowth 2016-03-10 01:28:45 -08:00
Aurorablade
d8e8e751de made it so you can end cavity surgery
without having to check or implant something
2016-03-09 21:35:38 -05:00
Aurorablade
e4d9bee2b8 moar fixes 2016-03-09 18:06:08 -05:00
Fox McCloud
10fc58fe50 Merge pull request #3487 from Crazylemon64/slime_fancy_stuff
Fancy Slime People features
2016-03-08 20:18:51 -05:00
Crazylemon64
bfca35a213 Lack of encasement no longer leaves organs vulnerable 2016-03-08 17:11:33 -08:00
Crazylemon64
bdf4b05e16 Switches to a functional #undef statement 2016-03-08 17:05:14 -08:00
Crazylemon64
6c7447c127 Makes the namespacing less ridiculous 2016-03-08 17:00:14 -08:00
Crazylemon64
4f29b1b3ea Namespaced the things and undefined them when done 2016-03-08 16:56:09 -08:00
Aurorablade
7ccad08ee2 removes a palsma thing 2016-03-08 06:26:37 -05:00
Aurorablade
2da40e8ad0 Xeno issue fix. 2016-03-07 20:24:45 -05:00
Crazylemon64
309d9fc9e6 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into slime_fancy_stuff 2016-03-05 02:55:00 -08:00
Fox-McCloud
4316775c1a Surgery Tweaks 2016-03-04 21:47:41 -05:00
Aurorablade
fe3eb50b5e I'M GOING TO OPERATE
OPERATE!
2016-02-29 21:23:25 -05:00
Aurorablade
ac02c8a57d the honk strikes back 2016-02-29 12:00:57 -05:00
Aurorablade
960e5526ad the honkening 2016-02-29 07:09:58 -05:00
Aurorablade
60baa8cdeb futher removes the removed things so we can remove while we remove..
then remove the removes so we can remove
2016-02-27 23:22:29 -05:00
Aurorablade
378c5d03bc removes the removed so we can remove while we remove 2016-02-27 22:51:40 -05:00
Aurorablade
879672466a comment not commenting 2016-02-26 19:17:19 -05:00
Aurorablade
204d8bdb75 Return of the honk 2016-02-26 06:04:09 -05:00
Aurorablade
9fea6b72b8 fixes
honk tumor goes out with a honk, ipc death shinnigans are also on live,
and the xeno organ snowflakle can be fixed later.
2016-02-25 23:25:12 -05:00
Aurorablade
5f98feb0bc meanwhile as i driver tiger INSANE 2016-02-25 16:17:39 -05:00
Aurorablade
71ebef0338 honkkk 2016-02-24 20:39:29 -05:00
Aurorablade
96d713fb45 moved up borer code to another surgery 2016-02-24 08:01:44 -05:00
Aurorablade
c65b411e63 honk
i swear i am getting that adminbus organ to work eventually
2016-02-24 02:54:49 -05:00
Aurorablade
c8aa3083aa fixed
you can now rip an implant out of someones chest...
2016-02-24 01:31:58 -05:00