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

Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm

2014-03-28 18:46:04 -05:00

..

grenades

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

2014-03-28 18:46:04 -05:00

implants

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

melee

Made energy weapons not get a bloody overlay.

2013-10-07 20:35:35 +01:00

storage

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00: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

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

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

Removed undeeded "ATTACK:"

2013-08-28 03:37:11 +01:00

extinguisher.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

flamethrower.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

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

Wearing masks or straight jackets blocks chewing on your wrists

2014-03-03 20:24:09 -06:00

hydroponics.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

kitchen.dm

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

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

manuals.dm

medical manual

2014-02-16 02:29:20 +11:00

mop.dm

Walking on tile makes it dirty. Takes 40 times for mob to enter tile for dirt overlay to appear.

2013-11-21 13:46:16 +04:00

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

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

scrolls.dm

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

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

Added laser scalpel items

2014-02-25 15:09:46 -05:00

swords_axes_etc.dm

Telescopic robuster no longer has the stun

2014-03-18 18:30:08 +02:00

syndie.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

table_rack_parts.dm

…

teleportation.dm

…

tools.dm

Fixes #4346

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

twohanded.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

weaponry.dm

Removed undeeded "ATTACK:"

2013-08-28 03:37:11 +01:00

wires.dm

…