Cael_Aislinn 8581932c57 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	baystation12.dme
	code/game/objects/items/toys.dm
	icons/mob/back.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/uniforms.dmi
	icons/obj/weapons.dmi

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

2013-01-14 22:14:46 +10:00

..

biocraps.dmi

Added my completed away mission, along with the necessary sprites and code. A Soghun-Compatible RIG suit has also been added.

2012-12-29 01:59:19 -06:00

desert.dmi

Added my completed away mission, along with the necessary sprites and code. A Soghun-Compatible RIG suit has also been added.

2012-12-29 01:59:19 -06:00

susan_desert_turfs.dm

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2013-01-14 22:14:46 +10:00