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

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

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

copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

2013-01-14 21:07:16 +10:00

contraband.dm

Added missing contraband.dm file

2013-01-03 08:20:08 +04:00

crayons.dm

More file structure stuff.

2012-08-26 01:20:02 +00:00

latexballoon.dm

More file structure stuff!

2012-08-26 03:32:58 +00:00

shooting_range.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

tk_grab.dm

Too remove potential excessive garbage collection per tick. We will be reusing lists for overlays instead of deleting and creating them.

2013-01-04 15:11:06 +00:00

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

Merge remote-tracking branch 'remotes/git-svn' r4881 into bs12_with_tgport

2012-10-15 23:17:18 +10:00