PsiOmegaDelta c3f0a46c19 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/weapons/storage/briefcase.dm
	html/changelogs/.all_changelog.yml

2015-06-05 10:39:41 +02:00

..

devices

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

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

robot

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

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

stacks

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

2015-06-05 10:39:41 +02:00

weapons

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

2015-06-05 10:39:41 +02:00

apc_frame.dm

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

2015-06-02 20:18:45 +01: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

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

Minor amendments to mech kits and icons.

2015-05-13 17:04:52 +09:30

shooting_range.dm

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

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

toys.dm

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

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

trash.dm

…