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

cog fixes round 2

_maps/shuttles/whiteship_cog.dmm

@@ -32,11 +32,6 @@
 "g" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/abandoned)
-"h" = (
-/obj/machinery/door/airlock/external,
-/obj/structure/fans/tiny,
-/turf/open/floor/plating,
-/area/shuttle/abandoned)
 "i" = (
 /obj/machinery/suit_storage_unit/security,
 /obj/machinery/light/small{
@@ -64,6 +59,7 @@
 /area/shuttle/abandoned)
 "m" = (
 /obj/structure/bed,
+/obj/item/bedsheet/orange,
 /turf/open/floor/plasteel,
 /area/shuttle/abandoned)
 "n" = (
@@ -130,7 +126,6 @@
 /area/shuttle/abandoned)
 "x" = (
 /obj/machinery/door/firedoor/border_only/closed{
-	icon_state = "door_closed";
 	dir = 4
 	},
 /obj/machinery/door/window/eastright,
@@ -174,12 +169,12 @@
 	dir = 8
 	},
 /obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/energy/laser/carbine,
 /obj/machinery/button/flasher{
 	id = "cogws";
 	pixel_x = -24;
 	pixel_y = 8
 	},
+/obj/item/gun/energy/laser/retro,
 /turf/open/floor/plasteel,
 /area/shuttle/abandoned)
 "D" = (
@@ -191,7 +186,7 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
-/obj/item/gun/energy/e_gun/stun,
+/obj/item/gun/energy/laser/retro,
 /turf/open/floor/plasteel,
 /area/shuttle/abandoned)
 "E" = (
@@ -228,12 +223,14 @@
 "I" = (
 /obj/structure/table/reinforced,
 /obj/item/clothing/glasses/sunglasses,
+/obj/item/gps{
+	gpstag = "NTPRS"
+	},
 /turf/open/floor/plasteel/grimy,
 /area/shuttle/abandoned)
 "J" = (
 /obj/structure/curtain,
 /obj/machinery/shower{
-	name = "shower";
 	pixel_y = 12
 	},
 /obj/item/soap/nanotrasen,
@@ -329,13 +326,13 @@ d
 "}
 (5,1,1) = {"
 d
-h
+g
 n
 n
 B
 H
 n
-h
+g
 d
 "}
 (6,1,1) = {"

code/datums/shuttles.dm

@@ -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"

code/modules/mob/living/simple_animal/friendly/panda.dm

@@ -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"