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

Conflicts:
	code/modules/customitems/item_spawning.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

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

2012-09-22 18:31:52 +10:00

..

item_defines.dm

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

2012-09-22 18:31:52 +10:00

item_spawning.dm

REALLY fixes Roaper's custom item (I forgot to code the spawning thing-y for his ID) and adds mah cane.

2012-09-12 21:14:50 -05:00