Cael_Aislinn 9340f70252 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2012-10-22 19:35:03 +10:00

..

backpack.dm

Removing Soghun stutters, fix for infinite BoH in BoH.

2012-10-17 19:18:17 -04:00

belt.dm

…

bible.dm

Merged money, ATMs, bible changes, nullrod changes, policetape.

2012-09-03 01:29:53 +01:00

briefcase.dm

Makes briefcase start without paper.

2012-10-20 22:50:01 +04:00

fancy.dm

…

firstaid.dm

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00

kit.dm

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)

2012-09-04 22:19:03 +10:00

lockbox.dm

…

misc.dm

File restructuring: ohgodihopenothingbroke edition.

2012-09-08 22:11:02 +00:00

storage.dm

…

toolbox.dm

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

2012-10-21 00:25:05 +10:00

uplink_kits.dm

Merge tgstation13 r4570 into bs12_with_tgport

2012-08-28 19:57:11 +10:00