Fox McCloud
74838a86f8
Merge pull request #3854 from FlattestGuitar/synthanol_3
...
Synthanol Upgrade v2
2016-03-13 21:15:32 -04:00
Mieszko Jędrzejczak
01fbaad358
Holy water is water.
2016-03-14 02:09:11 +01: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
846f6deae5
Merge pull request #3861 from VampyrBytes/SyringeFix
...
Fixes syringes (#3855 )
2016-03-13 21:08:40 -04:00
Mieszko Jędrzejczak
93d3de8496
isSynthetic(), fizzes the fizzes
2016-03-13 10:25:50 +01:00
Fox-McCloud
336ec1fc55
Implements Infectious Spider Eggs
2016-03-13 04:59:37 -04:00
VampyrBytes
906a3185a9
Fixes syringes ( #3855 )
2016-03-13 08:37:39 +00:00
TheDZD
de8fb4345c
Merge pull request #3836 from Fox-McCloud/chem-tweaks
...
Chem tweaks
2016-03-12 20:20:33 -05:00
Mieszko Jędrzejczak
6e49832e57
WHAT IF I WANT MY FROZEN CIDER FIZZY!? (frozen cider does not fizz anymore)
2016-03-12 17:08:31 +01:00
Mieszko Jędrzejczak
f46fce2b24
Fizzes drinks
2016-03-12 15:45:13 +01:00
Mieszko Jędrzejczak
965ec810e7
Holy water glass looks like water, IPC booze makes organics puke, more synth drinks
2016-03-12 15:39:29 +01:00
Fox-McCloud
28b285754f
teslium
2016-03-11 23:15:00 -05:00
Fox-McCloud
b6a6b54ff8
final touchups
2016-03-11 21:13:38 -05:00
Crazylemon64
40012496ff
I unborked it
2016-03-10 22:36:20 -08:00
Crazylemon64
23a6c70b7b
ahahahaha it finally works
2016-03-10 22:01:07 -08:00
Fox-McCloud
798e81f7ee
last touch ups
2016-03-10 23:40:50 -05:00
Fox-McCloud
76ee7168dc
part III
2016-03-10 23:03:39 -05:00
Tastyfish
1bb98edc0d
Refactors vampire abiliies to be spells
2016-03-10 07:01:31 -05:00
Fox McCloud
2abd5acd41
Merge pull request #3813 from Aurorablade/Ialsoownyourspleen
...
yet more organ fixes
2016-03-10 03:56:30 -05:00
Fox-McCloud
1979e47eac
Part 2
2016-03-10 03:07:36 -05:00
Fox-McCloud
2dfe617998
Chem Tweaks
2016-03-10 00:28:49 -05:00
Aurorablade
5805bdb89e
dulls syringes more
2016-03-09 20:33:44 -05:00
Aurorablade
e4d9bee2b8
moar fixes
2016-03-09 18:06:08 -05:00
TheDZD
62afa9d6d3
Merge pull request #3791 from Fox-McCloud/goon-immersion-sounds
...
Implements a Few Goon Sounds
2016-03-09 17:08:05 -05:00
TheDZD
39335b9322
Merge pull request #3808 from Fox-McCloud/fixes
...
Organ Related Fixes
2016-03-09 17:01:50 -05:00
Fox-McCloud
bcb0496578
Organ Related Fixes
2016-03-09 05:41:42 -05:00
Fox-McCloud
bc639a357c
more sounds
2016-03-08 22:35:31 -05:00
TheDZD
4e47626af7
Merge pull request #3767 from Tastyfish/silence
...
Tranquillité, Prospérité & Mimeré
2016-03-08 19:32:29 -05:00
Fox-McCloud
2268e3c39e
Implements a Few Goon Sounds
2016-03-07 23:54:12 -05:00
Tastyfish
d189d70f4a
Adds tranquillite
...
Changes Recitence to be approx on par with Honker
Adds invisible wall barrier
2016-03-06 01:49:30 -05:00
VampyrBytes
1148bde3a6
eating refactor ( #3733 ) + bugfixes
...
Ok, messed up resolving the merge conflicts (first try), so doing a
fresh pr. This turned out to be a good thing, as after I put the changes
back I tested again, and found 2 bugs (not due to my code)
Firstly, the organ refactor had introduced a bug when taking liver
damage from being drunk. It wasn't getting the liver correctly, leaving
it with null, and was then trying to damage it.
The second was related to the amount you took in when drinking
2016-03-05 08:03:39 +00:00
Fox McCloud
ab490f7fd9
Merge pull request #2903 from Aurorablade/OrganRefactor
...
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
2016-03-04 19:51:50 -05:00
Tastyfish
5b76727d73
Changes neurotoxin drink name because of name clash with supertoxin
2016-03-03 15:26:55 -05:00
Fox-McCloud
33f0d59d9d
Ensures there are Potatoes
2016-02-29 07:11:06 -05:00
Tigercat2000
0c9a469f2c
510: HUD, Flash Refactor, Rip out unused pain system
2016-02-28 18:09:43 -08:00
Tastyfish
aed9859b9a
Fixes a bunch of things to not circumvent SetStun/SetWeaken/SetParalyse that has no business doing so.
2016-02-28 01:11:36 -05:00
TheDZD
21b7ccbdba
Merge pull request #3717 from Fox-McCloud/silence
...
Fixes Capulettium Plus
2016-02-26 19:56:54 -05:00
Fox-McCloud
eebdcb693b
Fixes Capulettium Plus
2016-02-26 18:54:44 -05:00
Fox McCloud
bc33bfdda6
Merge pull request #3689 from FalseIncarnate/kitchen
...
Cocoa Spelling and Relative Pathing Cleanup
2016-02-25 17:01:25 -05:00
Aurorablade
5f98feb0bc
meanwhile as i driver tiger INSANE
2016-02-25 16:17:39 -05:00
FalseIncarnate
978722c891
Returns chocolate milk recipe to normal
...
Reverts/fixes an accidental change that would cause issues with making
chocolate bars
2016-02-24 16:44:25 -05:00
FalseIncarnate
d2ae37c540
Cocoa Spelling and Relative Pathing Cleanup
...
Standardized the spelling of "Cocoa", as this was inconsistent
- One spot refers to it as cacao still, but that is because it is in the
legit latin scientific name. Everything else is now cocoa (not coco).
Chocolate now will provide some nutrition (and make you fat if you eat a
lot)
- Cocoa Powder (the arguably main component of chocolate) provided
nutrition, but that nutrition mysteriously vanished when you combine it
with milk and sugar. Now chocolate provides the same nutrition as the
cocoa powder in it
Merged a number of cases where foods had both chocolate and cocoa to now
have just chocolate
- In the case where both were present, the volumes were combined to
maintain food sizes
Renamed cocoa pile to chocolate pile, as this was wrong
- The cocoa pile claimed to be a pure cocoa powder pile, but was
actually just chocolate that was dumped on the floor.
Removed a fair amount of relative pathing, but there's still more to go.
2016-02-24 16:34:23 -05:00
Aurorablade
9a804ebd31
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-24 06:27:16 -05:00
Mieszko Jędrzejczak
2812daf59b
Removed some redundant code that was already under ethanol
2016-02-23 00:55:46 +01:00
Mieszko Jędrzejczak
c184c6a65a
Names. Again.
2016-02-23 00:41:26 +01:00
Mieszko Jędrzejczak
d3573135d2
Fixed fixed spans.
...
Turns out they weren't fixed afterall...
2016-02-23 00:27:05 +01:00
Mieszko Jędrzejczak
2de6d5fbdd
Name to synthanol, again.
2016-02-23 00:02:21 +01:00
Mieszko Jędrzejczak
10202ac78d
Made it child of ethanol
...
Synthanol is now a child of ethanol. Cheers!
2016-02-22 23:19:00 +01:00
Mieszko Jędrzejczak
3aa923b7da
Fixed spans when drinking/feeding
2016-02-22 16:29:55 +01:00
Mieszko Jędrzejczak
90d90f3571
Added files via upload
2016-02-21 18:48:54 +01:00
