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

..

48x48

Fucked up removing the whole DMIs I said I removed earlier (though that huge list of individual icons is still out)

2012-08-11 03:56:12 +00:00

effects

Readded welder fuel.

2012-10-18 21:25:24 +04:00

mecha

TEST COMMIT

2012-09-09 14:04:03 -07:00

misc

Merge branch 'bs12_with_tgport' of github.com:caelaislinn/Baystation12 into bs12_with_tgport (probably broke ZAS again)

2012-09-04 22:23:50 +10:00

mob

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

2012-10-21 01:25:04 +10:00

obj

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

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

pda_icons

TG: Not a whole lot going on in this commit, just more work on preparation for the

2012-06-23 14:59:54 +01:00

PSD files

…

spideros_icons

…

Testing

…

turf

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

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

vehicles

TG: •Fixed silicon mobs not being able to access newscaster. It was a linkage error

2012-06-26 00:01:26 +01:00

vending_icons

…

480x480.dmi

…

am_engine.dmi

…

ashtray.dmi

…

dispensebutton_bg.png

…

minimap.dmi

Minimap (work in progress):

2012-05-14 04:04:56 -04:00

policetape.dmi

Fixed tape quirks

2012-07-09 20:03:29 +03:00

reagentname_bg.png

…

ss13_32.png

…

ss13_64.png

…

VendingMachineBG.png

…