phil235 99653ed152 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor ...

Conflicts:
	code/modules/reagents/chemistry/holder.dm

2016-02-06 20:38:16 +01:00

..

grenades

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

2016-02-04 14:34:45 +01:00

implants

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

2016-02-04 14:34:45 +01:00

melee

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

storage

Bulldog Fix

2016-02-05 12:06:53 -06:00

tanks

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

2016-02-06 15:42:13 +01:00

AI_modules.dm

Merge Conflict Fix

2016-01-20 14:07:14 +02:00

airlock_painter.dm

…

cards_ids.dm

Changes relatives paths into absolute paths and makes some if()'s better

2016-01-17 01:36:56 +02:00

chrono_eraser.dm

…

cigs_lighters.dm

…

clown_items.dm

- you now only see turfs when inside gas pipes.

2016-02-04 00:33:16 +01:00

cosmetics.dm

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

2016-02-04 14:34:45 +01:00

courtroom.dm

…

defib.dm

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

2016-02-04 14:34:45 +01:00

dice.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

dna_injector.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

explosives.dm

Storage items now drop loot upon destruction.

2016-01-31 13:01:36 -07:00

extinguisher.dm

Buffs Dihydrogen monoxide

2016-01-01 15:17:29 +01:00

flamethrower.dm

Merge conflict fix

2016-01-17 19:15:30 +02:00

gift_wrappaper.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

handcuffs.dm

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

2016-02-04 14:34:45 +01:00

janisigns.dm

…

kitchen.dm

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

2016-02-04 14:34:45 +01:00

manuals.dm

…

mop.dm

…

paint.dm

…

paiwire.dm

…

pneumaticCannon.dm

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

RCD.dm

…

RPD.dm

Merge Conflict Fix

2016-01-27 13:29:38 +02:00

RSF.dm

…

scrolls.dm

…

shields.dm

…

signs.dm

…

singularityhammer.dm

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

stunbaton.dm

Some assembly requaired

2016-01-26 02:43:08 +03:00

teleportation.dm

Merge conflict fix

2016-01-17 19:15:30 +02:00

teleprod.dm

…

tools.dm

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

2016-02-04 14:34:45 +01:00

twohanded.dm

Changes relatives paths into absolute paths and makes some if()'s better

2016-01-17 01:36:56 +02:00

vending_items.dm

…

weaponry.dm

Some assembly requaired

2016-01-26 02:43:08 +03:00