Cael_Aislinn 5ea4807d50 Merge branch 'torban' of https://github.com/Carn/-tg-station ...

Conflicts:
	code/modules/admin/IsBanned.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2013-09-12 11:49:40 +10:00

..

admin

Merge branch 'torban' of https://github.com/Carn/-tg-station

2013-09-12 11:49:40 +10:00

assembly

Removes an unused var defined for every obj.

2013-09-03 09:38:30 -05:00

awaymissions

…

client

Fixes #1147 - type-mismatch

2013-08-14 18:10:26 +01:00

clothing

Adds gags!

2013-08-29 12:19:34 -07:00

detectivework

Makes dates and times consistent across different station logs.

2013-08-18 12:07:48 +12:00

events

Merge pull request #1152 from Giacomand/removeprison

2013-08-14 22:08:48 -07:00

flufftext

…

food

Changes the ingredient item in the mime burger recipe from a beret to a mime mask.

2013-09-05 16:20:16 -05:00

hydroponics

adds ghost chilis, makes condensed capsicain actually do something when ingested

2013-08-31 09:56:01 +10:00

library

Choose Profession

2013-08-01 18:09:58 +01:00

mining

Merge pull request #1102 from Aranclanos/Linda

2013-08-18 15:27:23 -07:00

mob

Some reason it pushed the old one...?

2013-09-10 16:24:57 -05:00

paperwork

Merge pull request #1167 from Giacomand/stampcham

2013-08-19 02:51:58 -07:00

power

Removes an unused var defined for every obj.

2013-09-03 09:38:30 -05:00

projectiles

Merge pull request #1298 from Zelacks/silencefix

2013-09-06 09:04:26 -07:00

reagents

Pandemic Replicator Indicatior Light

2013-09-06 10:38:06 -05:00

recycling

Makes disposal start the round with air inside, depending the air of their loc. This will slightly reduce atmos roundstart lag. Around 150~ compare calls per tick for 5 minutes removed.

2013-08-23 08:06:14 -03:00

research

Adding Linda.

2013-08-10 06:15:14 -03:00

scripting

Added lowercase boolean variables to Telecomms

2013-08-11 05:03:57 +02:00

security levels

…

surgery

Update surgery_step.dm

2013-08-19 12:49:23 -04:00