Pete Goodfellow c7c3bd48de Merge branch 'master' of github.com:tgstation/-tg-station into assemblyfun ...

Conflicts:
	code/game/objects/items/weapons/grenades/chem_grenade.dm
	html/changelog.html

2013-06-15 18:58:11 +01:00

..

admin

Merge pull request #552 from dumpdavidson/monkeyize

2013-06-10 02:27:52 -07:00

assembly

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

2013-06-15 18:58:11 +01:00

awaymissions

Resolves #283

2013-04-24 09:37:30 +01:00

client

Merge pull request #607 from Carn/AdminOOCfix

2013-05-28 16:18:40 -07:00

clothing

Removed accidentally included mask test item

2013-06-02 17:09:44 +01:00

detectivework

Resolves #283

2013-04-24 09:37:30 +01:00

events

*Small tidy-up of various helper procs*

2013-05-27 12:21:43 +01:00

flufftext

>Resolves some dna runtimes. - check_dna_integrity() was not being used properly.

2013-05-08 08:20:15 +01:00

food

Food update -

2013-06-04 14:45:40 -05:00

hydroponics

*Replica pods seeds will now only accept the first valid blood sample it's given, and won't be overwriten with null values if you accidentally jab the seeds with the empty syringe afterward.

2013-06-03 12:32:43 -04:00

library

* Edited encryptionkey.dm: Fixes about nineteen typos

2013-05-26 18:16:02 +12:00

mining

*Small tidy-up of various helper procs*

2013-05-27 12:21:43 +01:00

mob

Optimizations in insignificant procs (less than 2% of total self time each (according to the june 7 profile), and the changes probably don't have a huge impact on them.

2013-06-12 15:30:52 -04:00

paperwork

Merge pull request #651 from Carn/Issue610

2013-05-28 04:44:23 -07:00

power

Merge pull request #655 from Carn/HelpersTidy

2013-05-31 23:24:38 -07:00

projectiles

gives temperature guns a high capacity cell. fixes #265

2013-05-30 10:20:22 -07:00

reagents

Food update -

2013-06-04 14:45:40 -05:00

recycling

*Small tidy-up of various helper procs*

2013-05-27 12:21:43 +01:00

research

*Small tidy-up of various helper procs*

2013-05-27 12:21:43 +01:00

scripting

Phase 2 of my master plan:

2013-05-13 12:20:12 -05:00

security levels

Updated the map with fixed incinerator doors that use the new heat_proof var.

2012-12-16 20:52:29 +00:00

surgery

Facial Reconstruction Surgery

2013-05-08 08:52:38 -06:00