Merge pull request #680 from Erthilo/master

Medical changes, increased vending points, virus dish fix.
This commit is contained in:
Mloc
2012-03-15 15:06:07 -07:00
11 changed files with 176 additions and 54 deletions

View File

@@ -138,7 +138,7 @@
growth = rand(5, 50)
/obj/item/weapon/virusdish/attackby(var/obj/item/weapon/W as obj,var/mob/living/carbon/user as mob)
if(istype(W,/obj/item/weapon/hand_labeler) || istype(W,/obj/item/weapon/reagent_containers/syringe))
if(istype(W,/obj/item/weapon/label) || istype(W,/obj/item/weapon/reagent_containers/syringe))
return
..()
if(prob(50))