PsiOmega e875a7ce48 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/machinery/computer3/buildandrepair.dm
	code/game/objects/items/devices/lightreplacer.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm

2015-08-08 15:34:51 +02:00

..

ashtray.dm

Compile fix.

2015-06-20 23:14:09 +09:30

bats.dm

Updated force vars on bats.

2015-05-21 00:52:17 +09:30

kitchen.dm

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

2015-07-11 10:58:49 +02:00

knives.dm

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

2015-07-14 08:21:12 +02:00

material_weapons.dm

Adds common proc to obtain the material of an object

2015-08-01 23:03:21 -04:00

misc.dm

…

shards.dm

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

2015-08-08 15:34:51 +02:00

swords.dm

…

thrown.dm

…

twohanded.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

twohanded.dm.orig

…