cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 00:21:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,873 Commits 26 Branches 2 Tags
3dc79d31f7575d2d907123aec2a4d35b9cd91e39
Commit Graph

5996 Commits

Author SHA1 Message Date
Crazylemon64
181eb47d8f goodbye, crusty code 2016-02-03 00:42:44 -08:00
Fox McCloud
b30a0dfacb Merge pull request #3441 from Crazylemon64/squishy_hair 
Squishy Slime Hair Woooooo
 2016-02-02 21:14:54 -05:00
TheDZD
7c11321cd9 Merge pull request #3438 from Crazylemon64/skele_drinks_milk 
Milk is now a strong healing reagent for skeletons
 2016-02-02 21:00:28 -05:00
Fox McCloud
ca27fad887 Merge pull request #3482 from Tastyfish/suicide-squish 
Some more species suicide messages
 2016-02-02 17:47:38 -05:00
Tastyfish
c3c3fbe577 existential problem 2016-02-02 14:30:48 -05:00
Fox McCloud
78d40c3f87 Merge pull request #3449 from VampyrBytes/bugfix(#3414) 
Fixes #3414
 2016-02-02 00:00:55 -05:00
Tastyfish
cb2d166141 Some more species suicide messages 2016-02-01 15:24:32 -05:00
Crazylemon
a7c6ae2871 Chocolate no longer makes people ripperonis 2016-02-01 12:23:05 -08:00
Crazylemon64
029bcc7daa Merge branch 'master' of https://github.com/Crazylemon64/Paradise into skele_drinks_milk 2016-02-01 10:56:40 -08:00
Crazylemon64
0913ea5664 desnowflakes el memerinnos 2016-02-01 10:54:48 -08:00
Crazylemon64
7116ee4987 Merge branch 'species_reagent_reactions' of https://github.com/Crazylemon64/Paradise into skele_drinks_milk 2016-02-01 10:40:39 -08:00
Crazylemon64
2f11aa1b0a Species now can have reagent-specific reactions 2016-02-01 10:29:17 -08:00
Crazylemon64
945dbe0f0e Woo everything's done 2016-02-01 09:19:05 -08:00
VampyrBytes
3e7f1e7499 removes unneeded srcs 2016-02-01 10:26:52 +00:00
Tastyfish
b3e7e9595b Better species suicide support 2016-01-31 00:41:33 -05:00
Crazylemon64
294ad1f2a6 Haven't quite gotten preferences working yet 2016-01-30 20:06:14 -08:00
Tastyfish
c714f14b28 Shuttle fixes 2016-01-30 22:29:42 -05:00
Fox McCloud
26085be1f8 Merge pull request #3439 from Crazylemon64/squishy_limbs_squish 
People with squishy limbs can now squish
 2016-01-30 21:21:30 -05:00
Crazylemon64
ee8042d856 All is clear, ready to go 2016-01-30 12:48:54 -08:00
Tastyfish
7027c217bf Some items has plasma typo in origin tech 2016-01-30 15:04:33 -05:00
VampyrBytes
1a512ccf76 Fixes #3414 
reset's hud warnings during species change so they don't get stuck on
 2016-01-30 09:05:29 +00:00
TheDZD
50d77408f6 Merge pull request #3444 from Fox-McCloud/explosion-damage-refactor 
Refactors Human Explosion Damage
 2016-01-29 23:07:45 -05:00
Fox-McCloud
500cc7b12a apparently, this is a thing 2016-01-29 21:51:09 -05:00
TheDZD
868504bdc4 Merge pull request #3430 from Fox-McCloud/liches 
Adds in Lichdom and Lesser Summon Guns Spells--Wiz Tweaks
 2016-01-29 21:47:10 -05:00
Fox-McCloud
1321158fbf Refactors Human Explosion Damage 2016-01-29 21:45:57 -05:00
Crazylemon64
8f558e6f19 First pass of squishy slime hair 2016-01-29 16:37:46 -08:00
Crazylemon64
0ef973b37e People with squishy limbs can now squish 2016-01-29 10:51:07 -08:00
Crazylemon64
be18146f08 Increases the number of memes in the codebase 2016-01-29 06:36:32 -08:00
Fox McCloud
6a904adc1b Merge pull request #3436 from Crazylemon64/vox_sprite_fix 
Fixes voxxy sprite bug! Yaya!
 2016-01-29 02:13:06 -05:00
Crazylemon64
b47b7063dc Fixes voxxy sprite bug! Yaya! 2016-01-28 23:07:00 -08:00
Fox-McCloud
cfa857cd35 Adds in Lichdom Spell 2016-01-28 18:57:00 -05:00
TheDZD
3c35269615 Merge pull request #3417 from Fox-McCloud/spoopy 
Adds in Skeleton Race
 2016-01-28 16:02:18 -05:00
Crazylemon64
0c92ebd701 Having many runes on the same tile will not break astral project 2016-01-27 23:32:57 -08:00
Fox-McCloud
243fae96c6 flag split 2016-01-27 16:36:43 -05:00
Fox-McCloud
913922b408 Adds in Skeleton Race 2016-01-27 00:45:32 -05:00
Fox McCloud
cf36332734 Merge pull request #3395 from Crazylemon64/snoopy_ghosts 
Ghosts can now see additional machines
 2016-01-26 20:18:50 -05:00
TheDZD
4677f4ed64 Merge pull request #3408 from Fox-McCloud/radiation-fixes 
Fixes Radiation Runtimes
 2016-01-25 23:42:02 -05:00
Fox McCloud
85f524c0fc Merge pull request #3368 from Crazylemon64/mat_eat_tweak 
Humans with matter eater can now grab eat
 2016-01-25 22:43:41 -05:00
Fox McCloud
1438c1435f Merge pull request #3404 from Crazylemon64/stop_right_there_brain_scum 
Brainmobs can no longer ethereal jaunt
 2016-01-25 22:41:44 -05:00
Crazylemon
07a62934e4 Brainmobs can no longer ethereal jaunt 2016-01-25 19:21:40 -08:00
Fox-McCloud
5bd27677f5 Fixes Radiation Runtimes 2016-01-25 20:32:20 -05:00
Crazylemon64
c5cba510f4 No more duplicate shake messages on SSD people 2016-01-25 11:19:43 -08:00
Crazylemon64
7cc514f3b6 Ghosts can look at the drone console, too 2016-01-25 11:05:39 -08:00
Fox McCloud
835eddd600 Merge pull request #3366 from KasparoVy/Starsong-Beret-Fix 
Fixes Vox Robes + Prefs Sec=High Beret Icon Gen. + Sigholt's Beret
 2016-01-24 04:12:41 -05:00
Crazylemon64
5a774922fa Humans with matter eater can now grab eat 
Eating mobs with minds will also generate attack logs
 2016-01-24 00:50:02 -08:00
KasparoVy
f769c9b23b Fixes Vox Robes + Sec Preferences Beret Icon Generation + Sigholt's Beret @ Issue #3364 
Does what it says on the tin
 2016-01-24 02:22:55 -05:00
Fox McCloud
fa5b7e62f7 Merge pull request #3362 from Tastyfish/borg-deactivating 
Fixed borg items spamming user chat every mob tick when on low power
 2016-01-24 01:51:40 -05:00
Tastyfish
fb852462db Fixed borg items spamming user chat every mob tick when on low power 2016-01-23 23:56:06 -05:00
KasparoVy
e9ad3965ce Fixes Underwear Being Overlain by Body Markings 
Gives underwear its own layer above markings, keeps generation pretty
much the exact same.
 2016-01-23 20:16:39 -05:00
Fox-McCloud
fff0590492 Merge remote-tracking branch 'upstream/master' into knife-refactor-cargo-swat 2016-01-23 18:04:02 -05:00