Merge remote-tracking branch 'origin/master' into TGUI-3.0

2020-06-30 02:30:29 +03:00
parent d7e30f9ae5 3c4a288ecc
commit 20245f7319
243 changed files with 3206 additions and 2152 deletions
@@ -48,7 +48,7 @@
 /obj/item/seeds/tea/catnip
 	name = "pack of catnip seeds"
 	icon_state = "seed-catnip"
-	desc = "Long stocks with flowering tips that has a chemical to make feline attracted to it."
+	desc = "Long stocks with flowering tips that contain a chemical to make felines attracted to it."
 	species = "catnip"
 	plantname = "Catnip Plant"
 	growthstages = 3