cib cab1289511 Merge branch 'master' of github.com:Baystation12/Baystation12 ...

Conflicts:
	html/changelog.html

2013-05-26 20:43:22 +02:00

..

devices

A few fixes to rp-rev

2013-05-23 22:12:20 +02:00

robot

Fixed posibrain installed into spiderbot bug, made posibrains a child class of MMI.

2013-03-19 14:37:21 +04:00

stacks

Renamed bruise pack back to gauze.

2013-05-22 14:05:53 +04:00

weapons

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

2013-05-26 20:43:22 +02:00

apc_frame.dm

…

blueprints.dm

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

bodybag.dm

Added stasis bag.

2013-05-19 07:48:43 +02:00

candle.dm

…

contraband.dm

…

crayons.dm

…

latexballoon.dm

…

shooting_range.dm

…

tk_grab.dm

…

toys.dm

fixed michael guess' zippo, added therapy doll dmis to code, the items aren't coded because i cannot get it to work for the life of me.

2013-05-02 02:00:04 -07:00

trash.dm

…