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

Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR.

2014-01-28 15:59:50 +10:30

melee

…

storage

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

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

tanks

Canister, Tank & Tank Transfer Value NanoUIs.

2014-01-15 01:08:45 +00:00

AI_modules.dm

code/game/object/items/weapons/* lowercase pass

2014-01-08 19:56:00 +00:00

cards_ids.dm

code/game/object/items/weapons/* lowercase pass

2014-01-08 19:56:00 +00:00

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

code/game/object/items/weapons/* lowercase pass

2014-01-08 19:56:00 +00:00

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

code/game/object/items/weapons/* lowercase pass

2014-01-08 19:56:00 +00:00

manuals.dm

Reintroducing the dough-based cooking system.

2014-02-01 02:17:38 +01:00

mop.dm

…

paint.dm

Makes mixing paints actually make sense

2014-01-12 12:04:18 +01:00

paiwire.dm

…

power_cells.dm

code/game/object/items/weapons/* lowercase pass

2014-01-08 19:56:00 +00:00

RCD.dm

RCDs no longer create plating with air on it.

2014-01-08 17:50:59 -07:00

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

Fixes #4346

2014-01-30 21:30:58 +10:30

twohanded.dm

…

weaponry.dm

…

wires.dm

…