phil235 95be17923e Merge branch 'master' of https://github.com/tgstation/-tg-station into DisposalStuff ...

Conflicts:
	_maps/map_files/AsteroidStation/Asteroidstation.dmm

2015-07-30 16:34:39 +02:00

..

admin

Merge pull request #10918 from Ikarrus/gangending

2015-07-30 20:49:39 +10:00

assembly

…

awaymissions

Finishes carnmc's shuttle rotation feature.

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

client

Merge pull request #10908 from Jordie0608/sqlstandsforseriouslyquestionablelogic

2015-07-29 21:35:28 +10:00

clothing

Rice hat by scones

2015-07-30 21:13:43 +10: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

…

holiday

buffs out a few of the bigger holidays celibration periods

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

html_interface

…

hydroponics

Rice hat by scones

2015-07-30 21:13:43 +10:00

library

…

lighting

…

mining

Feedback

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

mob

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

2015-07-30 16:34:39 +02:00

nano

…

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

…

power

Merge pull request #10658 from xxalpha/fixsomething

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

procedural mapping

…

projectiles

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

2015-07-26 18:29:51 +10:00

reagents

Merge pull request #10842 from lordpidey/lordpidey-new_chemicals

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

recycling

Fixes non carbon being stunned when thrown and hitting something dense.

2015-07-26 20:40:46 +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

…

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