Merge branch 'vials' into viro

This commit is contained in:
Chinsky
2013-06-16 11:22:15 +04:00
741 changed files with 4451 additions and 1277 deletions

View File

@@ -740,9 +740,10 @@ obj/item/weapon/organ/New(loc, mob/living/carbon/human/H)
base = new('icons/mob/human_races/r_lizard.dmi')
if("skrell")
base = new('icons/mob/human_races/r_skrell.dmi')
if("vox")
base = new('icons/mob/human_races/r_vox.dmi')
if("kidan")
base = new('icons/mob/human_races/r_kidan.dmi')
else
base = new('icons/mob/human_races/r_human.dmi')