Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix

2019-11-21 13:08:23 +08:00
parent 468b6eb609 fda0905b9f
commit 60def2a9fc
159 changed files with 1504 additions and 1004 deletions
@@ -765,7 +765,7 @@

 /obj/item/clothing/suit/assu_suit
 	name = "DAB suit"
-	desc = "A cheap replica of old SWAT armor. On its back, it is written: \"<i>Desperate Assistance Battle-force</i>\"."
+	desc = "A cheap replica of old SWAT armor. On its back, it is written: \"<i>Desperate Assistance Battleforce</i>\"."
 	icon_state = "assu_suit"
 	item_state = "assu_suit"
 	blood_overlay_type = "armor"