cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-26 09:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,833 Commits 28 Branches 2 Tags
1d2bfbf044cf5727bc3d30cd4fe856866105746f
Commit Graph

255 Commits

Author SHA1 Message Date
TheDZD
609efbc2db Merge pull request #3933 from Fox-McCloud/fixes-hivenod 
Fixes Xeno Hive Node Languages
 2016-03-20 12:50:11 -04:00
Fox-McCloud
e0665336e0 Fixes Xeno Hive Node Languages 2016-03-20 03:16:22 -04:00
Crazylemon64
f8d19fa9e9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into mitocholide_organ_rejuv 2016-03-18 20:17:39 -07:00
Crazylemon64
eb04645aea Fixes fox's thing 2016-03-18 20:16:02 -07:00
Fox McCloud
d4b2782f4b Merge pull request #3849 from Aurorablade/BeepBeep 
god its late Fixes #3908
 2016-03-18 21:40:53 -04:00
Fox McCloud
0d24763e35 Merge pull request #3920 from Crazylemon64/cleaner_dna_application 
Makes DNA swapping methods more reliable and other appearance tweaks
 2016-03-18 21:37:20 -04:00
Aurorablade
ac5968fb84 I FORGOT THE FEEET! 2016-03-18 21:25:31 -04:00
Aurorablade
b9fd5042f6 look ma, hands.... 2016-03-18 21:13:29 -04:00
Aurorablade
72344f082d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BeepBeep 2016-03-18 20:59:01 -04:00
Aurorablade
ff798ae9ec This is the exact file from the master branch of the Repo 2016-03-18 20:53:28 -04:00
Aurorablade
83d3e392ae Revert "OMG CONFLICT R GRIFFING ME HALP" 
This reverts commit fd65c752bf.
 2016-03-18 20:40:54 -04:00
Aurorablade
fd65c752bf OMG CONFLICT R GRIFFING ME HALP 2016-03-18 20:32:36 -04:00
Crazylemon64
d41ab52515 Stop eating my changes 2016-03-18 11:16:21 -07:00
Crazylemon64
3077a397de Adds necrotic organ detection to the advanced med scanner 2016-03-18 11:14:13 -07:00
Aurorablade
bffb90d392 removes somethings... 2016-03-18 14:06:36 -04:00
Crazylemon64
33f6facdb4 Organs can now be made viable again with an application of mitocholide 2016-03-18 09:14:35 -07:00
Crazylemon64
d748ef23b8 Makes DNA swapping methods more reliable 
- Makes heads keep hair on removal
- Amputated limbs from a DNA-injected individual now will keep their
  appearance of the DNA-injected person
- Wounds will now vanish on their own now
- Admins now have an "incarnate" option on the player panel when viewing
  ghosts for quick player instantiation
- Fixes a runtime regarding failing a limb reconnection surgery
- Copying a client's preferences now overrides the previous mob's DNA
 2016-03-17 23:07:45 -07:00
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
Aurorablade
4a2bd5cc16 infection surgery edit 2016-03-17 02:09:41 -04: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
Aurorablade
13184b27e7 fixesd an issue with some eyes 2016-03-15 02:26:50 -04:00
Aurorablade
84caa73a3c rrollback 2016-03-14 23:45:47 -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
Aurorablade
2eaff84f42 mogjtbosdopm ues 2016-03-13 08:08:15 -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
Aurorablade
a653dfd69d god its late 2016-03-12 00:49:36 -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