Ccomp5950 c56ec21ee3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

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

2014-02-26 09:34:38 -06:00

..

grenades

Chem grenade fix

2014-02-15 23:30:56 +13:00

implants

…

melee

…

storage

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-02-26 09:34:38 -06:00

tanks

…

AI_modules.dm

…

cards_ids.dm

…

cigs_lighters.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-02-26 09:34:38 -06:00

clown_items.dm

…

cosmetics.dm

…

dice.dm

…

dna_injector.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

explosives.dm

…

extinguisher.dm

…

flamethrower.dm

…

game_kit.dm

…

gift_wrappaper.dm

Fixes admin attack logs to show up in-game as well as in the logfiles.

2014-02-25 20:36:46 +00:00

handcuffs.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-02-26 09:34:38 -06:00

hydroponics.dm

…

kitchen.dm

…

manuals.dm

…

mop.dm

…

paint.dm

…

paiwire.dm

…

power_cells.dm

…

RCD.dm

…

RSF.dm

…

scrolls.dm

…

shields.dm

…

stunbaton.dm

Fixes admin attack logs to show up in-game as well as in the logfiles.

2014-02-25 20:36:46 +00:00

surgery_limbattachment.dm

…

surgery_tools.dm

…

swords_axes_etc.dm

Fixes admin attack logs to show up in-game as well as in the logfiles.

2014-02-25 20:36:46 +00:00

syndie.dm

…

table_rack_parts.dm

…

teleportation.dm

…

tools.dm

…

twohanded.dm

…

weaponry.dm

…

wires.dm

…