PsiOmegaDelta c346b99371 Merge remote-tracking branch 'upstream/dev' into 150817-SynthAccess ...

Conflicts:
	code/game/objects/items/weapons/cards_ids.dm

2015-08-20 12:42:51 +02:00

..

devices

Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery

2015-08-20 19:19:12 +09:30

robot

Synth access and icon update changes.

2015-08-20 12:40:08 +02:00

stacks

Reimplemented floor lights as a machine built at the autolathe.

2015-08-16 19:26:17 -07:00

weapons

Synth access and icon update changes.

2015-08-20 12:40:08 +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

…

crayons.dm

Adds the ability to draw arrows with crayon

2015-07-09 23:35:06 -04:00

glassjar.dm

…

latexballoon.dm

…

paintkit.dm

Minor amendments to mech kits and icons.

2015-05-13 17:04:52 +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

…