PsiOmega 6e2488ccb0 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/stool_bed_chair_nest/chairs.dm

2015-03-20 08:26:34 +01:00

..

devices

Fixes #8107.

2015-03-19 21:33:58 +01:00

robot

Robot code clean up and fixes.

2015-03-10 13:37:20 +01:00

stacks

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

2015-03-20 08:26:34 +01:00

weapons

Fixes #8430

2015-03-17 19:18:30 +10:30

apc_frame.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

ashtray.dm

Conflict fix

2015-02-03 20:57:16 +03:00

blueprints.dm

fixes #7487

2014-12-22 15:41:07 +00:00

bodybag.dm

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03: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

Eating crayons

2015-01-25 17:11:06 +01:00

latexballoon.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

shooting_range.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

toys.dm

Dev merge.

2015-02-21 19:49:47 +10:30

trash.dm

More name updates and refactoring for research

2014-12-18 03:26:55 +01:00