Commit Graph

13438 Commits

Author SHA1 Message Date
Crazylemon a7c6ae2871 Chocolate no longer makes people ripperonis 2016-02-01 12:23:05 -08:00
Crazylemon 7795c77abf Tweaks chances 2016-02-01 12:10:08 -08:00
Crazylemon64 1d920c58e8 Makes borer more likely to occur 2016-02-01 11:42:30 -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 7ef6c917a3 Fixes issues caused when you don't need to breathe
Allows oxyloss regen (at normal raste) and turns off oxygen and toxin
hud warnings when you don't need to breathe
2016-02-01 11:11:36 +00:00
VampyrBytes 3e7f1e7499 removes unneeded srcs 2016-02-01 10:26:52 +00:00
Fox McCloud 509e4cad02 Merge pull request #3461 from Tastyfish/suicide-squish
Better species suicide support
2016-02-01 01:54:49 -05:00
Fox McCloud 1b94a5b0b3 Merge pull request #3448 from VampyrBytes/Bugfix-(#3425)
Fixes #3425
2016-01-31 19:16:36 -05:00
TheDZD 4ece68aeed Merge pull request #3437 from Crazylemon64/syndicate_borg_access
Re-adds remote syndicate borg access to places
2016-01-31 18:45:58 -05:00
Tastyfish b3e7e9595b Better species suicide support 2016-01-31 00:41:33 -05:00
Crazylemon64 d75be4d0fd For those who want to get off of Mr Bone's Wild Ride 2016-01-30 20:19:05 -08: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
Aurorablade c4d151ce34 you buy organ, yaya?
Is fresh.
2016-01-30 21:37:55 -05:00
Fox McCloud c2d791a40a Merge pull request #3440 from Crazylemon64/skrell_liver
Skrell's alcohol weakness is tracked on the liver
2016-01-30 21:21:51 -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
Fox McCloud 5f5c0e093a Merge pull request #3435 from FalseIncarnate/master
Magic Eight Ball
2016-01-30 19:11:39 -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
VampyrBytes bb15d5f133 Fixes #3425
There were a couple of things going on... the spawn(-1) which should
have meant that the door shut straight away was being negated by the
sleeps. Also, If the door had just been used, it would still be marked
as operating and so wouldn't shut
2016-01-30 08:49:56 +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 1ff23cd3ca lesser summon guns, wizman update 2016-01-29 09:12:37 -05:00
Crazylemon64 7267f890f6 Re-adds syndicate borg access to places 2016-01-28 23:48:00 -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
FalseIncarnate 98dfd5f90d Magic Eight Ball
Adds in a new toy: Magic Eight Ball!
- Discern your fate with the wondrous Magic Eight Ball!
- Obtainable from Claw Game prize balls

Adds in the mighty MAGIC CONCH SHELL.
- Submit to the will of the all-knowing Magic Conch.
- Admin-spawn only (too powerful)
2016-01-28 23:40:37 -05:00
Crazylemon64 9072a7075d Skrell's alcohol weakness is tracked on the liver 2016-01-28 20:17:00 -08:00
FalseIncarnate 70804d49fc Fixes plants attempting to sting ghosts
Fixes #3427
2016-01-28 21:38:54 -05: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
Fox McCloud 9a2a307ad7 Merge pull request #3426 from Crazylemon64/astral_rune_fix
Having many runes on the same tile will not break astral project
2016-01-28 02:52:46 -05:00
Crazylemon64 0c92ebd701 Having many runes on the same tile will not break astral project 2016-01-27 23:32:57 -08:00
TheDZD dcac23cd46 Merge pull request #3393 from Fox-McCloud/remove-cael-pls
Removes External Shield Generators
2016-01-27 16:49:28 -05: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
Aurorablade 3a39d9d99d end conflict fixes
did i SERIOUSLY upload my comparison file last time? FUCK
2016-01-26 22:46:03 -05:00
Aurorablade b2881bdc94 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-26 21:17:25 -05:00
Aurorablade e9c2d27d09 being conflict fix(3/2)
I SWEAR TO FUCK I NEED TO PAY ATTENTION
2016-01-26 21:16:31 -05:00
Aurorablade 9b5f8445f8 begin conflict fix (2/2) 2016-01-26 21:12:03 -05:00