dumpdavidson 6cd1b87782 Merge branch 'master' of https://github.com/dumpdavidson/-tg-station into monkeyize ...

Conflicts:
	code/game/dna.dm
	code/game/gamemodes/changeling/changeling_powers.dm

2013-05-24 15:40:07 +02:00

..

admin

Merge branch 'master' of https://github.com/dumpdavidson/-tg-station into monkeyize

2013-05-24 15:40:07 +02:00

assembly

update_icons.dm changes for humans. This ties in with the dna changes and the changes to skin_tone and hair colours

2013-05-10 18:41:08 +01:00

awaymissions

Resolves #283

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

client

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

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

clothing

PR #560 - Enabled security clearance checks for SecHuds.

2013-05-12 20:48:23 +01:00

detectivework

Resolves #283

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

events

Resolves #283

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

flufftext

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

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

food

…

hydroponics

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

2013-05-20 00:33:42 +01:00

library

- Updates library table definition

2013-04-21 19:35:42 +02:00

mining

Cable coils now update mob inhands correctly when used up. Changed cable coil items to use the existing update_icon() proc, instead of their own updateicon().

2013-04-27 09:32:50 +10:00

mob

Merge branch 'master' of https://github.com/dumpdavidson/-tg-station into monkeyize

2013-05-24 15:40:07 +02:00

paperwork

Merge pull request #582 from Cheridan/radios

2013-05-17 07:46:40 -07:00

power

update_icons.dm changes for humans. This ties in with the dna changes and the changes to skin_tone and hair colours

2013-05-10 18:41:08 +01:00

projectiles

Resolves #283

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

reagents

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

2013-05-20 00:33:42 +01:00

recycling

…

research

Phase 2 of my master plan:

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

scripting

Phase 2 of my master plan:

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

security levels

…

surgery

Facial Reconstruction Surgery

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