Ergovisavi 439aec7b50 Merge remote-tracking branch 'remotes/upstream/master' into dualsaberreflectmerge ...

Conflicts:
	code/game/objects/items/weapons/twohanded.dm

2013-09-12 18:02:15 -07: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

Made all the machinery use ..() on the Topic(), instead of having a copy pasta everywhere to see if the human is dead or others. This will stop dead AIs interacting with machineries or others.

2013-07-03 13:16:53 -03:00

client

Fixes #1147 - type-mismatch

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

clothing

Ablative armor no longer provides reflection if you are shot in a location that isn't covered by ablative armor (Chest, groin) as per Number's request. Shout out to Zelacks for doing this for me.

2013-09-09 19:23:47 -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

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

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

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

Merge remote-tracking branch 'remotes/upstream/master' into dualsaberreflectmerge

2013-09-12 18:02:15 -07: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

Merge pull request #1280 from Ergovisavi/improvexplosive

2013-09-12 02:30:04 -07: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

Made all the machinery use ..() on the Topic(), instead of having a copy pasta everywhere to see if the human is dead or others. This will stop dead AIs interacting with machineries or others.

2013-07-03 13:16:53 -03:00

surgery

Update surgery_step.dm

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