Steelpoint 68b5dd2979 Merge branch 'master' of https://github.com/tgstation/-tg-station into AyylienGun ...

Conflicts:
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/obj/guns/energy.dmi

2015-07-24 16:59:21 +08:00

..

grenades

Merge pull request #10668 from phil235/CyborgFlashFix

2015-07-20 11:53:03 -05: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

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

2015-07-16 18:11:33 +08: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

Needs a check here to let reset and purge be used.

2015-07-20 09:02:46 -06: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 handcuff overlay on monkey not showing.

2015-07-17 01:15:21 +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

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

2015-07-19 21:53:39 +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

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

2015-07-24 16:59:21 +08:00

janisigns.dm

…

kitchen.dm

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

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

manuals.dm

Readding loading chef food into snack vending mechines.

2015-07-23 16:06:03 +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 drone and cyborg not being affected by mounted flashers.

2015-07-17 17:12:16 +02:00

twohanded.dm

Fixes proc arguments

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

vending_items.dm

Give refill canisters three separate charge values for standard, contraband(hacked) and premium(coin) items.

2015-07-22 22:06:04 +02:00

weaponry.dm

Fixes proc arguments

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