diff --git a/_maps/_mod_celadon/configs/independent_lagoon.json b/_maps/_mod_celadon/configs/independent_lagoon.json
index eab565c91300..9ab3457784e6 100644
--- a/_maps/_mod_celadon/configs/independent_lagoon.json
+++ b/_maps/_mod_celadon/configs/independent_lagoon.json
@@ -17,51 +17,51 @@
 	"namelists": ["CRUISE"],
 	"job_slots": {
 		"Captain": {
-			"outfit": "/datum/outfit/job/independent/captain",
+			"outfit": "/datum/outfit/job/independent/captain/lagoon",
 			"slots": 1
 		},
 		"Cruise Director": {
-			"outfit": "/datum/outfit/job/independent/hop",
+			"outfit": "/datum/outfit/job/independent/hop/lagoon",
 			"slots": 1
 		},
 		"Security Officer": {
-			"outfit": "/datum/outfit/job/independent/security",
+			"outfit": "/datum/outfit/job/independent/security/lagoon",
 			"slots": 2
 		},
 		"Medical Doctor": {
-			"outfit": "/datum/outfit/job/independent/doctor",
+			"outfit": "/datum/outfit/job/independent/doctor/lagoon",
 			"slots": 1
 		},
 		"Ship Engineer": {
-			"outfit": "/datum/outfit/job/independent/atmos",
+			"outfit": "/datum/outfit/job/independent/atmos/lagoon",
 			"slots": 1
 		},
 		"Bartender": {
-			"outfit": "/datum/outfit/job/independent/bartender",
+			"outfit": "/datum/outfit/job/independent/bartender/lagoon",
 			"slots": 1
 		},
 		"Cook": {
-			"outfit": "/datum/outfit/job/independent/cook",
+			"outfit": "/datum/outfit/job/independent/cook/lagoon",
 			"slots": 1
 		},
 		"Botanist": {
-			"outfit": "/datum/outfit/job/independent/botanist",
+			"outfit": "/datum/outfit/job/independent/botanist/lagoon",
 			"slots": 1
 		},
 		"Curator": {
-			"outfit": "/datum/outfit/job/independent/curator",
+			"outfit": "/datum/outfit/job/independent/curator/lagoon",
 			"slots": 1
 		},
 		"Chaplain": {
-			"outfit": "/datum/outfit/job/independent/chaplain",
+			"outfit": "/datum/outfit/job/independent/chaplain/lagoon",
 			"slots": 1
 		},
 		"Janitor": {
-			"outfit": "/datum/outfit/job/independent/janitor",
+			"outfit": "/datum/outfit/job/independent/janitor/lagoon",
 			"slots": 1
 		},
 		"Passenger": {
-			"outfit": "/datum/outfit/job/independent/assistant/fancy",
+			"outfit": "/datum/outfit/job/independent/assistant/fancy/lagoon",
 			"slots": 10
 		}
 	}
diff --git a/_maps/_mod_celadon/shuttles/independent/independent_lagoon.dmm b/_maps/_mod_celadon/shuttles/independent/independent_lagoon.dmm
index eed20b792136..6ce07b776186 100644
--- a/_maps/_mod_celadon/shuttles/independent/independent_lagoon.dmm
+++ b/_maps/_mod_celadon/shuttles/independent/independent_lagoon.dmm
@@ -28,7 +28,6 @@
 /obj/item/clothing/accessory/waistcoat,
 /obj/item/storage/firstaid/toxin,
 /obj/item/clothing/suit/armor/vest/alt,
-/obj/machinery/light/directional/north,
 /obj/item/radio/intercom/directional/north,
 /obj/machinery/airalarm/directional/east,
 /turf/open/floor/carpet/black,
@@ -48,9 +47,43 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
+"ar" = (
+/obj/machinery/light/directional/south,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/item/clothing/shoes/sandal{
+	pixel_x = -5;
+	pixel_y = 13
+	},
+/obj/item/clothing/shoes/sandal{
+	pixel_x = 11;
+	pixel_y = 13
+	},
+/obj/item/clothing/shoes/sandal{
+	pixel_y = 8;
+	pixel_x = 12
+	},
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/item/clothing/shoes/sandal{
+	pixel_x = -5;
+	pixel_y = 8
+	},
+/turf/open/floor/wood/birch,
+/area/ship/general/other)
 "as" = (
 /obj/machinery/door/airlock/wood{
-	name = "Cabin 1"
+	name = "Cabin 1";
+	id_tag = "novip_cab_1"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -230,6 +263,16 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
+"bk" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/obj/structure/chair/pew/right{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ship/crew/chapel)
 "bn" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible{
 	dir = 4
@@ -360,7 +403,8 @@
 /area/ship/bridge)
 "bX" = (
 /obj/machinery/door/airlock/wood{
-	name = "Cabin 2"
+	name = "Cabin 2";
+	id_tag = "novip_cab_2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -378,6 +422,14 @@
 	},
 /turf/open/floor/wood,
 /area/ship/crew)
+"cc" = (
+/obj/structure/window,
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/item/kirbyplants/random{
+	pixel_y = 7
+	},
+/turf/open/floor/grass,
+/area/ship/crew/canteen)
 "ch" = (
 /obj/item/spacecash/bundle/c200,
 /obj/item/clothing/suit/hawaiian,
@@ -389,6 +441,18 @@
 	},
 /turf/open/floor/wood,
 /area/ship/crew)
+"cj" = (
+/obj/machinery/vending/coffee{
+	pixel_x = 13;
+	density = 0;
+	default_price = 22;
+	extra_price = 75
+	},
+/obj/effect/turf_decal/corner/opaque/white/border{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/fore)
 "cm" = (
 /obj/structure/fireplace,
 /obj/effect/turf_decal/siding/wood{
@@ -396,12 +460,18 @@
 	},
 /turf/open/floor/carpet/black,
 /area/ship/crew)
+"ct" = (
+/obj/structure/table/reinforced/glass,
+/obj/structure/railing,
+/turf/open/floor/light,
+/area/ship/crew/canteen/kitchen)
 "cv" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/office)
 "cx" = (
 /obj/machinery/door/airlock/titanium{
-	name = "Cabin 6"
+	name = "Cabin 6";
+	id_tag = "novip_cab_6"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -478,10 +548,13 @@
 /turf/open/floor/grass,
 /area/ship/hallway/central)
 "cR" = (
-/obj/machinery/computer/arcade/battle,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/light/colour_cycle/dancefloor_b,
-/area/ship/storage)
+/obj/structure/chair/stool/bar{
+	dir = 8;
+	pixel_x = -8
+	},
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/carpet/black,
+/area/ship/crew/office)
 "cS" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/hydroponics)
@@ -540,13 +613,19 @@
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "dr" = (
-/obj/structure/table/reinforced,
-/obj/machinery/reagentgrinder,
+/obj/machinery/reagentgrinder{
+	pixel_x = 7;
+	pixel_y = 10
+	},
 /obj/machinery/firealarm/directional/east,
+/obj/structure/table/wood/reinforced/bar,
 /turf/open/floor/carpet/black,
 /area/ship/crew/canteen/kitchen)
 "dt" = (
-/obj/machinery/vending/clothing,
+/obj/machinery/vending/clothing{
+	default_price = 30;
+	extra_price = 60
+	},
 /obj/effect/turf_decal/corner/opaque/white/border,
 /turf/open/floor/plasteel,
 /area/ship/hallway/starboard)
@@ -583,8 +662,9 @@
 /turf/open/floor/pod/dark,
 /area/ship/hallway/port)
 "dM" = (
-/obj/structure/chair{
-	dir = 4
+/obj/structure/chair/wood{
+	dir = 4;
+	pixel_x = 10
 	},
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
@@ -624,11 +704,11 @@
 /turf/open/floor/wood,
 /area/ship/crew/library)
 "dZ" = (
-/obj/structure/chair/stool/bar{
-	dir = 1
-	},
-/turf/open/floor/eighties,
-/area/ship/storage)
+/obj/structure/table/wood/poker,
+/obj/item/spacecash/bundle/c100,
+/obj/machinery/newscaster/directional/east,
+/turf/open/floor/light/colour_cycle/dancefloor_a,
+/area/ship/crew/office)
 "ea" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -646,18 +726,11 @@
 /turf/open/floor/plasteel,
 /area/ship/external)
 "ei" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
-/obj/item/kirbyplants,
-/obj/effect/turf_decal/corner/opaque/white/border{
-	dir = 6
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/turf/open/floor/carpet/black,
+/area/ship/crew/office)
 "en" = (
 /obj/structure/chair,
 /turf/open/floor/plasteel,
@@ -678,12 +751,14 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "eE" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
+/obj/structure/curtain,
+/obj/machinery/shower{
+	dir = 8;
+	pixel_x = -4
 	},
-/obj/machinery/roulette,
-/turf/open/floor/carpet/black,
-/area/ship/crew/office)
+/obj/item/soap/deluxe,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/general/other)
 "eF" = (
 /obj/machinery/vending/autodrobe{
 	all_items_free = 1
@@ -719,6 +794,9 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
+/obj/structure/sign/painting/library{
+	pixel_x = 32
+	},
 /turf/open/floor/wood,
 /area/ship/crew/library)
 "eR" = (
@@ -743,17 +821,23 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "eT" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
+	},
 /obj/structure/cable{
-	icon_state = "0-2"
+	icon_state = "2-4"
 	},
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_y = 10;
-	pixel_x = -20
+/obj/machinery/firealarm/directional/north{
+	pixel_x = -14
 	},
-/turf/open/floor/carpet/black,
-/area/ship/crew/office)
+/obj/item/radio/intercom/directional/north{
+	pixel_x = 3
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/turf/open/floor/wood,
+/area/ship/general/other)
 "eX" = (
 /obj/machinery/atmospherics/pipe/simple/purple/visible{
 	dir = 9
@@ -805,6 +889,13 @@
 	dir = 8
 	},
 /obj/machinery/light/directional/west,
+/obj/structure/disposalpipe/segment{
+	dir = 2
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
 "fs" = (
@@ -936,8 +1027,12 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/engineering)
 "gb" = (
-/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/obj/machinery/light/directional/east,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/general/other)
 "ge" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plasteel,
@@ -993,9 +1088,6 @@
 /turf/open/floor/pod/dark,
 /area/ship/hallway/fore)
 "gI" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
@@ -1112,7 +1204,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/ship/crew/chapel)
 "ht" = (
 /obj/structure/cable{
@@ -1142,12 +1234,15 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/port)
 "hA" = (
-/obj/structure/bookcase/random/fiction,
-/obj/effect/turf_decal/siding/wood{
-	dir = 6
+/obj/structure/chair/pew/right{
+	dir = 4
 	},
-/turf/open/floor/wood,
-/area/ship/crew/library)
+/obj/structure/chair/pew{
+	pixel_x = 7;
+	pixel_y = 3
+	},
+/turf/open/floor/wood/ebony,
+/area/ship/general/other/zone_2)
 "hK" = (
 /obj/structure/disposalpipe/trunk{
 	dir = 1
@@ -1167,15 +1262,16 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
 "hS" = (
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/structure/flora/ausbushes/ppflowers,
+/obj/item/kirbyplants/random{
+	pixel_y = 7
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/effect/turf_decal/corner/opaque/white/border{
-	dir = 8
+/obj/structure/window,
+/obj/structure/window{
+	dir = 4
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/turf/open/floor/grass,
+/area/ship/crew/canteen)
 "hT" = (
 /obj/structure/table/wood,
 /obj/item/clothing/mask/gas/clown_hat,
@@ -1208,15 +1304,8 @@
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "hZ" = (
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only,
-/obj/effect/turf_decal/corner/opaque/white/border{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/general/other)
 "ia" = (
 /obj/structure/sign/painting/library{
 	pixel_x = 32
@@ -1290,8 +1379,14 @@
 /turf/open/floor/plasteel,
 /area/ship/crew)
 "iq" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/storage)
+/obj/effect/turf_decal/corner/opaque/white/border{
+	dir = 8
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 6
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/fore)
 "it" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
@@ -1448,13 +1543,16 @@
 /turf/open/floor/plasteel,
 /area/ship/external)
 "jj" = (
-/obj/structure/table/reinforced,
 /obj/item/reagent_containers/glass/rag,
 /obj/item/reagent_containers/food/drinks/shaker,
 /obj/machinery/vending/boozeomat{
 	pixel_x = 32;
 	all_items_free = 1
 	},
+/obj/structure/table/wood/reinforced/bar,
+/obj/structure/railing/corner{
+	dir = 8
+	},
 /turf/open/floor/carpet/black,
 /area/ship/crew/canteen/kitchen)
 "jk" = (
@@ -1471,22 +1569,25 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "jt" = (
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/structure/chair/comfy/grey/directional/south,
+/obj/machinery/light/directional/east,
+/turf/open/floor/carpet/black,
+/area/ship/crew/office)
+"jw" = (
+/obj/structure/sauna_oven_steam,
+/turf/open/floor/wood/ebony,
+/area/ship/general/other/zone_2)
+"jx" = (
+/obj/structure/flora/ausbushes/brflowers,
+/obj/item/kirbyplants/random{
+	pixel_y = 7
 	},
-/obj/machinery/computer/arcade,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/machinery/light_switch{
-	pixel_x = 20;
-	pixel_y = -12;
+/obj/structure/window,
+/obj/structure/window{
 	dir = 8
 	},
-/turf/open/floor/light/colour_cycle/dancefloor_b,
-/area/ship/storage)
-"jw" = (
-/obj/structure/chair/comfy,
-/turf/open/floor/carpet/black,
-/area/ship/crew/office)
+/turf/open/floor/grass,
+/area/ship/crew/canteen)
 "jz" = (
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -1509,7 +1610,13 @@
 /area/ship/crew)
 "jI" = (
 /obj/item/toy/seashell,
-/turf/open/floor/plating/beach/sand,
+/obj/effect/turf_decal/weather/sand{
+	dir = 10
+	},
+/obj/effect/turf_decal/weather/sand{
+	dir = 4
+	},
+/turf/open/floor/carpet/green,
 /area/ship/hallway/central)
 "jM" = (
 /obj/machinery/libraryscanner,
@@ -1517,8 +1624,9 @@
 /turf/open/floor/carpet/black,
 /area/ship/crew/library)
 "jP" = (
-/obj/structure/chair/comfy/grey/directional/west,
-/obj/machinery/newscaster/directional/east,
+/obj/item/kirbyplants/photosynthetic{
+	pixel_x = -10
+	},
 /turf/open/floor/carpet/black,
 /area/ship/crew/office)
 "jS" = (
@@ -1660,7 +1768,11 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "ky" = (
-/obj/structure/closet/athletic_mixed,
+/obj/structure/closet/athletic_mixed{
+	pixel_x = 17;
+	pixel_y = 24;
+	density = 0
+	},
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
@@ -1680,6 +1792,9 @@
 "kL" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/chapel)
+"kR" = (
+/turf/open/floor/wood/ebony,
+/area/ship/general/other/zone_2)
 "kX" = (
 /obj/structure/table/glass,
 /obj/machinery/computer/med_data/laptop{
@@ -1734,6 +1849,26 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
+"lt" = (
+/obj/machinery/door/window/survival_pod{
+	opacity = 1
+	},
+/obj/machinery/door/window/survival_pod{
+	dir = 1
+	},
+/obj/machinery/power/apc/auto_name/directional/east{
+	req_ship_access = 0
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_y = 1;
+	pixel_x = -20
+	},
+/turf/open/floor/wood/ebony,
+/area/ship/general/other/zone_2)
 "lx" = (
 /obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 4
@@ -1769,7 +1904,18 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
-/obj/machinery/newscaster/directional/west,
+/obj/machinery/button/door{
+	pixel_y = -10;
+	id = "novip_cab_2";
+	name = "Bolt Cabin 2";
+	dir = 4;
+	pixel_x = -25;
+	specialfunctions = 4;
+	normaldoorcontrol = 1
+	},
+/obj/machinery/newscaster/directional/west{
+	pixel_y = 6
+	},
 /turf/open/floor/wood,
 /area/ship/crew)
 "lI" = (
@@ -1808,8 +1954,8 @@
 /obj/item/clothing/under/dress/blacktango,
 /obj/item/clothing/glasses/sunglasses,
 /obj/item/clothing/gloves/color/evening,
-/obj/item/spacecash/bundle/c100,
 /obj/machinery/light/directional/north,
+/obj/item/spacecash/bundle/c500,
 /turf/open/floor/carpet/black,
 /area/ship/crew)
 "lT" = (
@@ -1924,12 +2070,21 @@
 /turf/open/floor/pod/dark,
 /area/ship/hallway/fore)
 "mB" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/cable{
-	icon_state = "1-8"
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/carpet/black,
-/area/ship/crew/office)
+/obj/machinery/light/directional/east{
+	pixel_x = 25
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/turf/open/floor/wood,
+/area/ship/general/other)
 "mF" = (
 /obj/machinery/door/airlock/maintenance_hatch,
 /obj/structure/cable{
@@ -2035,8 +2190,15 @@
 /turf/open/floor/plasteel,
 /area/ship/external)
 "ne" = (
-/obj/structure/disposalpipe/segment{
-	dir = 6
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
+/obj/machinery/disposal/bin{
+	pixel_x = 13;
+	density = 0
+	},
+/obj/effect/turf_decal/corner/opaque/white/border{
+	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
@@ -2116,20 +2278,38 @@
 /area/ship/crew)
 "nU" = (
 /obj/effect/turf_decal/siding/wood,
+/obj/machinery/newscaster/directional/west{
+	dir = 2;
+	pixel_x = 0;
+	pixel_y = -30
+	},
 /turf/open/floor/wood,
 /area/ship/crew)
 "nX" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/structure/closet/wall/directional/west,
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
 	},
-/obj/machinery/door/airlock/gold/glass{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
-/obj/machinery/door/firedoor,
-/turf/open/floor/carpet/black,
-/area/ship/crew/office)
-"oh" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/item/towel{
+	pixel_y = 8;
+	pixel_x = -11
+	},
+/obj/item/towel{
+	pixel_x = -7;
+	pixel_y = 12
+	},
+/turf/open/floor/wood,
+/area/ship/general/other)
+"oe" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/structure/railing/corner,
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
+"oh" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -2157,12 +2337,8 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
 "oo" = (
-/obj/machinery/vending/coffee,
-/obj/effect/turf_decal/corner/opaque/white/border{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/general/other/zone_2)
 "ot" = (
 /obj/structure/railing/corner,
 /obj/effect/turf_decal/corner/opaque/white/border,
@@ -2177,7 +2353,8 @@
 /area/ship/hallway/port)
 "oz" = (
 /obj/machinery/door/airlock/titanium{
-	name = "Cabin 5"
+	name = "Cabin 5";
+	id_tag = "novip_cab_5"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -2248,22 +2425,64 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "oV" = (
+/obj/structure/window/reinforced/spawner/west{
+	opacity = 1;
+	dir = 2
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
+	},
+/obj/structure/dresser{
+	dir = 4;
+	pixel_x = -6
+	},
+/obj/item/towel{
+	pixel_x = -5;
+	pixel_y = 4
+	},
+/obj/item/towel{
+	pixel_x = -5;
+	pixel_y = 8
+	},
+/obj/item/towel{
+	pixel_x = -7;
+	pixel_y = 12
+	},
+/obj/item/towel{
+	pixel_y = 8;
+	pixel_x = -11
+	},
+/obj/item/lighter,
+/turf/open/floor/wood,
+/area/ship/general/other)
+"oW" = (
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+	dir = 9
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+	dir = 9
 	},
-/obj/machinery/door/airlock/gold/glass{
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/airalarm/directional/south,
+/obj/machinery/light_switch{
+	pixel_x = 20;
+	pixel_y = -12;
 	dir = 8
 	},
-/obj/machinery/door/firedoor,
-/turf/open/floor/carpet/black,
-/area/ship/crew/office)
-"oW" = (
-/obj/machinery/vending/cigarette/syndicate,
-/turf/open/floor/carpet/black,
-/area/ship/crew/office)
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1
+	},
+/turf/open/floor/wood/birch,
+/area/ship/general/other)
 "pc" = (
 /obj/effect/turf_decal/corner/opaque/white/border,
 /obj/machinery/light/directional/south,
@@ -2412,9 +2631,14 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
 "pP" = (
-/obj/machinery/vending/games,
-/turf/open/floor/light/colour_cycle/dancefloor_b,
-/area/ship/storage)
+/obj/machinery/vending/cigarette/syndicate{
+	pixel_x = -6;
+	default_price = 37;
+	extra_price = 125
+	},
+/obj/machinery/light/directional/west,
+/turf/open/floor/carpet/black,
+/area/ship/crew/office)
 "pQ" = (
 /obj/machinery/door/airlock{
 	dir = 4
@@ -2438,9 +2662,6 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen/kitchen)
 "pV" = (
-/obj/structure/chair/pew/left{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
 	},
@@ -2467,9 +2688,7 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "qa" = (
-/obj/structure/chair/sofa/brown/directional/east{
-	icon_state = "sofacorner"
-	},
+/obj/structure/chair/sofa/brown/corner/directional/east,
 /turf/open/floor/carpet/nanoweave/blue,
 /area/ship/hallway/fore)
 "qe" = (
@@ -2539,9 +2758,7 @@
 /turf/open/floor/plating/beach/sand,
 /area/ship/hallway/central)
 "qA" = (
-/obj/structure/chair{
-	dir = 1
-	},
+/obj/structure/chair/comfy/orange/directional/north,
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "qD" = (
@@ -2608,13 +2825,15 @@
 	},
 /area/ship/bridge)
 "qU" = (
-/obj/structure/disposalpipe/segment{
-	dir = 2
+/obj/effect/turf_decal/corner/opaque/white/border{
+	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/machinery/vending/games{
+	pixel_x = 13;
+	density = 0;
+	default_price = 25;
+	extra_price = 125
 	},
-/obj/machinery/door/firedoor/border_only,
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
 "qY" = (
@@ -2682,10 +2901,14 @@
 /turf/open/floor/wood,
 /area/ship/crew/hydroponics)
 "rC" = (
-/obj/machinery/computer/arcade,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/light/colour_cycle/dancefloor_b,
-/area/ship/storage)
+/obj/structure/window/reinforced/spawner/west{
+	opacity = 1
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	icon_state = "steel_decals9"
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/general/other)
 "rD" = (
 /obj/structure/railing,
 /obj/effect/turf_decal/siding/thinplating/dark{
@@ -2696,6 +2919,7 @@
 /area/ship/external)
 "rF" = (
 /obj/structure/altar_of_gods,
+/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/wood,
 /area/ship/crew/chapel)
 "rI" = (
@@ -2725,6 +2949,10 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
 	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/apc/auto_name/directional/west,
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "rQ" = (
@@ -2749,7 +2977,10 @@
 /area/ship/hallway/aft)
 "rV" = (
 /obj/machinery/light/directional/east,
-/obj/machinery/vending/cigarette/beach,
+/obj/machinery/vending/cigarette/beach{
+	default_price = 37;
+	extra_price = 125
+	},
 /obj/effect/turf_decal/corner/opaque/white/border{
 	dir = 5
 	},
@@ -2768,6 +2999,31 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
+/obj/machinery/button/door{
+	pixel_y = 10;
+	id = "novip_cab_7";
+	name = "Bolt Cabin 7";
+	dir = 8;
+	pixel_x = 24;
+	specialfunctions = 4;
+	normaldoorcontrol = 1
+	},
+/turf/open/floor/carpet/black,
+/area/ship/crew)
+"sk" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/obj/machinery/button/door{
+	pixel_y = 10;
+	id = "novip_cab_5";
+	name = "Bolt Cabin 5";
+	dir = 8;
+	pixel_x = 24;
+	specialfunctions = 4;
+	normaldoorcontrol = 1
+	},
 /turf/open/floor/carpet/black,
 /area/ship/crew)
 "sm" = (
@@ -2886,10 +3142,10 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/port)
 "sT" = (
-/obj/machinery/computer/arcade/orion_trail,
 /obj/machinery/airalarm/directional/north,
-/turf/open/floor/light/colour_cycle/dancefloor_b,
-/area/ship/storage)
+/obj/machinery/computer/slot_machine,
+/turf/open/floor/carpet/black,
+/area/ship/crew/office)
 "ta" = (
 /turf/open/floor/plating/beach/coastline_t,
 /area/ship/hallway/central)
@@ -2926,7 +3182,10 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/port)
 "tp" = (
-/obj/structure/dresser,
+/obj/structure/dresser{
+	dir = 4;
+	pixel_x = -6
+	},
 /obj/effect/turf_decal/siding/wood/end{
 	dir = 8
 	},
@@ -2950,9 +3209,12 @@
 /turf/closed/wall/mineral/titanium,
 /area/ship/crew/canteen/kitchen)
 "tx" = (
-/obj/structure/table/wood/poker,
-/obj/item/spacecash/bundle/c100,
-/turf/open/floor/light/colour_cycle/dancefloor_a,
+/obj/structure/chair/stool/bar{
+	dir = 1;
+	pixel_y = 18
+	},
+/obj/machinery/computer/helm/viewscreen/directional/east,
+/turf/open/floor/carpet/black,
 /area/ship/crew/office)
 "tA" = (
 /obj/structure/disposalpipe/segment,
@@ -2981,14 +3243,32 @@
 /turf/open/floor/grass,
 /area/ship/hallway/central)
 "tH" = (
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/structure/closet/wall/directional/west,
+/obj/structure/closet/wall/directional/north,
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
+	dir = 4
+	},
+/obj/item/towel{
+	pixel_y = 8;
+	pixel_x = -11
+	},
+/obj/item/towel{
+	pixel_x = -7;
+	pixel_y = 12
+	},
+/obj/item/towel{
+	pixel_x = -5;
+	pixel_y = 8
 	},
-/turf/open/floor/eighties,
-/area/ship/storage)
+/obj/item/towel{
+	pixel_x = -5;
+	pixel_y = 4
+	},
+/turf/open/floor/wood,
+/area/ship/general/other)
 "tJ" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -3015,23 +3295,37 @@
 /turf/closed/wall/mineral/titanium,
 /area/ship/crew/canteen)
 "tY" = (
-/obj/machinery/vending/cola/starkist,
+/obj/machinery/vending/cola/starkist{
+	default_price = 22;
+	extra_price = 100
+	},
 /obj/effect/turf_decal/corner/opaque/white/border{
 	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "ub" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+/obj/machinery/door/window/survival_pod{
+	opacity = 1
 	},
-/turf/open/floor/carpet/black,
-/area/ship/crew/office)
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/ship/general/other)
 "ue" = (
-/obj/machinery/vending/snack/green,
+/obj/machinery/vending/snack/green{
+	default_price = 30;
+	extra_price = 80
+	},
 /obj/effect/turf_decal/corner/opaque/white/border{
 	dir = 5
 	},
@@ -3104,6 +3398,7 @@
 	},
 /obj/structure/closet/wardrobe/mixed,
 /obj/machinery/airalarm/directional/north,
+/obj/item/spacecash/bundle/c1000,
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "uO" = (
@@ -3181,12 +3476,25 @@
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "vg" = (
-/obj/effect/spawner/structure/window/shuttle,
-/turf/open/floor/plating,
+/obj/item/kirbyplants/random{
+	pixel_y = 7
+	},
+/obj/structure/flora/ausbushes/ppflowers,
+/obj/structure/window,
+/obj/structure/window{
+	dir = 8
+	},
+/turf/open/floor/grass,
 /area/ship/crew/canteen)
 "vj" = (
-/obj/structure/disposalpipe/segment{
-	dir = 9
+/obj/effect/turf_decal/corner/opaque/black/border{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3216,9 +3524,7 @@
 /turf/open/floor/grass/fairy,
 /area/ship/crew/hydroponics)
 "vB" = (
-/obj/structure/chair/sofa/brown/directional/east{
-	icon_state = "sofaend_right"
-	},
+/obj/structure/chair/sofa/brown/right/directional/east,
 /turf/open/floor/carpet/nanoweave/blue,
 /area/ship/hallway/fore)
 "vD" = (
@@ -3281,11 +3587,16 @@
 /turf/open/floor/wood,
 /area/ship/crew/hydroponics)
 "vP" = (
-/obj/structure/chair/pew/left{
-	dir = 1
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
 	},
-/turf/open/floor/carpet,
-/area/ship/crew/chapel)
+/obj/structure/bed/double,
+/obj/item/bedsheet/double/brown,
+/obj/structure/sign/painting/library{
+	pixel_x = 32
+	},
+/turf/open/floor/wood,
+/area/ship/crew)
 "vU" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -3312,7 +3623,8 @@
 /area/ship/hallway/port)
 "wd" = (
 /obj/machinery/door/airlock/titanium{
-	name = "Cabin 7"
+	name = "Cabin 7";
+	id_tag = "novip_cab_7"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -3418,8 +3730,12 @@
 /turf/closed/wall/mineral/titanium,
 /area/ship/crew/dorm)
 "wP" = (
-/obj/structure/bed,
-/obj/item/bedsheet/black,
+/obj/structure/bed/double{
+	dir = 1
+	},
+/obj/item/bedsheet/double/black{
+	dir = 1
+	},
 /turf/open/floor/carpet/black,
 /area/ship/crew)
 "wT" = (
@@ -3453,11 +3769,20 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
 "wZ" = (
-/obj/effect/turf_decal/siding/wood{
+/obj/structure/fluff/beach_umbrella/cap,
+/obj/effect/turf_decal/weather/sand{
+	dir = 4
+	},
+/obj/effect/turf_decal/weather/sand{
+	dir = 5
+	},
+/obj/effect/turf_decal/weather/sand{
 	dir = 8
 	},
-/turf/open/floor/wood,
-/area/ship/crew/chapel)
+/turf/open/floor/carpet/blue{
+	baseturfs = /turf/open/floor/plating/beach/sand
+	},
+/area/ship/hallway/central)
 "xc" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3624,6 +3949,12 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/carpet,
 /area/ship/crew/chapel)
+"yi" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/carpet/black,
+/area/ship/crew/office)
 "yj" = (
 /obj/machinery/vending/dinnerware{
 	all_items_free = 1
@@ -3633,9 +3964,9 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen/kitchen)
 "yl" = (
-/obj/structure/table/reinforced,
 /obj/machinery/door/firedoor/border_only,
 /obj/effect/turf_decal/corner/opaque/white/diagonal,
+/obj/structure/table/reinforced/titaniumglass,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen/kitchen)
 "ym" = (
@@ -3720,12 +4051,12 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 1
 	},
-/turf/open/floor/eighties,
-/area/ship/storage)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/carpet/black,
+/area/ship/crew/office)
 "yI" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -3793,8 +4124,9 @@
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "cruisewindows"
 	},
+/obj/structure/curtain/bounty,
 /turf/open/floor/plating,
-/area/ship/storage)
+/area/ship/crew/office)
 "zd" = (
 /obj/machinery/suit_storage_unit/standard_unit,
 /obj/effect/turf_decal/corner/opaque/lightgrey/border{
@@ -3803,23 +4135,57 @@
 /turf/open/floor/pod/dark,
 /area/ship/hallway/fore)
 "ze" = (
-/obj/machinery/vending/cola,
-/obj/effect/turf_decal/corner/opaque/white/border{
-	dir = 4
+/obj/machinery/roulette,
+/obj/machinery/firealarm/directional/north,
+/obj/machinery/newscaster/directional/north{
+	pixel_x = 15
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/turf/open/floor/carpet/black,
+/area/ship/crew/office)
 "zf" = (
 /obj/structure/flora/ausbushes/ppflowers,
 /turf/open/floor/grass,
 /area/ship/hallway/central)
+"zg" = (
+/obj/item/kirbyplants,
+/obj/effect/turf_decal/corner/opaque/white/border{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/fore)
+"zr" = (
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/item/kirbyplants/random{
+	pixel_y = 7
+	},
+/obj/structure/window{
+	dir = 8
+	},
+/obj/structure/window,
+/turf/open/floor/grass,
+/area/ship/crew/canteen)
 "zs" = (
-/obj/structure/table/reinforced,
 /obj/item/reagent_containers/food/snacks/burger/fish,
 /obj/machinery/door/firedoor/border_only,
 /obj/effect/turf_decal/corner/opaque/white/diagonal,
+/obj/structure/table/reinforced/titaniumglass,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen/kitchen)
+"zt" = (
+/obj/machinery/door/window/survival_pod{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/general/other)
 "zz" = (
 /obj/effect/turf_decal/corner/opaque/white/border,
 /turf/open/floor/plasteel,
@@ -3838,6 +4204,15 @@
 "zI" = (
 /turf/open/floor/pod/light,
 /area/ship/hallway/port)
+"zL" = (
+/obj/structure/railing,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_y = 1;
+	pixel_x = -20
+	},
+/turf/open/floor/carpet/nanoweave/red,
+/area/ship/crew/canteen)
 "zN" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/drinks/coffee{
@@ -3890,6 +4265,16 @@
 /obj/item/radio/intercom/directional/north,
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
+"zT" = (
+/obj/effect/turf_decal/corner/opaque/white/border{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/fore)
 "zW" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/structure/chair/pew/left{
@@ -3959,7 +4344,6 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "An" = (
-/obj/structure/table/reinforced,
 /obj/item/reagent_containers/condiment/saltshaker{
 	pixel_x = 5;
 	pixel_y = 5
@@ -3967,6 +4351,7 @@
 /obj/item/reagent_containers/condiment/peppermill,
 /obj/machinery/door/firedoor/border_only,
 /obj/effect/turf_decal/corner/opaque/white/diagonal,
+/obj/structure/table/reinforced/titaniumglass,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen/kitchen)
 "As" = (
@@ -4006,21 +4391,23 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "AB" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/effect/turf_decal/siding/wood,
+/obj/structure/railing,
+/obj/structure/chair/sofa/grey/left/directional/west,
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "AD" = (
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/item/towel{
+	pixel_y = 7
 	},
-/obj/effect/turf_decal/corner/opaque/black/border{
-	dir = 4
+/obj/item/towel{
+	pixel_y = 11
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/obj/item/towel{
+	pixel_y = 15
+	},
+/turf/open/floor/plating/beach/coastline_t,
+/area/ship/hallway/central)
 "AI" = (
 /obj/machinery/light/directional/south,
 /turf/open/floor/plating/beach/water,
@@ -4036,10 +4423,37 @@
 /turf/open/floor/plasteel,
 /area/ship/external)
 "AW" = (
-/obj/machinery/vending/wardrobe/chap_wardrobe,
+/obj/machinery/vending/wardrobe/chap_wardrobe{
+	all_items_free = 1;
+	pixel_y = 20;
+	default_price = 175;
+	extra_price = 225
+	},
 /obj/effect/turf_decal/siding/wood/end{
 	dir = 1
 	},
+/obj/structure/closet/wall/directional/west,
+/obj/item/reagent_containers/food/snacks/grown/moonflower,
+/obj/item/reagent_containers/food/snacks/grown/moonflower,
+/obj/item/reagent_containers/food/snacks/grown/moonflower,
+/obj/item/storage/fancy/candle_box{
+	pixel_x = 12
+	},
+/obj/item/storage/fancy/candle_box{
+	pixel_x = 12
+	},
+/obj/item/clothing/head/plastic_flower,
+/obj/item/clothing/head/plastic_flower,
+/obj/item/clothing/head/peaceflower,
+/obj/item/clothing/head/peaceflower,
+/obj/item/clothing/head/peaceflower,
+/obj/effect/spawner/lootdrop/flower,
+/obj/effect/spawner/lootdrop/flower,
+/obj/item/clothing/under/dress/flower,
+/obj/item/grown/novaflower,
+/obj/item/grown/novaflower,
+/obj/item/grown/sunflower,
+/obj/item/grown/sunflower,
 /turf/open/floor/wood,
 /area/ship/crew/chapel)
 "AX" = (
@@ -4073,15 +4487,29 @@
 /turf/open/floor/engine/n2,
 /area/ship/engineering)
 "Bi" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/structure/window/reinforced/spawner/west{
+	opacity = 1
 	},
-/obj/structure/chair/stool/bar{
-	dir = 4
+/obj/structure/sink/kitchen{
+	dir = 1
+	},
+/obj/item/reagent_containers/glass/bucket/wooden{
+	pixel_x = 11;
+	pixel_y = -6;
+	layer = 2
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/general/other)
+"Bj" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_y = 1;
+	pixel_x = -20
 	},
-/obj/machinery/light/directional/south,
 /turf/open/floor/carpet/black,
-/area/ship/crew/office)
+/area/ship/crew/canteen/kitchen)
 "Bl" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
@@ -4110,6 +4538,13 @@
 /obj/effect/turf_decal/corner/opaque/white/border,
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
+"Bp" = (
+/obj/structure/chair/wood{
+	dir = 8;
+	pixel_x = -10
+	},
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
 "Bt" = (
 /obj/effect/spawner/structure/window/shuttle,
 /obj/machinery/door/poddoor/shutters/preopen{
@@ -4118,16 +4553,19 @@
 /turf/open/floor/plating,
 /area/ship/crew/chapel)
 "Bw" = (
-/obj/structure/chair/pew/right{
-	dir = 1
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
 	},
-/turf/open/floor/carpet,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/obj/structure/chair/pew/left{
+	dir = 1
+	},
+/turf/open/floor/wood,
 /area/ship/crew/chapel)
 "Bz" = (
 /obj/machinery/power/smes/shuttle/precharged{
@@ -4160,15 +4598,17 @@
 /turf/open/floor/grass,
 /area/ship/hallway/central)
 "BO" = (
-/obj/machinery/door/airlock/public/glass,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/door/firedoor,
-/turf/open/floor/eighties,
-/area/ship/storage)
+/obj/machinery/door/airlock/gold/glass{
+	dir = 1
+	},
+/turf/open/floor/carpet/black,
+/area/ship/crew/office)
 "BP" = (
 /obj/machinery/autolathe,
 /obj/effect/turf_decal/corner/opaque/white/border{
@@ -4193,7 +4633,23 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
 "BW" = (
-/obj/machinery/computer/helm/viewscreen/directional/east,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/item/skateboard/hoverboard{
+	pixel_x = -4
+	},
+/obj/structure/table/glass,
+/obj/item/clothing/shoes/wheelys{
+	pixel_x = 4;
+	pixel_y = 9
+	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_y = 10;
+	pixel_x = -20
+	},
 /turf/open/floor/carpet/black,
 /area/ship/crew/office)
 "BX" = (
@@ -4235,6 +4691,15 @@
 "Ci" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/canteen/kitchen)
+"Ck" = (
+/obj/structure/chair/pew/right{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ship/crew/chapel)
 "Co" = (
 /obj/effect/spawner/structure/window/shuttle,
 /obj/machinery/door/poddoor/shutters/preopen{
@@ -4270,12 +4735,14 @@
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "Cx" = (
-/obj/structure/table/wood,
+/obj/structure/table/wood/fancy/red,
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "Cy" = (
-/obj/item/kirbyplants/photosynthetic,
-/obj/machinery/airalarm/directional/north,
+/obj/structure/chair/stool/bar{
+	dir = 4;
+	pixel_x = 9
+	},
 /turf/open/floor/carpet/black,
 /area/ship/crew/office)
 "CD" = (
@@ -4305,7 +4772,10 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/port)
 "CM" = (
-/obj/machinery/vending/autodrobe,
+/obj/machinery/vending/autodrobe{
+	default_price = 90;
+	extra_price = 180
+	},
 /obj/effect/turf_decal/corner/opaque/white/border{
 	dir = 6
 	},
@@ -4323,7 +4793,7 @@
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "CR" = (
-/obj/structure/table/reinforced,
+/obj/structure/table/reinforced/glass,
 /turf/open/floor/light,
 /area/ship/crew/canteen/kitchen)
 "CS" = (
@@ -4366,11 +4836,19 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 6
 	},
-/turf/open/floor/wood,
+/obj/item/kirbyplants/random{
+	pixel_y = 6
+	},
+/turf/open/floor/carpet,
 /area/ship/crew/chapel)
 "Dh" = (
-/obj/machinery/jukebox,
-/obj/machinery/light/directional/north,
+/obj/machinery/jukebox{
+	pixel_y = 18;
+	density = 0
+	},
+/obj/machinery/light/directional/north{
+	pixel_y = 35
+	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
@@ -4393,9 +4871,7 @@
 /turf/open/floor/plating,
 /area/ship/crew/janitor)
 "Ds" = (
-/obj/structure/chair{
-	dir = 8
-	},
+/obj/structure/chair/sofa/grey/right/directional/east,
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "Dv" = (
@@ -4417,12 +4893,11 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen/kitchen)
 "DD" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 10
 	},
+/obj/structure/railing,
+/obj/structure/chair/sofa/grey/right/directional/west,
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "DK" = (
@@ -4466,19 +4941,25 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "DT" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/newscaster/directional/north{
-	pixel_x = 30
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable{
-	icon_state = "1-8"
+	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/corner/opaque/white/border{
+/obj/machinery/door/airlock/wood{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood/corner,
+/turf/open/floor/wood/birch,
+/area/ship/general/other)
 "DZ" = (
 /obj/structure/window/plasma/reinforced/spawner/north,
 /obj/structure/window/plasma/reinforced/spawner/east,
@@ -4501,7 +4982,12 @@
 /area/ship/crew/canteen)
 "Ef" = (
 /obj/machinery/firealarm/directional/south,
-/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/obj/structure/sign/painting/library{
+	pixel_x = 32
+	},
 /turf/open/floor/wood,
 /area/ship/crew/library)
 "Eg" = (
@@ -4530,7 +5016,8 @@
 /area/ship/hallway/starboard)
 "El" = (
 /obj/machinery/door/airlock/wood{
-	name = "Cabin 3"
+	name = "Cabin 3";
+	id_tag = "novip_cab_3"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -4538,11 +5025,13 @@
 /turf/open/floor/wood,
 /area/ship/crew)
 "Er" = (
-/obj/structure/table/reinforced,
 /obj/item/table_bell,
 /obj/machinery/door/firedoor/border_only,
 /obj/effect/turf_decal/corner/opaque/white/diagonal,
-/obj/machinery/firealarm/directional/west,
+/obj/machinery/firealarm/directional/west{
+	pixel_y = 5
+	},
+/obj/structure/table/reinforced/titaniumglass,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen/kitchen)
 "Et" = (
@@ -4623,10 +5112,12 @@
 /turf/open/floor/pod/light,
 /area/ship/hallway/fore)
 "EN" = (
-/obj/item/kirbyplants/photosynthetic,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/carpet/black,
-/area/ship/crew/office)
+/obj/structure/chair/pew{
+	pixel_y = 3
+	},
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/wood/ebony,
+/area/ship/general/other/zone_2)
 "EP" = (
 /obj/structure/chair,
 /obj/effect/turf_decal/siding/thinplating/dark{
@@ -4722,9 +5213,17 @@
 /turf/closed/wall/mineral/titanium,
 /area/ship/hallway/port)
 "Fr" = (
-/obj/machinery/computer/slot_machine,
-/turf/open/floor/carpet/black,
+/obj/machinery/computer/arcade{
+	dir = 1
+	},
+/turf/open/floor/light/colour_cycle/dancefloor_b,
 /area/ship/crew/office)
+"Fv" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/turf/open/floor/carpet,
+/area/ship/crew/chapel)
 "Fw" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/medical)
@@ -4758,13 +5257,14 @@
 /turf/open/floor/engine,
 /area/ship/engineering)
 "FJ" = (
-/obj/structure/bookcase/random/nonfiction,
-/obj/effect/turf_decal/siding/wood{
-	dir = 5
+/obj/machinery/shower{
+	dir = 8;
+	pixel_x = -4
 	},
-/obj/machinery/light/directional/east,
-/turf/open/floor/wood,
-/area/ship/crew/library)
+/obj/structure/curtain,
+/obj/item/soap/deluxe,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/general/other)
 "FO" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -4809,6 +5309,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
+"FY" = (
+/obj/structure/chair/pew/left{
+	dir = 4
+	},
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/wood/ebony,
+/area/ship/general/other/zone_2)
 "Gb" = (
 /obj/machinery/vending/security/wall{
 	pixel_x = -28;
@@ -4854,10 +5361,21 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "Gs" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/structure/curtain/bounty,
-/turf/open/floor/plating,
-/area/ship/crew/office)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/obj/machinery/button/door{
+	pixel_y = 10;
+	id = "novip_cab_6";
+	name = "Bolt Cabin 6";
+	dir = 8;
+	pixel_x = 24;
+	specialfunctions = 4;
+	normaldoorcontrol = 1
+	},
+/turf/open/floor/carpet/black,
+/area/ship/crew)
 "Gw" = (
 /obj/structure/flora/ausbushes/ppflowers,
 /obj/effect/turf_decal/weather/sand,
@@ -4954,11 +5472,19 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "GZ" = (
-/obj/structure/table/reinforced,
 /obj/machinery/chem_dispenser/drinks{
-	dir = 8
+	dir = 8;
+	pixel_x = 6
+	},
+/obj/machinery/newscaster/directional/east{
+	pixel_y = -15
+	},
+/obj/structure/table/wood/reinforced/bar,
+/obj/machinery/light/colored/blue{
+	dir = 4;
+	pixel_y = 9;
+	pixel_x = 8
 	},
-/obj/machinery/newscaster/directional/east,
 /turf/open/floor/carpet/black,
 /area/ship/crew/canteen/kitchen)
 "Hc" = (
@@ -4969,13 +5495,11 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "He" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
-	},
 /obj/machinery/newscaster/directional/east,
+/obj/structure/chair/pew/right{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/wood,
 /area/ship/crew/chapel)
 "Hg" = (
@@ -5088,6 +5612,7 @@
 /turf/open/floor/carpet/black,
 /area/ship/crew/office)
 "Ie" = (
+/obj/structure/railing,
 /turf/open/floor/carpet/black,
 /area/ship/crew/canteen/kitchen)
 "Ig" = (
@@ -5105,15 +5630,19 @@
 /turf/open/floor/plating,
 /area/ship/crew/hydroponics)
 "Iw" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/white/border{
+/obj/effect/turf_decal/weather/sand{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/obj/effect/turf_decal/weather/sand{
+	dir = 10
+	},
+/obj/item/clothing/shoes/sandal{
+	pixel_x = 19
+	},
+/turf/open/floor/carpet/blue{
+	baseturfs = /turf/open/floor/plating/beach/sand
+	},
+/area/ship/hallway/central)
 "Iy" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -5161,13 +5690,14 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "IJ" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
 /obj/machinery/light/directional/west,
+/obj/structure/railing/corner{
+	dir = 1
+	},
+/obj/structure/chair/sofa/grey/left/directional/east,
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "IX" = (
@@ -5217,18 +5747,25 @@
 /area/ship/external)
 "Jq" = (
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/eighties,
-/area/ship/storage)
-"Jr" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "cruisewindows"
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
 	},
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/turf/open/floor/carpet/black,
 /area/ship/crew/office)
+"Jr" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
+	},
+/obj/structure/chair/pew/left{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ship/crew/chapel)
 "Js" = (
 /obj/machinery/atmospherics/components/binary/pump{
 	dir = 4;
@@ -5292,34 +5829,24 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "JA" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/corner/opaque/black/border{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/turf/open/floor/carpet/lone,
+/area/ship/crew/chapel)
 "JC" = (
-/obj/structure/chair{
-	dir = 4
-	},
-/obj/structure/cable,
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
-/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/railing/corner{
+	dir = 8
+	},
+/obj/structure/chair/sofa/grey/left/directional/east,
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "JD" = (
 /obj/effect/turf_decal/siding/wood,
 /obj/item/radio/intercom/directional/south,
+/obj/structure/railing/corner{
+	dir = 8
+	},
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "JF" = (
@@ -5331,7 +5858,9 @@
 /turf/open/floor/carpet/black,
 /area/ship/crew/office)
 "JN" = (
-/obj/machinery/vending/wardrobe/jani_wardrobe,
+/obj/machinery/vending/wardrobe/jani_wardrobe{
+	all_items_free = 1
+	},
 /turf/open/floor/plating,
 /area/ship/crew/janitor)
 "JP" = (
@@ -5346,6 +5875,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/external)
+"JR" = (
+/obj/item/stack/sheet/mineral/wood/fifty{
+	pixel_x = 11;
+	pixel_y = 6
+	},
+/turf/open/floor/wood/ebony,
+/area/ship/general/other/zone_2)
 "JX" = (
 /obj/structure/fireplace,
 /obj/effect/turf_decal/siding/wood{
@@ -5366,7 +5902,13 @@
 /area/ship/crew/janitor)
 "Kd" = (
 /obj/item/toy/beach_ball,
-/turf/open/floor/plating/beach/sand,
+/obj/effect/turf_decal/weather/sand{
+	dir = 10
+	},
+/obj/effect/turf_decal/weather/sand{
+	dir = 4
+	},
+/turf/open/floor/carpet/red,
 /area/ship/hallway/central)
 "Kh" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -5558,7 +6100,9 @@
 /turf/open/floor/carpet,
 /area/ship/crew/chapel)
 "LD" = (
-/obj/item/reagent_containers/spray/spraytan,
+/obj/item/reagent_containers/spray/spraytan{
+	pixel_y = -8
+	},
 /turf/open/floor/plating/beach/sand,
 /area/ship/hallway/central)
 "LF" = (
@@ -5693,7 +6237,8 @@
 /area/ship/hallway/starboard)
 "Mz" = (
 /obj/structure/table/wood,
-/obj/item/nullrod,
+/obj/effect/spawner/lootdrop/flower,
+/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/wood,
 /area/ship/crew/chapel)
 "MD" = (
@@ -5701,6 +6246,19 @@
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
+"ML" = (
+/obj/machinery/light/directional/west,
+/obj/structure/chair/pew/left{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/ship/crew/chapel)
 "MM" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
@@ -5743,10 +6301,9 @@
 /turf/open/floor/wood,
 /area/ship/crew)
 "Np" = (
-/obj/structure/chair/comfy/grey/directional/east,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/carpet/black,
-/area/ship/crew/office)
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/wood/ebony,
+/area/ship/general/other/zone_2)
 "Nr" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
 	dir = 4
@@ -5915,14 +6472,21 @@
 	icon_state = "1-2"
 	},
 /obj/item/reagent_containers/food/drinks/bottle/holywater,
+/obj/effect/turf_decal/siding/wood,
 /turf/open/floor/wood,
 /area/ship/crew/chapel)
 "OM" = (
 /obj/structure/table/wood,
-/obj/item/storage/fancy/candle_box,
-/obj/item/flashlight/lantern,
+/obj/item/storage/fancy/candle_box{
+	pixel_x = 8;
+	pixel_y = 5
+	},
+/obj/item/flashlight/lantern{
+	pixel_x = -7;
+	pixel_y = 6
+	},
 /obj/effect/turf_decal/siding/wood{
-	dir = 4
+	dir = 6
 	},
 /turf/open/floor/wood,
 /area/ship/crew/chapel)
@@ -5941,20 +6505,25 @@
 /turf/open/floor/pod/dark,
 /area/ship/hallway/fore)
 "Pa" = (
-/obj/machinery/vending/snack/teal,
-/obj/effect/turf_decal/corner/opaque/white/border{
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/fore)
+/turf/open/floor/carpet/black,
+/area/ship/crew/office)
 "Pc" = (
 /obj/machinery/air_sensor/atmos/incinerator_tank,
 /turf/open/floor/engine,
 /area/ship/engineering)
 "Pe" = (
-/obj/effect/turf_decal/siding/wood/corner{
+/obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
+/obj/structure/sign/painting/library{
+	pixel_x = 32
+	},
 /turf/open/floor/wood,
 /area/ship/crew/library)
 "Pg" = (
@@ -6020,15 +6589,15 @@
 /turf/open/floor/carpet/black,
 /area/ship/crew/canteen/kitchen)
 "Pv" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/corner/opaque/white/bordercorner{
 	dir = 1
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 9
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
 "Pw" = (
@@ -6052,8 +6621,18 @@
 /turf/open/floor/carpet,
 /area/ship/crew/chapel)
 "PE" = (
-/turf/open/floor/eighties,
-/area/ship/storage)
+/obj/effect/overlay/coconut{
+	pixel_x = 33
+	},
+/obj/structure/fluff/beach_umbrella/syndi,
+/obj/effect/turf_decal/weather/sand{
+	dir = 5
+	},
+/obj/effect/turf_decal/weather/sand{
+	dir = 8
+	},
+/turf/open/floor/carpet/red,
+/area/ship/hallway/central)
 "PF" = (
 /obj/structure/window/reinforced/spawner/east,
 /obj/structure/window/reinforced/spawner/west,
@@ -6073,10 +6652,21 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/crew/toilet)
+"PI" = (
+/obj/effect/turf_decal/corner/opaque/white/border{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/fore)
 "PL" = (
-/obj/machinery/vending/donksofttoyvendor,
-/turf/open/floor/light/colour_cycle/dancefloor_b,
-/area/ship/storage)
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/carpet/black,
+/area/ship/crew/office)
 "PS" = (
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -6098,7 +6688,18 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/siding/wood/corner,
-/obj/machinery/newscaster/directional/west,
+/obj/machinery/newscaster/directional/west{
+	pixel_y = 6
+	},
+/obj/machinery/button/door{
+	pixel_y = -10;
+	id = "novip_cab_1";
+	name = "Bolt Cabin 1";
+	dir = 4;
+	pixel_x = -25;
+	specialfunctions = 4;
+	normaldoorcontrol = 1
+	},
 /turf/open/floor/wood,
 /area/ship/crew)
 "PX" = (
@@ -6131,6 +6732,9 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
+/obj/structure/railing{
+	dir = 8
+	},
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "Qg" = (
@@ -6324,7 +6928,18 @@
 	dir = 9
 	},
 /obj/effect/turf_decal/siding/wood/corner,
-/obj/machinery/light/dim/directional/west,
+/obj/machinery/light/dim/directional/west{
+	pixel_y = 10
+	},
+/obj/machinery/button/door{
+	pixel_y = -10;
+	id = "novip_cab_3";
+	name = "Bolt Cabin 3";
+	dir = 4;
+	pixel_x = -25;
+	specialfunctions = 4;
+	normaldoorcontrol = 1
+	},
 /turf/open/floor/wood,
 /area/ship/crew)
 "QZ" = (
@@ -6376,6 +6991,10 @@
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
+"Rg" = (
+/obj/structure/chair/sofa/grey/left/directional/west,
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
 "Ri" = (
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -6397,12 +7016,13 @@
 /turf/open/floor/grass/fairy,
 /area/ship/crew)
 "Rm" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/chair/sofa/grey/right/directional/west,
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "Ro" = (
@@ -6446,8 +7066,8 @@
 /obj/item/clothing/suit/toggle/lawyer/black,
 /obj/item/clothing/neck/tie/blue,
 /obj/item/pen/fountain,
-/obj/item/spacecash/bundle/c100,
 /obj/machinery/light/directional/north,
+/obj/item/spacecash/bundle/c500,
 /turf/open/floor/carpet/black,
 /area/ship/crew)
 "RC" = (
@@ -6499,6 +7119,17 @@
 	},
 /turf/open/floor/wood,
 /area/ship/crew/hydroponics)
+"RO" = (
+/obj/item/kirbyplants/random{
+	pixel_y = 7
+	},
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/structure/window,
+/obj/structure/window{
+	dir = 4
+	},
+/turf/open/floor/grass,
+/area/ship/crew/canteen/kitchen)
 "RR" = (
 /turf/open/floor/plating/beach/coastline_b,
 /area/ship/hallway/central)
@@ -6526,6 +7157,9 @@
 	dir = 8
 	},
 /obj/machinery/light/small/directional/west,
+/obj/structure/disposalpipe/segment{
+	dir = 2
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
 "RZ" = (
@@ -6575,6 +7209,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 6
 	},
+/obj/structure/railing,
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "Sj" = (
@@ -6608,8 +7243,9 @@
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "SH" = (
-/obj/structure/table/wood,
 /obj/effect/turf_decal/siding/wood,
+/obj/structure/railing,
+/obj/structure/table/wood/fancy/royalblack,
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "SK" = (
@@ -6664,11 +7300,18 @@
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "Tq" = (
-/obj/effect/turf_decal/siding/wood/corner{
+/obj/structure/flora/ausbushes/brflowers,
+/obj/item/kirbyplants/random{
+	pixel_y = 7
+	},
+/obj/structure/window{
 	dir = 8
 	},
-/turf/open/floor/wood,
-/area/ship/crew/chapel)
+/obj/structure/window{
+	dir = 1
+	},
+/turf/open/floor/grass,
+/area/ship/crew/canteen)
 "Tr" = (
 /obj/effect/turf_decal/corner/opaque/white/border{
 	dir = 4
@@ -6693,6 +7336,9 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
+/obj/structure/sign/painting/library{
+	pixel_x = 32
+	},
 /turf/open/floor/wood,
 /area/ship/crew/library)
 "Tz" = (
@@ -6736,10 +7382,12 @@
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "TK" = (
+/obj/structure/chair/pew/right{
+	dir = 1
+	},
 /obj/effect/turf_decal/siding/wood{
-	dir = 8
+	dir = 5
 	},
-/obj/machinery/light/directional/west,
 /turf/open/floor/wood,
 /area/ship/crew/chapel)
 "TL" = (
@@ -6753,13 +7401,16 @@
 /turf/open/floor/wood,
 /area/ship/crew/canteen)
 "TM" = (
-/obj/structure/chair/pew/right{
-	dir = 1
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/carpet,
+/obj/structure/chair/pew/left{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
+/turf/open/floor/wood,
 /area/ship/crew/chapel)
 "TO" = (
 /obj/structure/railing{
@@ -6783,6 +7434,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
 	},
+/obj/item/spacecash/bundle/c10000,
 /turf/open/floor/wood,
 /area/ship/bridge)
 "TU" = (
@@ -6796,16 +7448,14 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "TX" = (
-/obj/structure/table,
-/obj/item/clothing/shoes/wheelys{
-	pixel_x = 4;
-	pixel_y = 9
+/obj/structure/chair/pew/left{
+	dir = 1
 	},
-/obj/item/skateboard/hoverboard{
-	pixel_x = -4
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
 	},
-/turf/open/floor/eighties,
-/area/ship/storage)
+/turf/open/floor/wood,
+/area/ship/crew/chapel)
 "Ua" = (
 /obj/structure/window/plasma/reinforced/spawner,
 /obj/structure/window/plasma/reinforced/spawner/east,
@@ -6995,8 +7645,14 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
 "Vs" = (
-/obj/structure/disposalpipe/segment{
-	dir = 2
+/obj/machinery/vending/snack/teal{
+	pixel_x = 13;
+	density = 0;
+	default_price = 30;
+	extra_price = 80
+	},
+/obj/effect/turf_decal/corner/opaque/white/border{
+	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
@@ -7226,6 +7882,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
+"WL" = (
+/obj/structure/table/wood/fancy/royalblack,
+/turf/open/floor/wood,
+/area/ship/crew/canteen)
 "WR" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
@@ -7347,16 +8007,19 @@
 /obj/item/clothing/under/suit/black/female,
 /obj/item/clothing/neck/tie/red,
 /obj/item/toy/cards/deck/syndicate,
-/obj/item/spacecash/bundle/c100,
 /obj/machinery/light/directional/north,
+/obj/item/spacecash/bundle/c500,
 /turf/open/floor/carpet/black,
 /area/ship/crew)
 "Xz" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
+/obj/structure/chair/pew/right{
+	dir = 1
+	},
 /obj/effect/turf_decal/siding/wood{
-	dir = 8
+	dir = 4
 	},
 /turf/open/floor/wood,
 /area/ship/crew/chapel)
@@ -7455,15 +8118,34 @@
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
+"Yq" = (
+/obj/machinery/vending/cola{
+	pixel_x = 13;
+	density = 0;
+	default_price = 22;
+	extra_price = 100
+	},
+/obj/effect/turf_decal/corner/opaque/white/border{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/fore)
 "Yu" = (
 /obj/effect/turf_decal/corner/opaque/white/border{
 	dir = 8
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 2
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
 "Yw" = (
-/obj/effect/spawner/structure/window/shuttle,
-/turf/open/floor/plating,
+/obj/structure/window,
+/obj/item/kirbyplants/random{
+	pixel_y = 7
+	},
+/obj/structure/flora/ausbushes/brflowers,
+/turf/open/floor/grass,
 /area/ship/crew/canteen/kitchen)
 "YF" = (
 /obj/structure/curtain,
@@ -7485,6 +8167,10 @@
 /obj/effect/turf_decal/corner/opaque/white/border{
 	dir = 1
 	},
+/obj/machinery/vending/donksofttoyvendor{
+	pixel_y = 22;
+	density = 0
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
 "YN" = (
@@ -7507,6 +8193,16 @@
 	},
 /turf/open/floor/wood,
 /area/ship/bridge)
+"YX" = (
+/obj/structure/chair/pew/right{
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/glass/bucket/wooden{
+	pixel_y = -16;
+	pixel_x = 18
+	},
+/turf/open/floor/wood/ebony,
+/area/ship/general/other/zone_2)
 "YZ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -7575,13 +8271,20 @@
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "Zx" = (
-/obj/structure/flora/tree/palm,
-/obj/effect/overlay/coconut,
+/obj/structure/flora/tree/palm{
+	pixel_x = 1
+	},
 /turf/open/floor/plating/beach/sand,
 /area/ship/hallway/central)
 "ZA" = (
-/obj/item/clothing/shoes/sandal,
-/turf/open/floor/plating/beach/sand,
+/obj/structure/fluff/beach_umbrella/engine,
+/obj/effect/turf_decal/weather/sand{
+	dir = 5
+	},
+/obj/effect/turf_decal/weather/sand{
+	dir = 8
+	},
+/turf/open/floor/carpet/green,
 /area/ship/hallway/central)
 "ZH" = (
 /obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{
@@ -7592,10 +8295,11 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "ZJ" = (
-/obj/structure/table/reinforced,
 /obj/machinery/chem_dispenser/drinks/beer{
-	dir = 8
+	dir = 8;
+	pixel_x = 6
 	},
+/obj/structure/table/wood/reinforced/bar,
 /turf/open/floor/carpet/black,
 /area/ship/crew/canteen/kitchen)
 "ZK" = (
@@ -8340,8 +9044,8 @@ Qt
 Wl
 CN
 Qt
-vg
-vg
+Tq
+zr
 Qt
 Qt
 Qt
@@ -8375,7 +9079,7 @@ ZK
 Oe
 xh
 UG
-ib
+zL
 rP
 uO
 xA
@@ -8385,7 +9089,7 @@ Rm
 Qc
 IJ
 DD
-vg
+jx
 bj
 pZ
 Qy
@@ -8421,12 +9125,12 @@ pq
 qA
 qA
 rb
-Cx
-Cx
+WL
+WL
 rb
-Cx
+WL
 SH
-vg
+cc
 oP
 lI
 Oy
@@ -8463,11 +9167,11 @@ qA
 qA
 rb
 Ds
-Ds
+Rg
 rb
 Ds
 AB
-vg
+hS
 kd
 pZ
 Qy
@@ -8562,7 +9266,7 @@ Kl
 IX
 Mm
 cx
-sg
+Gs
 XC
 Rw
 Ko
@@ -8668,9 +9372,9 @@ Ca
 yl
 Qg
 rb
-Ds
+Bp
 rb
-Ds
+Bp
 Xb
 Qt
 kd
@@ -8685,7 +9389,7 @@ Kl
 LP
 Mm
 oz
-sg
+sk
 XC
 Rw
 Ko
@@ -8712,7 +9416,7 @@ rb
 rb
 rb
 rb
-Xb
+oe
 Qt
 yI
 Tz
@@ -8761,7 +9465,7 @@ Qy
 kl
 Kl
 RH
-GN
+vP
 dG
 Kl
 IX
@@ -8794,7 +9498,7 @@ Ci
 CR
 CR
 CR
-CR
+ct
 Yw
 oP
 lI
@@ -8831,12 +9535,12 @@ bC
 ie
 OB
 La
-La
+Bj
 Pt
 Qi
 WR
 Ie
-Yw
+RO
 kd
 pZ
 WJ
@@ -8963,7 +9667,7 @@ zW
 LV
 cP
 gf
-qx
+PE
 Kd
 ta
 RR
@@ -9045,8 +9749,8 @@ fs
 Eg
 cP
 Tt
-qx
-qx
+wZ
+Iw
 ta
 RR
 dN
@@ -9129,7 +9833,7 @@ BI
 id
 ZA
 jI
-ta
+AD
 RR
 AI
 Pw
@@ -9208,11 +9912,11 @@ ll
 TA
 zS
 qE
-Yu
+iq
 RV
 Yu
 Yu
-hS
+Yu
 fq
 Yu
 Pv
@@ -9248,16 +9952,16 @@ Rc
 bL
 iD
 ic
-gb
+dk
 ne
+Yq
 Vs
-Vs
-Vs
+cj
 qU
-Vs
-Vs
+zT
+PI
 vj
-rI
+zg
 lf
 rD
 ZK
@@ -9289,17 +9993,17 @@ Pe
 Ef
 TA
 HF
-dk
-Iw
-ze
-Pa
+WV
+oo
+oo
+oo
 oo
 hZ
-AD
-JA
+hZ
+hZ
 DT
-ei
-lf
+hZ
+hZ
 rD
 ZK
 ZK
@@ -9326,21 +10030,21 @@ TA
 TA
 TA
 TA
-FJ
-hA
+TA
+TA
 TA
 YG
 WV
-cv
-cv
-cv
-cv
-cv
+oo
+hA
+FY
+oo
+tH
 nX
 oV
-cv
-cv
-mt
+ar
+hZ
+hZ
 rD
 ZK
 ZK
@@ -9364,23 +10068,23 @@ Wa
 kL
 AW
 Or
-wZ
 td
-kL
-kL
-kL
+Fv
+ML
+TX
+Jr
 kL
 BT
 it
-cv
+oo
 EN
 Np
-JJ
+oo
 eT
 mB
 ub
 oW
-cv
+hZ
 sa
 Uv
 ZK
@@ -9406,22 +10110,22 @@ kL
 kL
 xJ
 Mz
-Tq
+PD
 TK
 Xz
-td
+bk
 kL
 yP
 WV
-Gs
-HW
-Zt
-Et
-JJ
-JJ
+oo
+YX
+kR
+oo
+zt
+rC
 Bi
-cv
-cv
+hZ
+hZ
 rD
 ZK
 ZK
@@ -9447,21 +10151,21 @@ hj
 Bt
 rm
 rF
+JA
 PD
-vP
 pV
 LB
 Um
 sI
 WV
-Gs
+oo
 jw
-Ej
-Et
-JJ
-lj
+JR
+lt
+gb
+FJ
 eE
-Jr
+hZ
 sa
 bs
 ZK
@@ -9495,14 +10199,14 @@ xc
 yh
 Dc
 WV
-Gs
-HW
-tx
-Et
-JJ
-lj
-Fr
-Jr
+cv
+cv
+cv
+cv
+cv
+cv
+cv
+cv
 rD
 ZK
 ZK
@@ -9530,7 +10234,7 @@ kL
 VG
 OM
 hs
-hs
+Ck
 He
 Dg
 kL
@@ -9539,11 +10243,11 @@ wX
 cv
 Cy
 jP
-JJ
+pP
 BW
 lj
 Fr
-Jr
+cv
 rD
 ZK
 ZK
@@ -9578,11 +10282,11 @@ kL
 yq
 zb
 cv
-cv
-cv
-cv
-cv
-cv
+ze
+Pa
+ei
+yi
+JJ
 cv
 cv
 rD
@@ -9618,13 +10322,13 @@ HE
 HE
 qw
 MD
-iq
+cv
 cR
-dZ
-rC
-dZ
 PL
-iq
+HW
+Zt
+Et
+zc
 sa
 bs
 ZK
@@ -9662,9 +10366,9 @@ Vl
 BO
 yD
 Jq
-tH
-PE
-TX
+HW
+Ej
+Et
 zc
 rD
 ZK
@@ -9700,13 +10404,13 @@ Wf
 xn
 KH
 vV
-iq
+cv
 sT
-dZ
+tx
 jt
 dZ
-pP
-iq
+Et
+zc
 rD
 ZK
 ZK
@@ -9741,13 +10445,13 @@ mt
 mt
 QJ
 VF
-iq
-iq
-iq
-iq
-iq
-iq
-iq
+cv
+cv
+cv
+cv
+cv
+cv
+cv
 rD
 ZK
 ZK
diff --git a/mod_celadon/outfit/_outfit.dme b/mod_celadon/outfit/_outfit.dme
index c84ffa1216a0..57d3fb6bf8ff 100644
--- a/mod_celadon/outfit/_outfit.dme
+++ b/mod_celadon/outfit/_outfit.dme
@@ -17,6 +17,8 @@
 
 #include "code/gamma/gamma.dm"
 
+#include "code/independent/outfit_ship/independent.dm"
+
 #include "code/inteq/armor.dm"
 #include "code/inteq/cards_ids.dm"
 #include "code/inteq/inteq_outfit.dm"
diff --git a/mod_celadon/outfit/code/independent/outfit_ship/independent.dm b/mod_celadon/outfit/code/independent/outfit_ship/independent.dm
new file mode 100644
index 000000000000..52c2edfa1b71
--- /dev/null
+++ b/mod_celadon/outfit/code/independent/outfit_ship/independent.dm
@@ -0,0 +1,229 @@
+/datum/outfit/job/independent/assistant/fancy/lagoon
+	name = "Independent - Fancy (Formal Uniform)"
+
+	shoes = /obj/item/clothing/shoes/laceup
+	uniform = /obj/item/clothing/under/misc/assistantformal
+	head = /obj/item/clothing/head/beret/grey
+	l_pocket = /obj/item/spacecash/bundle/c500
+
+/datum/outfit/job/independent/captain/lagoon
+	name = "Independent - Captain"
+	job_icon = "captain"
+	jobtype = /datum/job/captain
+
+	id = /obj/item/card/id/gold
+	gloves = /obj/item/clothing/gloves/color/captain
+	ears = /obj/item/radio/headset/headset_com
+	uniform = /obj/item/clothing/under/rank/command/captain
+	dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain //WS Edit - Alt Uniforms
+	shoes = /obj/item/clothing/shoes/laceup
+	head = /obj/item/clothing/head/caphat
+	backpack_contents = list(/obj/item/melee/classic_baton/telescopic = 1,
+							/obj/item/spacecash/bundle/c500 = 1)
+
+	backpack = /obj/item/storage/backpack/captain
+	satchel = /obj/item/storage/backpack/satchel/cap
+	duffelbag = /obj/item/storage/backpack/duffelbag/captain
+	courierbag = /obj/item/storage/backpack/messenger/com
+
+	accessory = /obj/item/clothing/accessory/medal/gold/captain
+
+	chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/captain)
+
+// Head of Personnel
+
+/datum/outfit/job/independent/hop/lagoon
+	name = "Independent - Head of Personnel"
+	job_icon = "headofpersonnel"
+	jobtype = /datum/job/head_of_personnel
+
+	id = /obj/item/card/id/silver
+	ears = /obj/item/radio/headset/headset_com
+	uniform = /obj/item/clothing/under/rank/command/head_of_personnel
+	dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain
+	shoes = /obj/item/clothing/shoes/sneakers/brown
+
+	backpack_contents = list(/obj/item/storage/box/ids = 1,
+							/obj/item/melee/classic_baton/telescopic=1,
+							/obj/item/modular_computer/tablet/preset/advanced = 1,
+							/obj/item/spacecash/bundle/c500 = 1)
+
+	backpack = /obj/item/storage/backpack/captain
+	satchel = /obj/item/storage/backpack/satchel/cap
+	duffelbag = /obj/item/storage/backpack/duffelbag/captain
+	courierbag = /obj/item/storage/backpack/messenger/com
+
+	chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/head_of_personnel)
+
+// Head of Security
+
+/datum/outfit/job/independent/security/lagoon
+	name = "Independent - Security Officer"
+	jobtype = /datum/job/officer
+	job_icon = "securityofficer"
+
+	ears = /obj/item/radio/headset/alt
+	uniform = /obj/item/clothing/under/rank/security/officer
+	gloves = /obj/item/clothing/gloves/color/black
+	head = /obj/item/clothing/head/helmet/sec
+	suit = /obj/item/clothing/suit/armor/vest/alt
+	dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
+	shoes = /obj/item/clothing/shoes/jackboots
+	l_pocket = /obj/item/restraints/handcuffs
+	backpack_contents = null
+
+	backpack = /obj/item/storage/backpack/security
+	backpack_contents = list(/obj/item/spacecash/bundle/c100 = 3)
+
+	satchel = /obj/item/storage/backpack/satchel/sec
+	duffelbag = /obj/item/storage/backpack/duffelbag/sec
+	courierbag = /obj/item/storage/backpack/messenger/sec
+	box = /obj/item/storage/box/survival/security
+
+	chameleon_extras = list(/obj/item/gun/energy/disabler, /obj/item/clothing/glasses/hud/security/sunglasses, /obj/item/clothing/head/helmet)
+	//The helmet is necessary because /obj/item/clothing/head/helmet/sec is overwritten in the chameleon list by the standard helmet, which has the same name and icon state
+
+// Engineer
+
+/datum/outfit/job/independent/doctor/lagoon
+	name = "Independent - Medical Doctor"
+	job_icon = "medicaldoctor"
+	jobtype = /datum/job/doctor
+
+	ears = /obj/item/radio/headset/headset_med
+	uniform = /obj/item/clothing/under/rank/medical/doctor/blue
+	shoes = /obj/item/clothing/shoes/sneakers/white
+	suit =  /obj/item/clothing/suit/apron/surgical
+	dcoat = /obj/item/clothing/suit/hooded/wintercoat/medical
+
+	backpack = /obj/item/storage/backpack/medic
+	backpack_contents = list(/obj/item/spacecash/bundle/c100 = 3)
+
+	satchel = /obj/item/storage/backpack/satchel/med
+	duffelbag = /obj/item/storage/backpack/duffelbag/med
+	courierbag = /obj/item/storage/backpack/messenger/med
+
+	box = /obj/item/storage/box/survival/medical
+
+	chameleon_extras = /obj/item/gun/syringe
+
+// Atmos Tech
+
+/datum/outfit/job/independent/atmos/lagoon
+	name = "Independent - Atmos Tech"
+	jobtype = /datum/job/atmos
+	job_icon = "atmospherictechnician"
+
+	belt = /obj/item/storage/belt/utility/atmostech
+	ears = /obj/item/radio/headset/headset_eng
+	uniform = /obj/item/clothing/under/rank/engineering/engineer/hazard
+	dcoat = /obj/item/clothing/suit/hooded/wintercoat/engineering
+	l_pocket = /obj/item/analyzer
+
+	backpack = /obj/item/storage/backpack/industrial
+	satchel = /obj/item/storage/backpack/satchel/eng
+	duffelbag = /obj/item/storage/backpack/duffelbag/engineering
+	courierbag = /obj/item/storage/backpack/messenger/engi
+
+	box = /obj/item/storage/box/survival/engineer
+
+	backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced = 1,
+							/obj/item/spacecash/bundle/c100 = 3)
+
+// Cook
+
+/datum/outfit/job/independent/cook/lagoon
+	name = "Independent - Cook"
+	jobtype = /datum/job/cook
+	job_icon = "cook"
+
+	ears = /obj/item/radio/headset/headset_srv
+	shoes = /obj/item/clothing/shoes/laceup
+	uniform = /obj/item/clothing/under/rank/civilian/chef
+	suit = /obj/item/clothing/suit/toggle/chef
+	alt_suit = /obj/item/clothing/suit/apron/chef
+	head = /obj/item/clothing/head/chefhat
+	mask = /obj/item/clothing/mask/fakemoustache/italian
+	backpack_contents = list(/obj/item/sharpener = 1)
+
+// Bartender
+
+/datum/outfit/job/independent/bartender/lagoon
+	name = "Independent - Bartender"
+
+	glasses = /obj/item/clothing/glasses/sunglasses/reagent
+	ears = /obj/item/radio/headset/headset_srv
+	uniform = /obj/item/clothing/under/rank/civilian/bartender
+	alt_uniform = /obj/item/clothing/under/rank/civilian/bartender/purple
+	alt_suit = /obj/item/clothing/suit/apron/purple_bartender
+	suit = /obj/item/clothing/suit/armor/vest
+	backpack_contents = list(/obj/item/storage/box/beanbag=1)
+	shoes = /obj/item/clothing/shoes/laceup
+	accessory = /obj/item/clothing/accessory/waistcoat
+
+// Curator
+
+/datum/outfit/job/independent/curator/lagoon
+	name = "Independent - Curator"
+	job_icon = "curator"
+	jobtype = /datum/job/curator
+
+	shoes = /obj/item/clothing/shoes/laceup
+	ears = /obj/item/radio/headset/headset_srv
+	uniform = /obj/item/clothing/under/rank/civilian/curator
+	l_hand = /obj/item/storage/bag/books
+	l_pocket = /obj/item/key/displaycase
+	accessory = /obj/item/clothing/accessory/pocketprotector/full
+	backpack_contents = list(
+		/obj/item/choice_beacon/hero = 1,
+		/obj/item/barcodescanner = 1
+	)
+
+// Chaplain
+
+/datum/outfit/job/independent/chaplain/lagoon
+	name = "Independent - Chaplain"
+	job_icon = "chaplain"
+	jobtype = /datum/job/chaplain
+
+	ears = /obj/item/radio/headset/headset_srv
+	uniform = /obj/item/clothing/under/rank/civilian/chaplain
+	backpack_contents = list(
+		/obj/item/stamp/chap = 1,
+		/obj/item/camera/spooky = 1
+		)
+
+	backpack = /obj/item/storage/backpack/cultpack
+	satchel = /obj/item/storage/backpack/cultpack
+
+	chameleon_extras = /obj/item/stamp/chap
+
+// Janitor
+
+/datum/outfit/job/independent/janitor/lagoon
+	name = "Independent - Janitor"
+	job_icon = "janitor"
+	jobtype = /datum/job/janitor
+
+	ears = /obj/item/radio/headset/headset_srv
+	uniform = /obj/item/clothing/under/rank/civilian/janitor
+
+	backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
+
+// Botanist
+
+/datum/outfit/job/independent/botanist/lagoon
+	name = "Independent - Botanist"
+	job_icon = "botanist"
+	jobtype = /datum/job/hydro
+
+	ears = /obj/item/radio/headset/headset_srv
+	uniform = /obj/item/clothing/under/color/green
+	dcoat = /obj/item/clothing/suit/hooded/wintercoat/hydro
+	suit = /obj/item/clothing/suit/apron/overalls
+	gloves  =/obj/item/clothing/gloves/botanic_leather
+	suit_store = /obj/item/plant_analyzer
+
+	backpack = /obj/item/storage/backpack/botany
+	satchel = /obj/item/storage/backpack/satchel/hyd
+	courierbag = /obj/item/storage/backpack/messenger/hyd