phil235 3e9ab4e3c1 Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff ...

Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/__HELPERS/unsorted.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/modules/reagents/Chemistry-Recipes.dm

2015-07-16 14:09:12 +02:00

..

grenades

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

2015-07-16 14:09:12 +02:00

implants

Fixes proc arguments

2015-07-15 23:52:35 +02:00

melee

Fixes proc arguments

2015-07-15 23:52:35 +02:00

storage

Fixes proc arguments

2015-07-15 23:52:35 +02:00

tanks

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

2015-07-16 14:09:12 +02:00

AI_modules.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

airlock_painter.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

cards_ids.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

chrono_eraser.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

cigs_lighters.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

clown_items.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

cosmetics.dm

Fixes runtime with do_after()'s that don't use a target.

2015-06-25 19:05:23 +02:00

courtroom.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

defib.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

dice.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

dna_injector.dm

Attack logging tweaks

2015-07-08 23:14:37 -07:00

explosives.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

extinguisher.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

flamethrower.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

gift_wrappaper.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

handcuffs.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

janisigns.dm

Fixes extinguisher (w/safety off) spraying water when placed on a table.

2015-05-23 16:03:48 +02:00

kitchen.dm

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

manuals.dm

Fixes extinguisher (w/safety off) spraying water when placed on a table.

2015-05-23 16:03:48 +02:00

mop.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

paint.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

paiwire.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

pneumaticCannon.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

RCD.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

RPD.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

RSF.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

scrolls.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

shields.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

signs.dm

Merge pull request #10163 from RemieRichards/TableCraftingUnFucking

2015-07-01 14:29:55 -04:00

singularityhammer.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

stunbaton.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

teleportation.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

tools.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

twohanded.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

vending_items.dm

…

weaponry.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00