Commit Graph

6813 Commits

Author SHA1 Message Date
Fox-McCloud
34e45a656e Unarmed Attack+Martial Arts Update+Golem Refactor 2016-02-11 00:11:20 -05:00
Fox McCloud
9afddc2e06 Merge pull request #3552 from Crazylemon64/fixes_ai_power_hacking
Revamps that weird dialog about hacking the nearest APC to actually work
2016-02-10 17:21:50 -05:00
VampyrBytes
eabd94e844 Changes
Reverts banana peel and soap to slip whilst walking
No longer slip whilst lying down
No longer slip whilst getting in and out of a closet containing a
slippery item
2016-02-10 08:36:19 +00:00
Fox McCloud
4b973163a6 Merge pull request #3548 from Spacemanspark/Spark-plays-too-much-Pokemanz
Adds Pokemon to the game.
2016-02-10 00:51:11 -05:00
Aurorablade
eca3edfec3 LIMBSTUMPS 2016-02-09 18:32:40 -05:00
Crazylemon64
1ba299b289 Revamps that weird dialog about hacking the nearest APC to actually work 2016-02-09 00:59:49 -08:00
Spacemanspark
24afe14a12 Adds in mob capsules 2016-02-08 23:40:53 -06:00
Fox McCloud
7ee63b1e3b Merge pull request #3538 from Tastyfish/cuccumb
Fixed succumb for weird living mobs and maxHealth
2016-02-08 20:04:04 -05:00
Fox McCloud
fbb7714f41 Merge pull request #3532 from Crazylemon64/more_simple_animal_gibs
Lets you gib butterflies and lizards for keks
2016-02-08 20:01:38 -05:00
Fox McCloud
e116dd3cfe Merge pull request #3541 from VampyrBytes/VampPassives
Fixes Vamp Passives (#2812)
2016-02-08 18:23:04 -05:00
VampyrBytes
e526753c75 Fixes Vamp Passives (#2812)
Fixes Vampire thermal vision
Improved regen was working, but the message was commented out due to
spam, it now shows without spamming
2016-02-08 20:44:04 +00:00
Robertha89
df963a6aa5 Adds head patting 2016-02-08 13:35:26 +01:00
Tastyfish
bb0da27fac Optimized div2 2016-02-08 05:02:41 -05:00
Tastyfish
4f40472604 Fixed succumb for weird living mobs and maxHealth 2016-02-08 03:54:58 -05:00
Aurorablade
3b90cb703a almost ready for review 2016-02-08 01:16:13 -05:00
Crazylemon64
45cf159ecf Lets you gib butterflies and lizards for keks
Butterflies don't actually give you meat
2016-02-07 13:34:17 -08:00
Fox McCloud
1d984acda0 Merge pull request #3502 from VampyrBytes/cleanSlips
Cleans up slipping code
2016-02-07 15:11:23 -05:00
KasparoVy
65e3b13d2e Readds Bald Tajaran Hairstyle, Fixes non-Human Masks 2016-02-07 02:10:44 -05:00
Aurorablade
e1899e4af9 almost 2016-02-06 18:42:26 -05:00
Fox McCloud
b5a5ca6e54 Merge pull request #3477 from VampyrBytes/bugfix(#3466)
Bugfix(#3466)
2016-02-06 00:20:25 -05:00
Crazylemon64
bf9b922446 Actually lets you regrow limbs while missing legs 2016-02-04 18:32:14 -08:00
Crazylemon64
53c12176db Removes limb loss, but re-adds breaking bones
Adjusts the fire damage weakness to an environmental cold weakness
2016-02-04 12:43:20 -08:00
VampyrBytes
9d5c754f11 rename argument for clarity 2016-02-04 07:33:35 +00:00
Crazylemon64
c39059c36d Puts reagent recoloring on a toggle that's off by default
Moderates increased burn damage down to 25%
Can now regrow limbs even if you've lost both legs
2016-02-03 22:08:09 -08:00
Crazylemon64
3695799c97 Moves slime core back to head, and organs in a non-encased limb are more likely to take damage from combat now
Are you happy now?
2016-02-03 03:59:23 -08:00
VampyrBytes
de45fc9aba Cleans up slipping code
Puts slipping into one proc rather than being dealt with individually by
each item.

The only changes to functionality here are where it would have been
possible to slip on some items whilst flying. It will make any changes
decided on in #3490 or any future changes far more easy to implement
2016-02-03 09:44:32 +00:00
Crazylemon64
181eb47d8f goodbye, crusty code 2016-02-03 00:42:44 -08:00
Crazylemon64
170df924f4 no git bad
don't eat the suicide messages
2016-02-02 23:18:46 -08:00
Crazylemon64
6324514228 Slows down the rate of slime icon updating, and reduces intensity of color
shift
2016-02-02 22:28:25 -08:00
Crazylemon64
7786a44de5 Makes burning slime limbs leave a burn stump
Also prevents the color shift from triggering at low doses, to prevent
meta-ing that you've been injected with chemicals via the icon flash
whenever the icon is updated.
2016-02-02 21:45:47 -08:00
Crazylemon64
f5884759ed fix my dumb 2016-02-02 18:57:53 -08:00
Crazylemon64
9a688ede48 Mergification. Rebasing is now hopeless 2016-02-02 18:49:11 -08:00
Crazylemon64
b70dff2b0f Makes stump regrowth redistribute the damage 2016-02-02 18:48:05 -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
Crazylemon
4005de8e7d Limb regrowth delay increase as well as visible messages 2016-02-02 18:10:51 -08: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
Aurorablade
6001f3d80c ayyy merge conflicts fix 2016-02-02 20:46:38 -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
Aurorablade
25876fd036 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-02 15:35:54 -05:00
Aurorablade
276e5a0c74 Merge conflicts GO 2016-02-02 15:34:59 -05:00
Tastyfish
c3c3fbe577 existential problem 2016-02-02 14:30:48 -05:00
Crazylemon64
ddb58b704a Slime people change color based off of reagents inside them 2016-02-02 03:15:58 -08:00
Crazylemon64
45b5c1698c Some more changes, limb regrowth works 2016-02-02 01:26:39 -08:00
Crazylemon64
dc4c4977a4 Let's try this again 2016-02-01 21:11:11 -08: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