Crazylemon
21fbad04bb
Fixes the RIPLEY objective, and changes R&D's objective
...
to ship disks to cargo
2016-03-09 13:36:18 -08:00
Tastyfish
19e3b59c86
Fixes some paper scanner stuff
2016-03-09 01:25: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
d6c71b4469
Reverts the fix to the progress bar proc
2016-03-08 17:04:18 -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
32cbcec7c1
Merge pull request #3784 from monster860/fixspacepodspacetransition
...
Fix space pod transitions
2016-03-08 19:36:03 -05:00
TheDZD
4e47626af7
Merge pull request #3767 from Tastyfish/silence
...
Tranquillité, Prospérité & Mimeré
2016-03-08 19:32:29 -05:00
TheDZD
12d7d5660f
Replaces flag check with canUnEquip
2016-03-08 18:52:44 -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
monster860
2f3a3633bd
Made it faster
2016-03-08 10:55:14 -05:00
Aurorablade
7ccad08ee2
removes a palsma thing
2016-03-08 06:26:37 -05:00
Fox McCloud
ee552629ab
Merge pull request #3794 from Tastyfish/ragin
...
Fixes ragin mages ending after 1 mage
2016-03-08 03:44:12 -05:00
Tastyfish
3665631c9f
Fixes ragin mages ending after 1 mage
2016-03-08 03:19:07 -05:00
Aurorablade
c407b3ee9e
fixes recharger and no drop
2016-03-08 01:34:09 -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
monster860
8ead04b960
Fix space pod transitions ( #2230 )
2016-03-07 16:23:40 -05:00
Tastyfish
2d11b519e1
Removes players from pollCandidates consideration that have enabled antag hud
2016-03-07 16:21:09 -05:00
Spacemanspark
80f3b56318
Changes Lazarus Injector's emp_act() to an emag_act()
2016-03-07 11:18:02 -06:00
Tastyfish
636346f8ea
Moves space pods to goonstation license folder
2016-03-07 04:05:47 -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
Fox McCloud
c3285d20ef
Merge pull request #3777 from Tastyfish/wiznerd
...
Fixes lich spell preventing round end when viewed in the spellbook
2016-03-06 22:13:26 -05:00
Tastyfish
422a2e6ed4
Fixes lich spell preventing round end when viewed in the spellbook
2016-03-06 21:59:48 -05:00
Fox McCloud
92835e7493
Merge pull request #3776 from Tastyfish/lays-potato-layers
...
Fixes /datum/events, and by proxy the cable layer
2016-03-06 20:19:22 -05:00
Tastyfish
a4e3fc7905
Fixes /datum/events, and by proxy the cable layer
2016-03-06 20:08:37 -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
Tastyfish
ee32984535
Silences mime RCD
2016-03-06 07:18:17 -05:00
Tastyfish
738e81f8df
A couple tweaks to the mime stuff
2016-03-06 04:57:03 -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
TheDZD
4b610d8dda
Merge pull request #3758 from Fox-McCloud/remove-halloss
...
Removes Halloss
2016-03-05 22:39:19 -05:00
Tigercat2000
27c7810e04
Change Watchlist to use send2adminirc instead of send2irc_adminless_only
2016-03-05 11:44:26 -08:00
Crazylemon64
f8769ff542
Abandoned by time, I finally synchronize with the present.
2016-03-05 02:59:53 -08:00
Crazylemon64
309d9fc9e6
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into slime_fancy_stuff
2016-03-05 02:55:00 -08: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
4316775c1a
Surgery Tweaks
2016-03-04 21:47:41 -05:00
