Jordie 500fed3b88 Merge pull request #10895 from xxalpha/revert-10887-revert-10826-cyberplus ...

Revert "Revert "Removed anti-drop implant from NukeOps uplink.""

2015-07-29 18:21:12 +10:00

..

admin

Merge pull request #10880 from Fayrik/GotTooManyBranches

2015-07-29 18:05:54 +10:00

assembly

Fixes proc arguments

2015-07-15 23:52:35 +02:00

awaymissions

Finishes carnmc's shuttle rotation feature.

2015-07-20 04:28:45 -07:00

client

Fixes the lizard gender issue.(updated version of SvartaSvansen's PR.

2015-07-27 15:30:06 +02:00

clothing

Merge pull request #10752 from phil235/HailerOverload

2015-07-23 13:51:45 -03:00

crafting

Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire

2015-07-21 05:32:08 -07:00

detectivework

Adds molotov creation recipe via tablecrafting, requring a drink bottle and a rag

2015-07-19 04:12:30 -07:00

emoji

…

events

Cats and pugs now respond when you pet them. Pugs and corgis are now under the same dog parent, and all dog code is moved to dog.dm (corgi.dm and pug.dm no longer exist). Updates pathing across all areas of code and on all included maps. Fixes a minor pet collar naming bug.

2015-07-23 10:49:06 -04:00

flufftext

Added a new medication, Miner's Salve

2015-07-24 19:04:55 -04:00

food&drinks

Add some logging to molotov

2015-07-27 20:18:50 +12:00

games

Fixes proc arguments

2015-07-15 23:52:35 +02:00

holiday

buffs out a few of the bigger holidays celibration periods

2015-07-24 13:21:02 -04:00

html_interface

Modifications to crew monitoring computer, procqueue and html_interface.

2015-07-12 13:37:18 +02:00

hydroponics

Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire

2015-07-21 05:50:02 -07:00

library

Fixes proc arguments

2015-07-15 23:52:35 +02:00

lighting

Fixes proc arguments

2015-07-15 23:52:35 +02:00

mining

Feedback

2015-07-26 20:11:03 +02:00

mob

Merge pull request #10841 from phil235/MobSwapFix

2015-07-29 17:23:37 +10:00

nano

Fixes proc arguments

2015-07-15 23:52:35 +02:00

ninja

Merge pull request #10798 from MrPerson/exceptions_to_help_phil_fix_potential_bugs_and_also_aran_maybe

2015-07-25 19:22:46 +10:00

paperwork

Fixes proc arguments

2015-07-15 23:52:35 +02:00

power

Merge pull request #10658 from xxalpha/fixsomething

2015-07-23 01:50:05 +02:00

procedural mapping

Fixes proc arguments

2015-07-15 23:52:35 +02:00

projectiles

Merge pull request #10659 from phil235/HandcuffOverlayFix

2015-07-23 22:21:52 +10:00

reagents

Merge pull request #10842 from lordpidey/lordpidey-new_chemicals

2015-07-29 17:22:31 +10:00

recycling

Fixes proc arguments

2015-07-15 23:52:35 +02:00

research

Dumb byond stuff fixed and merge conflict fixed for the gazillionth time.

2015-07-25 16:19:21 -07:00

scripting

Change many ERROR() calls into thrown exceptions

2015-07-23 08:19:08 -07:00

security levels

Fixes proc arguments

2015-07-15 23:52:35 +02:00

shuttle

Merge pull request #10798 from MrPerson/exceptions_to_help_phil_fix_potential_bugs_and_also_aran_maybe

2015-07-25 19:22:46 +10:00

surgery

Revert "Revert "Removed anti-drop implant from NukeOps uplink.""

2015-07-27 18:47:56 +01:00

telesci

Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix

2015-07-19 21:53:39 +02:00