mwerezak 229f4cb043 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color ...

Conflicts:
	code/modules/customitems/item_defines.dm

2015-04-26 02:04:59 -04:00

..

devices

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

2015-04-23 13:15:43 +02:00

robot

Adds the research module, condensed into one commit so far.

2015-04-04 20:17:59 -04:00

stacks

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

2015-04-14 15:54:22 +02:00

weapons

Renames inventory slot string key defines

2015-04-23 04:57:03 -04:00

apc_frame.dm

…

ashtray.dm

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

2015-03-31 01:37:55 -04:00

blueprints.dm

sanitize() refactor: second pass(other sanitize functions)

2015-03-23 01:38:09 +03:00

bodybag.dm

sanitize() refactor: fourth pass

2015-04-03 00:40:57 +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

…

glassjar.dm

Minor jar fixes

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

latexballoon.dm

…

shooting_range.dm

…

toys.dm

Fixes #8559

2015-04-17 15:55:15 +03:00

trash.dm

Adds bread tube trash item

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