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

Conflicts:
	icons/mob/back.dmi
	icons/mob/mask.dmi

2014-01-30 12:14:44 -06:00

..

grenades

Medical Hoopery

2013-11-14 12:40:30 -05:00

implants

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

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

melee

Made energy weapons not get a bloody overlay.

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

storage

correct paint can names and plural status, corrected pill box names, corrected lockbox names.

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

tanks

Tanks will also keep up with who manipulated them last.

2013-12-03 23:01:42 -06: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

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

2014-01-08 19:56:00 +00: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 fixes cherrypicked from N3X15.

2013-12-23 00:06:56 +10:30

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

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

handcuffs.dm

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01: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

Emergency Insertion - Supermatter Manual.

2013-12-01 19:31:25 -06: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

correct paint can names and plural status, corrected pill box names, corrected lockbox names.

2014-01-08 19:56:03 +00: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

Fix for throwing damage.

2013-09-13 19:41:23 +03:00

surgery_limbattachment.dm

…

surgery_tools.dm

Expansion of every "icon = ''" path.

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

swords_axes_etc.dm

Fixes #3847

2014-01-30 23:21:00 +10:30

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

…