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
@@ -465,6 +465,10 @@
 	suffix = "whiteship_pod"
 	name = "Salvage Pod"

+/datum/map_template/shuttle/whiteship/cog
+	suffix = "cog"
+	name = "NT Prisoner Transport"
+
 /datum/map_template/shuttle/cargo/box
 	suffix = "box"
 	name = "supply shuttle (Box)"
@@ -631,4 +635,4 @@

 /datum/map_template/shuttle/hunter/bounty
 	suffix = "bounty"
-	name = "Bounty Hunter Ship"
+	name = "Bounty Hunter Ship"