[MIRROR] ERT_Bounty.DMM ship touchup [MDB IGNORE] (#2954)

* ERT_Bounty.DMM ship touchup (#83608) ## About The Pull Request It updates this shuttle to make it better! I'll be honest, I don't _actually_ know what this is used for. Maybe an admin button makes this spawn? I'm not sure. Eitherway, it's better now. ## Why It's Good For The Game This place looks better; mapping improvement. ## Changelog :cl: qol: The ERT's ship has better mapping now. /:cl: * ERT_Bounty.DMM ship touchup --------- Co-authored-by: Fazzie <[email protected]> Co-authored-by: NovaBot13 <[email protected]>
Fluffy-Frontier · Jun 10, 2024 · fd33e00 · fd33e00
1 parent d4c581e
commit fd33e00
Showing 1 changed file with 143 additions and 56 deletions.
diff --git a/_maps/shuttles/ert_bounty.dmm b/_maps/shuttles/ert_bounty.dmm
@@ -21,14 +21,34 @@
 	shuttle_id = "huntership"
 	},
 /obj/structure/fans/tiny,
-/turf/open/floor/plating,
+/turf/open/floor/pod/dark,
 /area/shuttle/hunter)
 "d" = (
-/obj/structure/sign/warning/vacuum/external,
-/turf/closed/wall/mineral/plastitanium,
+/obj/structure/table,
+/obj/item/tape{
+	pixel_y = 17;
+	pixel_x = -12
+	},
+/obj/item/reagent_containers/cup/glass/dry_ramen{
+	pixel_x = 4;
+	pixel_y = -4
+	},
+/turf/open/floor/pod/dark,
 /area/shuttle/hunter)
 "f" = (
 /obj/structure/table,
+/obj/structure/sign/poster/contraband/bountyhunters/directional/north,
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = 8
+	},
+/obj/item/reagent_containers/cup/glass/coffee{
+	pixel_x = 9;
+	pixel_y = -3
+	},
+/obj/effect/spawner/random/bureaucracy/pen{
+	pixel_x = -6;
+	pixel_y = -7
+	},
 /turf/open/floor/pod/light,
 /area/shuttle/hunter)
 "h" = (
@@ -37,18 +57,24 @@
 /area/shuttle/hunter)
 "i" = (
 /obj/structure/tank_dispenser/oxygen,
+/obj/effect/turf_decal/stripes/full,
 /turf/open/floor/pod/dark,
 /area/shuttle/hunter)
 "j" = (
 /obj/structure/curtain/bounty,
 /turf/open/floor/pod/dark,
 /area/shuttle/hunter)
 "k" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
+/obj/structure/table/reinforced,
+/obj/item/book/manual/wiki/security_space_law{
+	pixel_y = 6;
+	pixel_x = -5
 	},
-/obj/machinery/light/floor,
-/turf/open/floor/pod/dark,
+/obj/item/grenade/chem_grenade/cleaner{
+	pixel_x = 8;
+	pixel_y = 14
+	},
+/turf/open/floor/pod/light,
 /area/shuttle/hunter)
 "l" = (
 /obj/machinery/power/shuttle_engine/propulsion{
@@ -60,8 +86,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/plating,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/airlock/external/ruin,
+/turf/open/floor/pod/dark,
 /area/shuttle/hunter)
 "n" = (
 /turf/closed/wall/mineral/plastitanium,
@@ -70,7 +97,14 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/turf/open/floor/plating,
+/turf/open/floor/pod/dark,
+/area/shuttle/hunter)
+"q" = (
+/obj/structure/closet/crate/bin,
+/obj/item/grenade/chem_grenade/glitter/pink,
+/obj/item/trash/can,
+/obj/item/cigbutt,
+/turf/open/floor/pod/dark,
 /area/shuttle/hunter)
 "r" = (
 /obj/structure/chair/office{
@@ -105,11 +139,11 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/hunter)
 "w" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+/obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/machinery/door/airlock/external/ruin,
-/turf/open/floor/plating,
+/obj/structure/sign/warning/vacuum/directional/west,
+/turf/open/floor/pod/dark,
 /area/shuttle/hunter)
 "x" = (
 /obj/structure/chair/office{
@@ -126,12 +160,15 @@
 /turf/open/floor/pod/dark,
 /area/shuttle/hunter)
 "z" = (
-/obj/structure/sign/poster/contraband/bountyhunters,
-/turf/closed/wall/mineral/plastitanium,
+/obj/structure/table/reinforced,
+/obj/item/storage/fancy/cigarettes/cigars/havana{
+	pixel_y = 6
+	},
+/turf/open/floor/pod/light,
 /area/shuttle/hunter)
 "A" = (
 /obj/effect/turf_decal/stripes/line{
-	dir = 9
+	dir = 8
 	},
 /turf/open/floor/pod/dark,
 /area/shuttle/hunter)
@@ -141,21 +178,30 @@
 /area/shuttle/hunter)
 "D" = (
 /obj/machinery/power/smes,
+/obj/effect/turf_decal/stripes/full,
 /turf/open/floor/pod/dark,
 /area/shuttle/hunter)
 "E" = (
 /obj/structure/table,
-/obj/item/phone,
+/obj/item/food/donut/plain{
+	pixel_y = -10;
+	pixel_x = -4
+	},
+/obj/item/reagent_containers/cup/glass/dry_ramen{
+	pixel_x = -4;
+	pixel_y = 15
+	},
 /turf/open/floor/pod/dark,
 /area/shuttle/hunter)
 "F" = (
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /obj/machinery/door/airlock/external/ruin,
 /obj/structure/fans/tiny,
-/turf/open/floor/plating,
+/turf/open/floor/pod/dark,
 /area/shuttle/hunter)
 "G" = (
-/turf/open/floor/plating,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/pod/dark,
 /area/shuttle/hunter)
 "H" = (
 /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/hunter{
@@ -172,8 +218,11 @@
 /area/shuttle/hunter)
 "J" = (
 /obj/effect/turf_decal/stripes/line,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/plating,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/obj/machinery/door/airlock/external/ruin,
+/turf/open/floor/pod/dark,
 /area/shuttle/hunter)
 "K" = (
 /obj/structure/chair/office{
@@ -198,24 +247,52 @@
 /area/shuttle/hunter)
 "P" = (
 /obj/structure/table,
+/obj/item/toy/cards/deck{
+	pixel_y = 3;
+	pixel_x = -3
+	},
+/obj/item/multitool{
+	pixel_x = 10;
+	pixel_y = 5
+	},
 /turf/open/floor/pod/dark,
 /area/shuttle/hunter)
 "Q" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/door/airlock/external/ruin,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/sign/warning/vacuum/directional/west,
+/turf/open/floor/pod/dark,
 /area/shuttle/hunter)
 "R" = (
 /obj/structure/table,
 /obj/item/binoculars,
+/obj/item/reagent_containers/cup/glass/coffee{
+	pixel_y = 16;
+	pixel_x = -7
+	},
 /turf/open/floor/pod/dark,
 /area/shuttle/hunter)
 "S" = (
+/obj/structure/table/reinforced,
+/obj/item/paper{
+	pixel_y = 2;
+	pixel_x = 2
+	},
+/obj/item/paper{
+	pixel_y = 5;
+	pixel_x = -4
+	},
+/obj/item/stamp/centcom{
+	pixel_x = 6;
+	pixel_y = 5
+	},
+/obj/item/pen/fourcolor{
+	pixel_x = -4
+	},
 /turf/open/floor/pod/light,
 /area/shuttle/hunter)
 "T" = (
 /obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plating,
+/turf/open/floor/pod/dark,
 /area/shuttle/hunter)
 "V" = (
 /obj/machinery/computer/camera_advanced{
@@ -226,30 +303,40 @@
 "X" = (
 /obj/structure/rack,
 /obj/item/grenade/c4{
-	pixel_x = -1;
-	pixel_y = 1
+	pixel_x = -4;
+	pixel_y = 3
 	},
 /obj/item/grenade/c4{
-	pixel_x = -6;
-	pixel_y = 7
+	pixel_x = 3;
+	pixel_y = 1
 	},
 /obj/item/grenade/c4{
-	pixel_x = 7;
-	pixel_y = -5
+	pixel_x = 11;
+	pixel_y = -1
 	},
+/obj/effect/turf_decal/stripes/full,
 /turf/open/floor/pod/dark,
 /area/shuttle/hunter)
 "Y" = (
 /obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
 /obj/machinery/light/small/directional/north,
+/obj/item/phone{
+	pixel_x = 8;
+	pixel_y = 7
+	},
+/obj/item/cigbutt/cigarbutt{
+	pixel_x = 7;
+	pixel_y = -10
+	},
+/obj/item/paper_bin{
+	pixel_x = -9;
+	pixel_y = 6
+	},
 /turf/open/floor/pod/light,
 /area/shuttle/hunter)
 "Z" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
-	},
-/turf/open/floor/pod/dark,
+/obj/structure/bookcase/random/reference,
+/turf/open/floor/pod/light,
 /area/shuttle/hunter)
 
 (1,1,1) = {"
@@ -330,15 +417,15 @@ n
 (6,1,1) = {"
 n
 n
-d
 n
 n
-O
-O
-O
+n
+A
+A
+A
+n
 n
 n
-d
 n
 n
 "}
@@ -348,9 +435,9 @@ p
 G
 J
 w
-A
-k
-Z
+O
+B
+O
 Q
 m
 G
@@ -363,9 +450,9 @@ n
 h
 n
 n
-j
-j
-j
+q
+O
+O
 n
 n
 h
@@ -391,7 +478,7 @@ a
 a
 a
 h
-z
+n
 f
 E
 P
@@ -408,7 +495,7 @@ a
 a
 n
 Y
-P
+d
 R
 O
 t
@@ -436,13 +523,13 @@ a
 a
 a
 a
-h
 n
-j
-j
+n
+n
+n
 j
 n
-h
+n
 a
 a
 a
@@ -452,11 +539,11 @@ a
 a
 a
 h
-S
+Z
 O
 B
 O
-S
+k
 h
 a
 a
@@ -471,7 +558,7 @@ S
 u
 I
 u
-S
+z
 h
 a
 a