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

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution

2014-12-16 02:52:08 +03:00

..

grenades

Made clumsiness into disability

2014-12-14 08:04:48 +03:00

implants

Merge pull request #6130 from phil235/AttackMsgStandardizedFormat

2014-12-04 12:45:31 -06:00

melee

Made clumsiness into disability

2014-12-14 08:04:48 +03:00

storage

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

2014-12-16 02:52:08 +03:00

tanks

Fixes toggling watertank nozzle in hands with verb

2014-12-03 18:58:08 +00:00

AI_modules.dm

Fixes the new AI lawcap config option

2014-12-02 18:27:06 -03:00

airlock_painter.dm

…

cards_ids.dm

makes APC call parent

2014-12-09 18:53:29 -08:00

cigs_lighters.dm

…

clown_items.dm

Fixes the mouth washing message and the cleaning message appearing at the same time.

2014-11-12 17:37:27 +01:00

cosmetics.dm

…

defib.dm

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

2014-12-09 16:03:45 -08:00

dice.dm

Makes dice use overlays

2014-11-24 08:01:32 +11:00

dna_injector.dm

Added datum mutations

2014-12-12 04:48:11 +03:00

explosives.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

extinguisher.dm

Conflicts:

2014-11-13 17:33:32 +01:00

flamethrower.dm

…

gift_wrappaper.dm

Adds a santa event where a dead player is spawned as Santa! HO HO HO!

2014-12-08 17:03:52 +01:00

handcuffs.dm

Made clumsiness into disability

2014-12-14 08:04:48 +03:00

janisigns.dm

…

kitchen.dm

Made clumsiness into disability

2014-12-14 08:04:48 +03:00

manuals.dm

…

mop.dm

Conflicts:

2014-11-13 17:33:32 +01:00

paint.dm

…

paiwire.dm

…

power_cells.dm

Finished the exofab revamp:

2014-12-02 23:00:22 +01:00

RCD.dm

Adds changelog and nerfs door deconstruction.

2014-12-07 11:46:59 +00:00

RSF.dm

…

scrolls.dm

Fixes wizard slipping on all the area soaps

2014-11-22 19:24:57 -03:00

shields.dm

Made clumsiness into disability

2014-12-14 08:04:48 +03:00

singularityhammer.dm

…

stunbaton.dm

Made clumsiness into disability

2014-12-14 08:04:48 +03:00

table_rack_parts.dm

Conflicts:

2014-11-13 17:33:32 +01:00

teleportation.dm

…

tools.dm

Made clumsiness into disability

2014-12-14 08:04:48 +03:00

twohanded.dm

Made clumsiness into disability

2014-12-14 08:04:48 +03:00

vending_items.dm

Adds new undershirts, jeans and pants by WalterJe

2014-11-23 13:58:32 -03:00

weaponry.dm

…