Merge branch 'master' into new-tg-plants

This commit is contained in:
Useroth
2019-12-07 14:25:38 +01:00
committed by GitHub
898 changed files with 16071 additions and 10762 deletions
@@ -13,8 +13,8 @@
materials = list(MAT_METAL=2000)
/obj/item/gun/grenadelauncher/examine(mob/user)
..()
to_chat(user, "[grenades.len] / [max_grenades] grenades loaded.")
. = ..()
. += "[grenades.len] / [max_grenades] grenades loaded."
/obj/item/gun/grenadelauncher/attackby(obj/item/I, mob/user, params)
@@ -30,8 +30,8 @@
recharge_newshot()
/obj/item/gun/syringe/examine(mob/user)
..()
to_chat(user, "Can hold [max_syringes] syringe\s. Has [syringes.len] syringe\s remaining.")
. = ..()
. += "Can hold [max_syringes] syringe\s. Has [syringes.len] syringe\s remaining."
/obj/item/gun/syringe/attack_self(mob/living/user)
if(!syringes.len)