Commit Graph

5256 Commits

Author SHA1 Message Date
Crazylemon64
09f06ff6fc Metal foam walls will now also produce plating on space tiles 2016-03-18 16:25:19 -07:00
TheDZD
85e2f1f0ab Merge pull request #3898 from Fox-McCloud/addiction-rework
Addiction Rework
2016-03-16 21:46:18 -04:00
TheDZD
723e150d28 Merge pull request #3896 from Fox-McCloud/heart
Heart Tweaks
2016-03-16 21:45:59 -04:00
TheDZD
be3c313189 Merge pull request #3887 from Fox-McCloud/bag-of-holding
Bag of Holding Tweak
2016-03-16 21:45:52 -04:00
Fox McCloud
2881d18903 Merge pull request #3892 from Tastyfish/crayon-ear
Allows crayon to be put on ear
2016-03-16 18:11:16 -04:00
Fox-McCloud
efe1871595 Addiction Rework 2016-03-15 18:36:29 -04:00
Fox-McCloud
35607d76da Heart Tweaks 2016-03-15 13:15:09 -04:00
Fox McCloud
0f2d8b1465 Merge pull request #3886 from Tastyfish/megaphone-fix
Fixes megaphone
2016-03-15 11:19:23 -04:00
Fox McCloud
6dfbcb5dcc Merge pull request #3871 from Tastyfish/chronx2
fluff tweaks
2016-03-15 11:17:15 -04:00
Fox McCloud
0f668a9118 Merge pull request #3863 from Crazylemon64/env_smash_girder_destroy
Lets environment smashers smash through girders
2016-03-15 11:15:58 -04:00
Tastyfish
68ce0246d4 Allows crayon to be put on ear 2016-03-15 08:30:18 -04:00
Fox-McCloud
1af9e77382 Bag of Holding Tweak 2016-03-14 19:02:56 -04:00
Tastyfish
fd7b8f3c3f Fixes megaphone 2016-03-14 18:49:28 -04:00
Tigercat2000
b397ac11a8 RAAAAAAAAAAWR. 2016-03-14 15:01:27 -07:00
Tastyfish
96e0d10f8e flavor tweaks 2016-03-14 05:26:05 -04:00
Tastyfish
c3de0cf196 Removes picture frames 2016-03-14 04:35:35 -04:00
TheDZD
2254815612 Merge pull request #3857 from Fox-McCloud/xeno-tweaks
Xeno Tweaks and Fixes
2016-03-13 22:47:54 -04:00
Fox McCloud
5abd9d3ea8 Merge pull request #3848 from Tastyfish/tanknozzle
Allows tank nozzle to be pulled out while on janicart
2016-03-13 20:42:25 -04:00
Crazylemon64
b27b58ce8f Lets environment smashers smash through girders 2016-03-13 04:33:59 -07:00
Fox-McCloud
43ed8e8f0e whoops 2016-03-12 21:58:50 -05:00
Fox-McCloud
57b6475248 Xeno Tweaks and Fixes 2016-03-12 21:50:06 -05:00
TheDZD
de8fb4345c Merge pull request #3836 from Fox-McCloud/chem-tweaks
Chem tweaks
2016-03-12 20:20:33 -05: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
0dc0ada004 Facehugger and Embryo Fixes 2016-03-12 03:00:54 -05:00
Fox McCloud
6c48c5cc90 Merge pull request #3824 from Tastyfish/vamppow
Refactors vampire abilities, also some vamp fixes
2016-03-11 21:22:44 -05:00
Fox-McCloud
b6a6b54ff8 final touchups 2016-03-11 21:13:38 -05:00
Tastyfish
033b3d82ab Allows tank nozzle to be pull outable while your hands are free but buckled eg to a janicart 2016-03-11 18:59:56 -05:00
TheDZD
c00b89e2af Merge pull request #3805 from Fox-McCloud/science-nerf
Heavily Rebalances Science
2016-03-10 19:16:38 -05:00
Tastyfish
1bb98edc0d Refactors vampire abiliies to be spells 2016-03-10 07:01:31 -05:00
Fox McCloud
87155ff7d3 Merge pull request #3802 from Tastyfish/chronx100
Donator Fluff Items: Chaplain Edition
2016-03-10 03:54:19 -05:00
Fox-McCloud
2dfe617998 Chem Tweaks 2016-03-10 00:28:49 -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
Fox-McCloud
3ac2f23377 Heavily Rebalances Science 2016-03-09 02:58:05 -05:00
Tastyfish
959b71ca37 Adds fluff items for chronx100 2016-03-08 23:15:13 -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
81dc227745 Merge pull request #3789 from Aurorablade/IOwnYourKidneys
Organ fixes
2016-03-08 18:50:03 -05:00
Fox McCloud
9660d08fa0 Merge pull request #3762 from VampyrBytes/EatingRefactor
eating refactor (#3733) + bugfixes
2016-03-08 17:28:57 -05:00
TheDZD
817f834841 Merge pull request #3779 from Fox-McCloud/gibbing-sounds
Implements Goon's Gibbing Sounds
2016-03-08 17:05:57 -05:00
Fox-McCloud
2268e3c39e Implements a Few Goon Sounds 2016-03-07 23:54:12 -05:00
Aurorablade
2da40e8ad0 Xeno issue fix. 2016-03-07 20:24:45 -05:00
Tastyfish
0e0225b1ee Fixes several midround antag assignments not asking ghosts first 2016-03-07 03:03:45 -05:00
Fox-McCloud
221ff8ee08 Implements Goon's Gibbing Sounds 2016-03-06 23:05:07 -05:00
Tastyfish
738e81f8df A couple tweaks to the mime stuff 2016-03-06 04:57:03 -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
TheDZD
4b610d8dda Merge pull request #3758 from Fox-McCloud/remove-halloss
Removes Halloss
2016-03-05 22:39:19 -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
Fox-McCloud
4d9627e986 Removes Halloss 2016-03-03 23:26:41 -05:00
Crazylemon
8e63a9eea3 Merge branch 'master' of github.com:ParadiseSS13/Paradise into human_icons_tweak 2016-03-03 16:20:15 -08:00