Nebula civilian hub test

citadel.dme

@@ -3415,6 +3415,7 @@
 #include "code\modules\maps\templates\shuttles\admin_spawn\shelter_5.dm"
 #include "code\modules\maps\templates\shuttles\admin_spawn\shelter_6.dm"
 #include "code\modules\maps\templates\shuttles\admin_spawn\vespa.dm"
+#include "code\modules\maps\templates\shuttles\admin_spawn\nebula_civ_shuttles.dm"
 #include "code\modules\maps\templates\shuttles\map_specific\virgo2_shuttles.dm"
 #include "code\modules\maps\templates\submaps\class_d\class_d.dm"
 #include "code\modules\maps\templates\submaps\class_h\class_h.dm"

code/game/area/Off Station Areas.dm

@@ -589,6 +589,11 @@
 	ambience = AMBIENCE_HANGAR
 	sound_env = LARGE_ENCLOSED
 
+/area/tradeport/dock2
+	icon_state = "blue"
+	ambience = AMBIENCE_HANGAR
+	sound_env = LARGE_ENCLOSED
+
 /area/tradeport/pads
 	icon_state = "purple"
 	ambience = AMBIENCE_HANGAR
@@ -602,6 +607,58 @@
 	name = "\improper Commerce Hall"
 	icon_state = "yellow"
 
+/area/tradeport/motel
+	name = "\improper Nebula Motel"
+	icon_state = "yellow"
+
+/area/tradeport/motel/room1
+	name = "\improper Nebula Motel Room 1"
+	icon_state = "yellow"
+
+/area/tradeport/motel/room2
+	name = "\improper Nebula Motel Room 2"
+	icon_state = "yellow"
+
+/area/tradeport/motel/room3
+	name = "\improper Nebula Motel Room 3"
+	icon_state = "yellow"
+
+/area/tradeport/motel/room4
+	name = "\improper Nebula Motel Room 4"
+	icon_state = "yellow"
+
+/area/tradeport/motel/room5
+	name = "\improper Nebula Motel Room 5"
+	icon_state = "yellow"
+
+/area/tradeport/motel/room6
+	name = "\improper Nebula Motel Room 6"
+	icon_state = "yellow"
+
+/area/tradeport/motel/room7
+	name = "\improper Nebula Motel Room 7"
+	icon_state = "yellow"
+
+/area/tradeport/motel/room8
+	name = "\improper Nebula Motel Room 8"
+	icon_state = "yellow"
+
+/area/tradeport/motel/vip
+	name = "\improper Nebula Motel VIP Suite"
+	icon_state = "yellow"
+
+/area/tradeport/motel/sauna
+	name = "\improper Motel Sauna"
+	icon_state = "yellow"
+
+/area/tradeport/motel/arcade
+	name = "\improper Nebula arcade"
+	icon_state = "yellow"
+
+/area/tradeport/motel/empty
+	name = "\improper Nebula unused cargo hold"
+	icon_state = "yellow"
+
 /area/tradeport/safari
 	name = "\improper Safari Shop"
 	icon_state = "green"
@@ -622,6 +679,30 @@
 	icon_state = "blue"
 	sound_env = SMALL_ENCLOSED
 
+/area/tradeport/medical/public
+	icon_state = "blue"
+	sound_env = SMALL_ENCLOSED
+
+/area/tradeport/security
+	icon_state = "blue"
+	sound_env = SMALL_ENCLOSED
+
+/area/tradeport/comroom
+	name = "\improper Public Communication Room"
+	icon_state = "green"
+
+/area/tradeport/comroom/holo1
+	name = "\improper Public Communication Room Holopad booth 1"
+	icon_state = "green"
+
+/area/tradeport/comroom/holo2
+	name = "\improper Public Communication Room Holopad booth 2"
+	icon_state = "green"
+
+/area/tradeport/comroom/holo3
+	name = "\improper Public Communication Room Holopad booth 3"
+	icon_state = "green"
+
 /area/tradeport/atmospherics
 	icon_state = "yellow"
 	ambience = AMBIENCE_ATMOS

code/game/machinery/vending/misc.dm

@@ -246,27 +246,3 @@
 		/obj/item/reagent_containers/hypospray/glukoz/pyrholidon = 50,
 		/obj/item/reagent_containers/hypospray/glukoz/viraplus = 25,
 	)
-
-
-/obj/machinery/vending/gaia
-	name = "Happy Trails Resort Pass Booth"
-	desc = "Automated seller of day passes for the Happy Trails Resort Company."
-	icon = 'icons/obj/vending.dmi'
-	icon_state = "gaia"
-	icon_vend = "gaia-vend"
-	product_slogans = "A paradise for every species: Brought to you by Happy Trails!"
-	product_ads = "The weather can't be better!; Climates for every species!; Try our VIP Pass!; The sun never sets in paradise!"
-
-	products = list(
-		/obj/item/card/id/external/gaia = 30,
-		/obj/item/card/id/external/gaia/vip = 15,
-	)
-
-	contraband = list(
-		/obj/item/card/id/external/gaia/staff = 4,
-	)
-
-	prices = list(
-		/obj/item/card/id/external/gaia = 150,
-		/obj/item/card/id/external/gaia/vip = 250,
-	)

code/game/objects/items/id_cards/station_ids.dm

@@ -704,4 +704,4 @@
 	name = "Happy Trails Resort Company Staff ID"
 	desc = "Issued to staff of the Happy Trails Company."
 	icon_state = "gaia_staff"
-	access = list(250,251,252)
+	access = list(250,251,252)

code/modules/maps/overmap/planets/_lythios43c.dm

@@ -26,6 +26,8 @@
 		"Civilian Century Shuttle" = list("rift_oldcentury_pad"),
 		"Dart EMT Shuttle" = list("rift_emt_pad"),
 		"Beruang Trade Ship" = list("rift_trade_dock"),
+		"Scoophead trade Shuttle" = list ("rift_scoophead_dock"),
+		"Udang Transport Shuttle" = list ("rift_udang_dock"),
 		"NDV Quicksilver" = list("rift_specops_dock"),
 		"Pirate Skiff" = list("rift_pirate_dock"),
 		)

code/modules/maps/overmap/space/trade_station/trade_station.dm

@@ -31,8 +31,17 @@
 		)
 
 	initial_restricted_waypoints = list(
-		"Beruang Trade Ship" = list("tradeport_hangar")
+		"Beruang Trade Ship" = list("tradeport_hangar"),
+		"Udang Transport Shuttle" = list("tradeport_udang"),
+		"Scoophead trade Shuttle" = list("tradeport_scoophead"),
+		"Arrowhead Racing Shuttle" = list("tradeport_arrowhead"),
+		"Spacena Caravan Shuttle" = list("tradeport_caravan"),
+		"Spacena Adventurer Shuttle" = list("tradeport_adventurer"),
+		"Cargo Tug Hauler Shuttle" = list("tradeport_tug"),
+		"Utility Micro Shuttle" = list("tradeport_utilitymicro"),
+		"Teshari Runabout Shuttle" = list("tradeport_runabout")
 		)
+
 /* // Old Restricted list. Leaving commented out for reference - Bloop
 	initial_restricted_waypoints = list(
 		"Beruang Trade Ship" = list("tradeport_hangar"),
@@ -116,6 +125,62 @@
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
 	base_area = /area/tradeport/dock
 
+/obj/effect/shuttle_landmark/triumph/trade/udang
+	name = "Udang Underconstruction Docking bay"
+	landmark_tag = "tradeport_udang"
+	docking_controller = "tradeport_udang_dock"
+	base_turf = /turf/space
+	base_area = /area/space
+
+/obj/effect/shuttle_landmark/triumph/trade/scoophead
+	name = "Scoophead Docking bay"
+	landmark_tag = "tradeport_scoophead"
+	docking_controller = "tradeport_scoophead_dock"
+	base_turf = /turf/space
+	base_area = /area/space
+
+/obj/effect/shuttle_landmark/triumph/trade/arrowhead
+	name = "VIP suit docking hatch"
+	landmark_tag = "tradeport_arrowhead"
+	docking_controller = "tradeport_arrowhead_dock"
+	base_turf = /turf/space
+	base_area = /area/space
+
+/obj/effect/shuttle_landmark/triumph/trade/caravan
+	name = "Caravan Docking Bay 2 Spot"
+	landmark_tag = "tradeport_caravan"
+	docking_controller = "tradeport_caravan_dock"
+	base_turf = /turf/simulated/floor/reinforced
+	base_area = /area/tradeport/dock2
+
+/obj/effect/shuttle_landmark/triumph/trade/adventurer
+	name = "Adventurer Docking Bay 2 Spot"
+	landmark_tag = "tradeport_adventurer"
+	docking_controller = "tradeport_adventurer_dock"
+	base_turf = /turf/simulated/floor/reinforced
+	base_area = /area/tradeport/dock2
+
+/obj/effect/shuttle_landmark/triumph/trade/tug
+	name = "Tug Hauler Docking Bay 2 Spot"
+	landmark_tag = "tradeport_tug"
+	docking_controller = "tradeport_tug_dock"
+	base_turf = /turf/simulated/floor/reinforced
+	base_area = /area/tradeport/dock2
+
+/obj/effect/shuttle_landmark/triumph/trade/utilitymicro
+	name = "Utility and service Docking Bay 2 Spot"
+	landmark_tag = "tradeport_utilitymicro"
+	docking_controller = "tradeport_utilitymicro_dock"
+	base_turf = /turf/simulated/floor/reinforced
+	base_area = /area/tradeport/dock2
+
+/obj/effect/shuttle_landmark/triumph/trade/runabout
+	name = "Teshari Runabout Docking Bay 2 Spot"
+	landmark_tag = "tradeport_runabout"
+	docking_controller = "tradeport_runabout_dock"
+	base_turf = /turf/simulated/floor/reinforced
+	base_area = /area/tradeport/dock2
+
 // Todo
 /*
 /obj/machinery/camera/network/trade

code/modules/maps/templates/misc_presets/rift_shuttle_landmarks.dm

@@ -45,6 +45,18 @@ Need to turn all of these into proper initializers like this:
 	base_turf = /turf/simulated/floor/reinforced/lythios43c
 	base_area = /area/rift/surfacebase/outside/outside3
 
+/obj/effect/shuttle_landmark/rift/deck3/scoophead
+	name = "NSB Atlas - Scoophead Pad"
+	landmark_tag = "rift_scoophead_dock"
+	base_turf = /turf/simulated/floor/reinforced/lythios43c
+	base_area = /area/rift/surfacebase/outside/outside3
+
+/obj/effect/shuttle_landmark/rift/deck3/udang
+	name = "NSB Atlas - Udang Pad"
+	landmark_tag = "rift_udang_dock"
+	base_turf = /turf/simulated/floor/reinforced/lythios43c
+	base_area = /area/rift/surfacebase/outside/outside3
+
 /obj/effect/shuttle_landmark/rift/deck3/specops
 	name = "NSB Atlas - Special Operations Pad"
 	landmark_tag = "rift_specops_dock"
@@ -144,6 +156,14 @@ Need to turn all of these into proper initializers like this:
 	name = "In transit"
 	landmark_tag = "nav_transit_trade"
 
+/obj/effect/shuttle_landmark/transit/rift/trade/udang
+	name = "In transit"
+	landmark_tag = "nav_transit_udang"
+
+/obj/effect/shuttle_landmark/transit/rift/trade/scoophead
+	name = "In transit"
+	landmark_tag = "nav_transit_scoophead"
+
 /obj/effect/shuttle_landmark/transit/rift/emt
 	name = "In transit"
 	landmark_tag = "nav_transit_emt"

code/modules/maps/templates/shuttles/admin_spawn/nebula_civ_shuttles.dm

@@ -0,0 +1,107 @@
+// Teshari Runabout
+/datum/map_template/shuttle/overmap/generic/teshari_runabout_b
+	name = "Teshari Runabout class B"
+	desc = "A small Teshari spacecraft."
+	suffix = "teshari_runabout.dmm"
+	annihilate = TRUE
+
+// Caravan
+/datum/map_template/shuttle/overmap/generic/caravan_b
+	name = "Caravan"
+	desc = "A small cheap space home."
+	suffix = "caravan.dmm"
+	annihilate = TRUE
+
+// The shuttle's area(s) Teshari
+/area/shuttle/teshari_runabout_b
+	name = "\improper Teshari Runabout B"
+	icon = 'icons/turf/areas_vr_talon.dmi'
+	icon_state = "gray"
+	requires_power = 1
+	has_gravity = 1
+
+// The shuttle's area(s) Caravan
+/area/shuttle/caravan_b
+	name = "\improper Caravan B"
+	icon = 'icons/turf/areas_vr_talon.dmi'
+	icon_state = "yellow"
+	requires_power = 1
+	has_gravity = 1
+
+// The shuttle's 'shuttle' computer TESHARI RUNABOUT
+/obj/machinery/computer/shuttle_control/explore/teshari_runabout_b
+	name = "short jump console"
+	shuttle_tag = "Teshari Runabout B"
+	req_one_access = list()
+
+// The shuttle's 'shuttle' computer CARAVAN
+/obj/machinery/computer/shuttle_control/explore/caravan_b
+	name = "short jump console"
+	shuttle_tag = "Spacena Caravan +"
+	req_one_access = list()
+
+//TESHARI RUNABOUT
+
+// The 'shuttle'
+/datum/shuttle/autodock/overmap/teshari_runabout_b
+	name = "Teshari Runabout B"
+	current_location = "omship_spawn_teshari"
+	docking_controller_tag = "teshari_b_docking"
+	shuttle_area = list(/area/shuttle/teshari_runabout_b)
+	defer_initialisation = TRUE //We're not loaded until an admin does it
+	fuel_consumption = 5
+	ceiling_type = /turf/simulated/floor/reinforced/airless
+
+// A shuttle lateloader landmark
+/obj/effect/shuttle_landmark/shuttle_initializer/teshari_runabout_b
+	name = "Teshari Runabout B"
+	base_area = /area/space
+	base_turf = /turf/space
+	landmark_tag = "omship_spawn_teshari"
+	shuttle_type = /datum/shuttle/autodock/overmap/teshari_runabout_b
+
+// The 'ship'
+/obj/overmap/entity/visitable/ship/landable/teshari_runabout_b
+	scanner_name = "Teshari Runabout Shuttle"
+	scanner_desc = @{"[i]Registration[/i]: - - -
+[i]Class[/i]: Teshari Runabout
+[i]Transponder[/i]: Transmitting (CIV), non-hostile
+[b]Notice[/b]: Old Teshari shuttle, still in use."}
+	color = "#0096aa"
+	vessel_mass = 4500
+	vessel_size = SHIP_SIZE_LARGE
+	fore_dir = WEST
+	shuttle = "Teshari Runabout B"
+
+// CARAVAN SHUTTLE
+
+// The 'shuttle'
+/datum/shuttle/autodock/overmap/caravan_b
+	name = "Spacena Caravan B"
+	current_location = "omship_spawn_caravan"
+	docking_controller_tag = "caravan_b_docking"
+	shuttle_area = list(/area/shuttle/caravan_b)
+	defer_initialisation = TRUE //We're not loaded until an admin does it
+	fuel_consumption = 5
+	ceiling_type = /turf/simulated/floor/reinforced/airless
+
+// A shuttle lateloader landmark
+/obj/effect/shuttle_landmark/shuttle_initializer/caravan_b
+	name = "Spacena Caravan B"
+	base_area = /area/space
+	base_turf = /turf/space
+	landmark_tag = "omship_spawn_carvan"
+	shuttle_type = /datum/shuttle/autodock/overmap/caravan_b
+
+// The 'ship'
+/obj/overmap/entity/visitable/ship/landable/caravan_b
+	scanner_name = "Spacena Caravan B"
+	scanner_desc = @{"[i]Registration[/i]: - - -
+[i]Class[/i]: Spacena Caravan + Shuttle
+[i]Transponder[/i]: Transmitting (CIV), non-hostile
+[b]Notice[/b]: Comfy and cheap shuttle"}
+	color = "#fecb74"
+	vessel_mass = 4500
+	vessel_size = SHIP_SIZE_LARGE
+	fore_dir = WEST
+	shuttle = "Spacena Caravan B"