Merge pull request #16 from SomeGuyEatingPie/Random-Ship-and-Sophie's-shuttle

Random whiteship and sophie's shuttle

_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm

@@ -3,16 +3,7 @@
 /turf/open/space/basic,
 /area/space)
 "b" = (
-/obj/docking_port/stationary{
-	dheight = 0;
-	dir = 2;
-	dwidth = 11;
-	height = 22;
-	id = "whiteship_away";
-	name = "Deep Space";
-	width = 35;
-	json_key = "whiteship"
-	},
+/obj/docking_port/stationary/picked/whiteship,
 /turf/open/space,
 /area/space)
 

_maps/shuttles/whiteship_delta.dmm

@@ -29,7 +29,7 @@
 	height = 17;
 	id = "whiteship";
 	launch_status = 0;
-	movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
+	movement_force = list("KNOCKDOWN"=0,"THROW"=0);
 	name = "NT Frigate";
 	port_direction = 8;
 	preferred_direction = 4;

code/datums/shuttles.dm

@@ -423,6 +423,10 @@
 	suffix = "whiteship_pod"
 	name = "Salvage Pod"
 
+/datum/map_template/shuttle/whiteship/Sophie1
+	suffix = "Sophie1"
+	name = "Sophie's Ship"
+	
 /datum/map_template/shuttle/cargo/box
 	suffix = "box"
 	name = "supply shuttle (Box)"
@@ -535,4 +539,4 @@
 
 /datum/map_template/shuttle/snowdin/excavation
 	suffix = "excavation"
-	name = "Snowdin Excavation Elevator"
+	name = "Snowdin Excavation Elevator"

code/game/area/areas/shuttles.dm

@@ -93,6 +93,30 @@
 /area/shuttle/abandoned/pod
 	name = "Abandoned Ship Pod"
 
+/area/shuttle/Sophie
+	name = "Sophie's Ship"
+	blob_allowed = FALSE
+	requires_power = TRUE
+	canSmoothWithAreas = /area/shuttle/Sophie
+
+/area/shuttle/Sophie/bridge
+	name = "Sophie's Ship Bridge"
+
+/area/shuttle/Sophie/engine
+	name = "Sophie's Ship Engine"
+
+/area/shuttle/Sophie/kitchen
+	name = "Sophie's Ship kitchen"
+
+/area/shuttle/Sophie/lounge
+	name = "Sophie's Ship lounge"
+
+/area/shuttle/Sophie/crew
+	name = "Sophie's Ship Crew Quarters"
+
+/area/shuttle/Sophie/medbay
+	name = "Sophie's Ship Medbay"
+
 ////////////////////////////Single-area shuttles////////////////////////////
 
 /area/shuttle/transit
@@ -200,4 +224,4 @@
 	name = "Tiny Freighter"
 
 /area/shuttle/caravan/freighter3
-	name = "Tiny Freighter"
+	name = "Tiny Freighter"

code/modules/shuttle/shuttle.dm

@@ -29,7 +29,7 @@
 	// may result.
 	if(force)
 		..()
-		. = QDEL_HINT_QUEUE
+		return QDEL_HINT_QUEUE
 	else
 		return QDEL_HINT_LETMELIVE
 
@@ -227,6 +227,28 @@
 		reserved_area = null
 	return ..()
 
+/obj/docking_port/stationary/picked
+	///Holds a list of map name strings for the port to pick from
+	var/list/shuttlekeys
+
+/obj/docking_port/stationary/picked/Initialize(mapload)
+	. = ..()
+	if(!LAZYLEN(shuttlekeys))
+		WARNING("Random docking port [id] loaded with no shuttle keys")
+		return
+	var/selectedid = pick(shuttlekeys)
+	roundstart_template = SSmapping.shuttle_templates[selectedid]
+
+/obj/docking_port/stationary/picked/whiteship
+	name = "Deep Space"
+	id = "whiteship_away"
+	dheight = 0
+	dir = 2
+	dwidth = 11
+	height = 22
+	width = 35
+	shuttlekeys = list("whiteship_meta", "whiteship_pubby", "whiteship_box", "whiteship_cere", "whiteship_kilo", "whiteship_donut", "whiteship_delta", "whiteship_Sophie1")
+	
 /obj/docking_port/mobile
 	name = "shuttle"
 	icon_state = "pinonclose"

code/modules/shuttle/white_ship.dm

@@ -54,3 +54,8 @@
 	loot = list(/obj/mecha/working/ripley/mining = 1,
 				/obj/structure/mecha_wreckage/ripley = 5)
 	lootdoubles = FALSE
+
+/obj/item/paper/fluff/ruins/sophie
+	name = "Handwritten note"
+
+	info = "Hello, if you are reading this, you've must have come across my ship.<br>You're welcome to borrow it to get about if its an emergency. Just plase dont leave it an mess.<br> - Sophie Johnson (HoP of General Station 13)"