Merge resolution with PDA nanoui.

This commit is contained in:
Zuhayr
2014-07-25 22:57:53 +09:30
318 changed files with 11452 additions and 11588 deletions
@@ -21,6 +21,10 @@
/obj/item/projectile/bullet/weakbullet/beanbag //because beanbags are not bullets
name = "beanbag"
damage = 20
agony = 60
embed = 0
sharp = 0
/obj/item/projectile/bullet/weakbullet/rubber
name = "rubber bullet"
@@ -49,8 +49,7 @@
Robot.mmi = new /obj/item/device/mmi(new_mob)
Robot.mmi.transfer_identity(M) //Does not transfer key/client.
if("slime")
if(prob(50)) new_mob = new /mob/living/carbon/slime/adult(M.loc)
else new_mob = new /mob/living/carbon/slime(M.loc)
new_mob = new /mob/living/carbon/slime(M.loc)
new_mob.universal_speak = 1
if("xeno")
var/alien_caste = pick("Hunter","Sentinel","Drone","Larva")