PsiOmega 5c1b8380a4 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/tanks/jetpack.dm
	code/game/objects/items/weapons/tanks/tanks.dm

2015-09-15 20:25:13 +02:00

..

devices

Code relocation.

2015-09-11 08:45:49 +02:00

robot

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

2015-09-05 09:24:30 +02:00

stacks

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

2015-08-24 10:23:12 +02:00

weapons

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

2015-09-15 20:25:13 +02:00

apc_frame.dm

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

2015-06-08 09:57:33 +02:00

blueprints.dm

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

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

bodybag.dm

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

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

contraband.dm

Now possible to order a kit with a random toxin and syringe - 4TC

2015-02-20 21:13:34 +01:00

crayons.dm

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

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

glassjar.dm

Minor jar fixes

2015-04-16 17:30:01 +03:00

latexballoon.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

paintkit.dm

Added get_bodytype() species proc as groundwork for subspecies.

2015-08-22 02:53:16 +09:30

shooting_range.dm

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

2015-07-30 10:49:37 +02:00

toys.dm

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

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

trash.dm

Adds bread tube trash item

2015-03-24 04:03:06 -04:00