Merge pull request #12607 from Detective-Google/cog-2

cog fixes round 2
2020-06-27 14:54:31 -07:00
parent 24fa9e2887 57fca41e20
commit e51bee9649
4 changed files with 1202 additions and 1526 deletions
@@ -462,6 +462,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)"
@@ -628,4 +632,4 @@

 /datum/map_template/shuttle/hunter/bounty
 	suffix = "bounty"
-	name = "Bounty Hunter Ship"
+	name = "Bounty Hunter Ship"
@@ -21,3 +21,6 @@
 	response_harm_simple = "kick"
 	gold_core_spawnable = FRIENDLY_SPAWN
 	footstep_type = FOOTSTEP_MOB_CLAW
+
+/mob/living/simple_animal/pet/redpanda/stinky
+	name = "Stinky"