Giacomand acf7be47f8 Merge branch 'RemoteResources' of https://github.com/Carn/-tg-station into RemoteRes ...

Conflicts:
	code/modules/client/client procs.dm - Resolved

2013-07-04 01:59:04 +01:00

..

admin

Resolves #830 - ghost_form is only selectable by members.

2013-06-24 05:35:39 +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

Merge branch 'RemoteResources' of https://github.com/Carn/-tg-station into RemoteRes

2013-07-04 01:59:04 +01:00

clothing

revert bcaf291

2013-07-02 19:35:11 +10:00

detectivework

Resolves #283

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

events

Overhauled Projectiles

2013-06-19 23:24:00 -04: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 #864 from Ricotez/redoctoberxenoholo

2013-07-01 21:10:49 -07:00

paperwork

Map Update

2013-06-27 08:31:56 -06:00

power

Merge pull request #837 from Aranclanos/Sleepers

2013-06-28 04:37:03 -07:00

projectiles

Merge pull request #819 from AlexanderUlanH/projectile

2013-06-21 17:19:42 -07:00

reagents

Overhauled Projectiles

2013-06-19 23:24:00 -04:00

recycling

Merge pull request #852 from Aranclanos/CargoMails

2013-06-28 04:42:06 -07:00

research

Welding gas mask

2013-06-19 18:05:12 +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

Brute Damage for brain removal

2013-06-17 08:14:34 -03:00