Albert Iordache 3c0547f07f Merge branch 'master' of https://github.com/melonstorm/Baystation12 into melonstorm-master ...

Conflicts:
	maps/tgstation.2.0.8.dmm

2012-02-23 09:53:04 +02:00

..

clothing

…

weapons

Merge branch 'master' of https://github.com/melonstorm/Baystation12 into melonstorm-master

2012-02-23 09:53:04 +02:00

apc_frame.dm

…

blueprints.dm

…

candle.dm

fixed matchbook, cig pack, crayon to handle items correctly

2012-02-17 20:45:52 -05:00

clothing.dm

Merge branch 'master' of git://github.com/Baystation12/Baystation12

2012-02-15 07:04:43 +10:00

food.dm

…

helper_procs.dm

…

item.dm

Fixed a few runtimes, added debug verbs to help find WTF is up with DNA and 'prints

2012-02-18 12:45:01 -07:00

robot_items.dm

RCDs now make plating instead of full floors.

2012-01-25 13:55:09 -07:00

robot_parts.dm

Fixed #460, #456, and #478

2012-02-21 18:58:28 -07:00

shock_kit.dm

…

tk_grab.dm

…

trash.dm

…