Merge branch 'master' into bleeding-edge-freeze

This commit is contained in:
Mloc-Argent
2013-07-19 14:48:40 +01:00
52 changed files with 1156 additions and 1287 deletions
+1 -2
View File
@@ -746,10 +746,9 @@ 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')