Commit Graph

12456 Commits

Author SHA1 Message Date
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
Crazylemon64
d3694a221c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into slime_blood_work_right_dangit 2016-03-10 18:33:19 -08:00
Crazylemon
d9d0fff5a2 Exotic blood other than water will work now, and slime people will now
absorb water as blood
2016-03-10 17:13:29 -08:00
Crazylemon
1eba9a6df1 Skeletons and slime people should no longer bleed "blood" when hit 2016-03-10 17:03:25 -08:00
TheDZD
c00b89e2af Merge pull request #3805 from Fox-McCloud/science-nerf
Heavily Rebalances Science
2016-03-10 19:16:38 -05:00
TheDZD
3f19379196 Merge pull request #3812 from Crazylemon64/godmode_bomb_immune
Godmode provides bomb immunity
2016-03-10 19:07:11 -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
37ad1e286c Merge pull request #3806 from Tastyfish/super-fart
Makes super fart mutation act as a spell, instead of via emote
2016-03-10 03:55:04 -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
Aurorablade
d8e8e751de made it so you can end cavity surgery
without having to check or implant something
2016-03-09 21:35:38 -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
Crazylemon
d266487298 Godmode provides bomb immunity 2016-03-09 12:34:37 -08:00
Fox-McCloud
bcb0496578 Organ Related Fixes 2016-03-09 05:41:42 -05:00
Tastyfish
985a8323b1 Makes super fart mutation act as a spell, instead of happening every *fart. 2016-03-09 03:36:33 -05:00
Fox-McCloud
3ac2f23377 Heavily Rebalances Science 2016-03-09 02:58:05 -05:00
Tastyfish
19e3b59c86 Fixes some paper scanner stuff 2016-03-09 01:25:31 -05:00
Tastyfish
a65fe9db00 isliving use fix 2016-03-08 23:59:41 -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
Fox McCloud
10fc58fe50 Merge pull request #3487 from Crazylemon64/slime_fancy_stuff
Fancy Slime People features
2016-03-08 20:18:51 -05:00
Fox McCloud
953c4ba1b2 Merge pull request #3786 from TheDZD/WEEEEEOOOOOWEEEEEOOOOOWEEEEEOOOOO
Brings Justice to the Station
2016-03-08 20:14:43 -05:00
Crazylemon64
bfca35a213 Lack of encasement no longer leaves organs vulnerable 2016-03-08 17:11:33 -08:00
Crazylemon64
bdf4b05e16 Switches to a functional #undef statement 2016-03-08 17:05:14 -08:00
Crazylemon64
6c7447c127 Makes the namespacing less ridiculous 2016-03-08 17:00:14 -08:00
Crazylemon64
4f29b1b3ea Namespaced the things and undefined them when done 2016-03-08 16:56:09 -08: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
Crazylemon64
188b4b871f Finalized 2016-03-08 11:04:35 -08:00
Fox McCloud
4ba8c19e8b Merge pull request #3780 from Tastyfish/democracy
Fixes several midround antag/creature assignments not asking ghosts first
2016-03-08 13:28:43 -05:00
Fox McCloud
bb4626e8ce Merge pull request #3782 from Spacemanspark/I-dont-think-Satoshi-Tajiri-intended-for-this
Adds Lazarus Injector emag_act()
2016-03-08 13:28:22 -05:00
Aurorablade
7ccad08ee2 removes a palsma thing 2016-03-08 06:26:37 -05:00
Fox-McCloud
2268e3c39e Implements a Few Goon Sounds 2016-03-07 23:54:12 -05:00
Spacemanspark
c98cda3f55 Re-adds emp_act() to go alongside emag_act() 2016-03-07 19:54:39 -06:00
Aurorablade
2da40e8ad0 Xeno issue fix. 2016-03-07 20:24:45 -05:00
TheDZD
daf0c6bc31 Brings justice to the station 2016-03-07 17:50:41 -05:00
TheDZD
1f29799c76 Merge pull request #3769 from Fox-McCloud/edgy
Gives Mining Drills an Edge
2016-03-07 17:29:52 -05:00
Spacemanspark
80f3b56318 Changes Lazarus Injector's emp_act() to an emag_act() 2016-03-07 11:18:02 -06: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
38fe3b98fb Fixes PDA records apps when records deleted 2016-03-06 19:16:34 -05:00
TheDZD
d0ee1d2caa Merge pull request #3765 from tigercat2000/watchlist
Change Watchlist to use send2adminirc instead of send2irc_adminless_only
2016-03-06 12:58:33 -05:00
Fox-McCloud
488af2ac7a Gives Mining Drills and Edge 2016-03-06 04:33:21 -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
637e930352 Merge pull request #3761 from Fox-McCloud/surgery-tweaks
Surgery Tweaks
2016-03-05 22:47:06 -05:00