Giacomand 06e7f401cd Merge branch 'master' of https://github.com/Giacomand/-tg-station into tator_typos ...

Conflicts:
	code/modules/admin/topic.dm

2013-06-20 21:37:30 +01:00

..

admin

Merge branch 'master' of https://github.com/Giacomand/-tg-station into tator_typos

2013-06-20 21:37:30 +01:00

assembly

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

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

awaymissions

Standardized spelling of all instances of "Centcom"

2013-06-17 20:49:01 -06:00

client

Resolves an issue with sanitize_hexcolor where it'd return an incomplete string such as ""

2013-06-16 11:08:39 +01:00

clothing

Standardized spelling of all instances of "Centcom"

2013-06-17 20:49:01 -06:00

detectivework

Resolves #283

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

events

Standardized spelling of all instances of "Centcom"

2013-06-17 20:49:01 -06: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

Merge pull request #804 from Ikarrus/tplog

2013-06-19 21:08:14 -07: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

Merge pull request #776 from Giacomand/chem_smoke_fix

2013-06-18 17:54:42 -07:00

recycling

*Small tidy-up of various helper procs*

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

research

Standardized spelling of all instances of "Centcom"

2013-06-17 20:49:01 -06: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