Chinsky d34599db55 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into russian_roulette ...

Conflicts:
	code/game/objects/items/devices/uplink_items.dm

2015-08-14 18:24:47 +03:00

..

devices

Compilation fixes.

2015-08-14 08:51:06 +02:00

robot

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

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

stacks

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

2015-08-13 09:01:10 +02:00

weapons

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into russian_roulette

2015-08-14 18:24:47 +03: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

Moved cap guns to proper guns.

2015-08-14 05:51:29 +03:00

trash.dm

…