Mloc-Argent dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm

2014-06-20 22:02:40 +01:00

..

grenades

Fixes #5186

2014-06-20 02:48:12 -04:00

implants

Compressed matter implanter fix

2014-05-11 18:30:18 +12:00

melee

Separates the sharp flag into edge and sharp

2014-06-15 20:25:39 -04:00

storage

Merge remote-tracking branch 'upstream/master' into dev

2014-06-20 22:02:40 +01:00

tanks

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07:00

AI_modules.dm

Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.

2014-05-10 01:40:11 +09:30

cards_ids.dm

New vehicle framework

2014-06-03 22:18:49 +12:00

cigs_lighters.dm

Fix lighter burning random body parts

2014-06-17 04:50:14 +01:00

clown_items.dm

…

cosmetics.dm

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

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

dice.dm

Adds sharp and edge flags to appropriate items

2014-06-16 13:26:44 -04:00

dna_injector.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

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

explosives.dm

…

extinguisher.dm

Merge remote-tracking branch 'upstream/master' into dev

2014-06-20 22:02:40 +01:00

flamethrower.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

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' into dev

2014-06-17 16:16:44 +04:00

hydroponics.dm

Hydroponics refactor, part 1: Files.

2014-06-11 03:44:29 +01:00

kitchen.dm

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

manuals.dm

Merge remote-tracking branch 'upstream/master' into dev

2014-05-11 13:19:09 +00: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

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

paiwire.dm

…

power_cells.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

RCD.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

RSF.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

scrolls.dm

Cleaned the fuck out of smoke.

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

shields.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

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

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

swords_axes_etc.dm

Telescopic robuster no longer has the stun

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

syndie.dm

…

table_rack_parts.dm

…

teleportation.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

tools.dm

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

twohanded.dm

Separates the sharp flag into edge and sharp

2014-06-15 20:25:39 -04:00

weaponry.dm

Adds sharp and edge flags to appropriate items

2014-06-16 13:26:44 -04:00

wires.dm

…