Hidden Offships (#15544)

2026-08-22 12:29:46 +01:00 · 2023-02-12 18:57:37 +01:00
parent 5cad93c74f
commit 3b1aa2b159
30 changed files with 61 additions and 15 deletions
@@ -167,6 +167,13 @@
 	if(welcome_message)
 		to_chat(user, SPAN_NOTICE(welcome_message))
 	universe.OnPlayerLatejoin(user)
+	if(current_map.use_overmap)
+		var/obj/effect/overmap/visitable/sector = map_sectors["[user.z]"]
+		if(sector?.invisible_until_ghostrole_spawn)
+			sector.x = sector.start_x
+			sector.y = sector.start_y
+			sector.z = current_map.overmap_z
+			sector.invisible_until_ghostrole_spawn = FALSE
 	return TRUE

 //Proc to check if a specific user can edit this spawner (open/close/...)
@@ -177,10 +177,6 @@

 	return M

-//Proc executed after someone is spawned in
-/datum/ghostspawner/human/post_spawn(mob/user)
-	. = ..()
-
 /// Used for cryo to free up a slot when a ghost cryos.
 /mob/living/carbon/human
 	var/datum/weakref/ghost_spawner
@@ -50,6 +50,8 @@ var/global/area/overmap/map_overmap // Global object used to locate the overmap
 	/// null | num | list. If a num or a (num, num) list, the radius or random bounds for placing this sector near the main map's overmap icon.
 	var/list/place_near_main

+	var/invisible_until_ghostrole_spawn = FALSE
+
 /obj/effect/overmap/visitable/Initialize()
 	. = ..()
 	if(. == INITIALIZE_HINT_QDEL)
@@ -77,7 +79,8 @@ var/global/area/overmap/map_overmap // Global object used to locate the overmap
 		start_y = start_y || rand(map_low, map_high)
 		home = locate(start_x, start_y, current_map.overmap_z)

-	forceMove(home)
+	if(!invisible_until_ghostrole_spawn)
+		forceMove(home)

 	update_name()

@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - rscadd: "Ghostspawner ships now only spawn into the game area once its first crewmember wakes up."
@@ -94,6 +94,8 @@
 		"nav_ranger_corvette_2"
 	)

+	invisible_until_ghostrole_spawn = TRUE
+
 /obj/effect/overmap/visitable/ship/ranger_corvette/New()
 	designation = "[pick("Argia sa Mar", "Kuenoi", "Xansan", "Greentree", "Rautakaivos Kaupunki", "Dorshafen", "Inverkeithing", "Uusi Viipuri", "Horner Station", "Commander Ashia Patvardhan", "Sevaschaiv", "Rahe", "Czsari", "Suwon", "Kamoga", "Jagalaw", "Dalakyhr", "Gurmori", "Ohdker", "Dainshu", "Boch-Zivir", "Kill Emperor Boleslaw", "Expletive Sol", "Letter of Marque", "Free Fisanduh", "Gaucho", "Treaty of Xansan", "Pirates Beware", "Moroz Here We Come!", "This Ship Kills Privateers", "Lower The Black Flag", "Frontier Spirit", "Freedom", "Independence", "Self-Determination", "Let's Have A Second Collapse", "Send More Solarians", "You Can Run But You Can't Hide", "Frontier Alliance", "Here's To You, Governor Hawkins", "Remember Jamestown", "Good Riddance to Kambiz Entezam", "We're Coming For You In Hell, Terrence Hopper", "Warpway Safari Company", "Badlands Gun Club", "Light's Edge Light Foot", "Now Entering Free Xanu", "Weeping Stars, Weep No More", "Rebel's Reach Outreach Program", "Rugged Individualism", "Don't Tread On Me", "Snake In The Grass", "Konyang Yacht Club", "Ranger Ship")]"
 	..()
@@ -62,4 +62,4 @@

 /obj/item/card/id/ranger_ship
 	name = "ranger ship id"
-	access = list(access_external_airlocks)
+	access = list(access_external_airlocks)
@@ -85,6 +85,8 @@
 		"nav_dominian_corvette_2"
 	)

+	invisible_until_ghostrole_spawn = TRUE
+
 /obj/effect/overmap/visitable/ship/dominian_corvette/New()
 	designation = "[pick("Lammergeier", "Eagle", "Hawk", "Owl", "Vulture", "Sparrowhawk", "Falcon", "Peregrine", "Condor", "Harrier", "Kestrel", "Osprey", "Yastr", "Merlin", "Kite", "Seriema", "Caracaras")]"
 	..()
@@ -102,4 +102,4 @@

 /obj/item/card/id/imperial_fleet
 	name = "imperial fleet id"
-	access = list(access_imperial_fleet_voidsman_ship, access_external_airlocks)
+	access = list(access_imperial_fleet_voidsman_ship, access_external_airlocks)
@@ -43,6 +43,8 @@
 		"nav_ee_spy_ship_2"
 	)

+	invisible_until_ghostrole_spawn = TRUE
+
 /obj/effect/overmap/visitable/ship/ee_spy_ship/New()
 	designation = "[pick("Brilliance", "Oppenheimer", "Fermi", "Slingshot", "Shanghai", "Bern", "Hadron", "Positron", "Invention", "Nikola Tesla", "Quark")]"
 	..()
@@ -75,4 +75,4 @@

 /obj/item/card/id/ee_ship
 	name = "ee research ship id"
-	access = list(access_ee_spy_ship, access_external_airlocks)
+	access = list(access_ee_spy_ship, access_external_airlocks)
@@ -43,6 +43,8 @@
 		"nav_elyran_strike_craft_2"
 	)

+	invisible_until_ghostrole_spawn = TRUE
+
 /obj/effect/overmap/visitable/ship/elyran_strike_craft/New()
 	designation = "[pick("Persepolis", "Damascus", "Medina", "Aemaq", "New Suez", "Bursa", "Republican", "Falcon", "Gelin", "Sphinx", "Takam", "Dandan", "Anqa", "Falak", "Uthra", "Djinn", "Roc", "Shadhavar", "Karkadann")]"
 	..()
@@ -87,4 +87,4 @@

 /obj/item/card/id/elyran_naval_infantry_craft
 	name = "elyran naval infantry craft id"
-	access = list(access_elyran_naval_infantry_ship, access_external_airlocks)
+	access = list(access_elyran_naval_infantry_ship, access_external_airlocks)
@@ -84,6 +84,8 @@
 		"nav_iac_rescue_ship_5"
 	)

+	invisible_until_ghostrole_spawn = TRUE
+
 /obj/effect/overmap/visitable/ship/iac_rescue_ship/New()
 	designation = "[pick("Angitia", "Eir", "Vejovis", "Dharti", "Serket", "He Xiangu", "Sirona", "Ixtlilton", "Boris Yegorov", "Simi", "Aleksandra Hro'makar", "Assistance", "Helping Hand", "Free Aid", "Safe Haven", "Grace", "Compassion", "Relief")]"
 	..()
@@ -34,6 +34,8 @@
 		"Intrepid" = list("nav_kataphract_ship_dockintrepid")
 	)

+	invisible_until_ghostrole_spawn = TRUE
+
 /obj/effect/overmap/visitable/ship/kataphract_ship/New()
 	designation = "[pick("Pious Avenger", "Persistent Conviction", "Solemn Retribution", "Venerable Ironscales", "Blade of Faith", "Glorious Succor", "Sacred Retribution", "Unflinching Soul", "Unrelenting Fervor", "Ascendant Absolution")]"
 	..()
@@ -45,6 +45,8 @@
 		"nav_orion_express_ship_3"
 	)

+	invisible_until_ghostrole_spawn = TRUE
+
 /obj/effect/overmap/visitable/ship/orion_express_ship/New()
 	designation = "[pick("Messenger", "Traveler", "Highspeed", "Punctual", "Unstoppable", "Pony Express", "Courier", "Telegram", "Carrier Pigeon", "Fuel Stop", "Convenience")]"
 	..()
@@ -33,6 +33,8 @@
 		"Database Freighter Shuttle" = list("nav_database_freighter_shuttle")
 	)

+	invisible_until_ghostrole_spawn = TRUE
+
 /obj/effect/overmap/visitable/ship/database_freighter/New()
 	if (prob(50))
 		designation = "Hadii"
@@ -54,4 +54,4 @@

 	uniform = /obj/item/clothing/under/tajaran/database_freighter/captain
 	suit = /obj/item/clothing/suit/storage/toggle/labcoat
-	accessory = /obj/item/clothing/accessory/hadii_pin
+	accessory = /obj/item/clothing/accessory/hadii_pin
@@ -94,4 +94,4 @@
 						/obj/item/storage/box/hadii_manifesto = 1,
 						/obj/item/storage/box/hadii_card = 1
 						)
-	l_hand = /obj/item/device/megaphone
+	l_hand = /obj/item/device/megaphone
@@ -33,6 +33,8 @@
 		"Orbital Fleet Shuttle" = list("nav_headmaster_shuttle")
 	)

+	invisible_until_ghostrole_spawn = TRUE
+
 /obj/effect/overmap/visitable/ship/headmaster_ship/New()
 	if (prob(50))
 		designation = "Hadii"
@@ -45,6 +45,8 @@
 		"nav_tirakqi_freighter_4"
 	)

+	invisible_until_ghostrole_spawn = TRUE
+
 /obj/effect/overmap/visitable/ship/tirakqi_freighter/New()
    designation = "[pick("Bigger Squib", "Frightful Whaler", "Star Spanner", "Lu'Kaax", "Star Scamp", "Ocean Ink", "Yippi")]"
    ..()
@@ -43,6 +43,8 @@
 		"nav_fsf_patrol_ship_2"
 	)

+	invisible_until_ghostrole_spawn = TRUE
+
 /obj/effect/overmap/visitable/ship/fsf_patrol_ship/New()
 	designation = "[pick("Varangian", "Swiss Guard", "Free Company", "Praetorian", "Gurkha", "Roland", "Whispering Death", "Gordon Ingram", "Jungle Work", "Habiru", "Francs-Tireurs", "Catalan", "Navarrese", "Breton", "Corsair", "Landsknecht", "Hessian")]"
 	..()
@@ -82,6 +82,8 @@
 		"nav_sfa_patrol_ship_2"
 	)

+	invisible_until_ghostrole_spawn = TRUE
+
 /obj/effect/overmap/visitable/ship/sfa_patrol_ship/New()
 	designation = "[pick("Brigand", "Zheng Yi Sao", "Corruption", "Edward Teach", "Beauchamp's Revenge", "Blackguard", "Viking", "Despoiler", "Wayward Son", "Black Sheep", "Gluttony", "Pride", "Avarice", "Greed", "Envy", "Sloth", "Wrath", "We're The Good Ones", "Reformed", "Repentant", "Recidivist", "Just Following Orders", "Habitual Offender", "Felon", "Misdemeanor", "Conscientious Objector")]"
 	..()
@@ -121,4 +121,4 @@

 /obj/item/card/id/sfa_ship
 	name = "sfa patrol ship id"
-	access = list(access_sol_ships, access_external_airlocks)
+	access = list(access_sol_ships, access_external_airlocks)
@@ -107,6 +107,8 @@
 		"nav_ssmd_corvette_2"
 	)

+	invisible_until_ghostrole_spawn = TRUE
+
 /obj/effect/overmap/visitable/ship/ssmd_corvette/New()
 	designation = "[pick("Asparuh", "Magyar", "Hussar", "Black Army", "Hunyadi", "Piast", "Hussite", "Tepes", "Komondor", "Turul", "Vistula", "Sikorski", "Mihai", "Blue Army", "Strzyga", "Leszy", "Danube", "Sokoly", "Patriotism", "Duty", "Loyalty", "Florian Geyer", "Pilsudski", "Chopin", "Levski", "Valkyrie", "Tresckow", "Olbricht", "Dubcek", "Kossuth", "Nagy", "Clausewitz", "Poniatowski", "Orzel", "Turul", "Skanderbeg", "Ordog", "Perun", "Poroniec", "Klobuk", "Cavalryman", "Szalai's Own", "Upior", "Szalai's Pride", "Kuvasz", "Fellegvar", "Nowa Bratislawa", "Zbior", "Stadter", "Homesteader", "Premyslid", "Bohemia", "Discipline", "Cavalryman", "Order", "Law", "Tenacity", "Diligence", "Valiant", "Konik", "Victory", "Triumph", "Vanguard", "Jager", "Grenadier", "Honor Guard", "Visegrad", "Nil", "Warsaw", "Budapest", "Prague", "Sofia", "Bucharest", "Home Army", "Kasimir", "Veles", "Blyskawica", "Kubus")]"
 	..()
@@ -36,6 +36,8 @@
 		"nav_tajaran_smuggler_2"
 	)

+	invisible_until_ghostrole_spawn = TRUE
+
 /obj/effect/overmap/visitable/ship/tajaran_smuggler/New()
    designation = "[pick("Brave Ha'rron", "Trickster Farwa", "Legal and Safe Cargo", "Adhomian Trader", "Minharrzka", "Rredouane's Chosen", "Adhomai's Pride")]"
    ..()
@@ -87,4 +87,4 @@
 	name = "Tajaran Smuggler Captain"

 	uniform = /obj/item/clothing/under/syndicate
-	head = /obj/item/clothing/head/padded
+	head = /obj/item/clothing/head/padded
@@ -43,6 +43,8 @@
 		"nav_tcfl_peacekeeper_ship_2"
 	)

+	invisible_until_ghostrole_spawn = TRUE
+
 /obj/effect/overmap/visitable/ship/tcfl_peacekeeper_ship/New()
 	designation = "[pick("Castle", "Rook", "Gin Rummy", "Pawn", "Bishop", "Knight", "Blackjack", "Torch", "Liberty", "President Dorn", "Independence", "Civic Duty", "Democracy", "Progress", "Prosperity", "New Gibson", "Biesel", "Justice", "Equality")]"
 	..()
@@ -105,4 +105,4 @@

 /obj/item/card/id/tcfl_ship
 	name = "tcfl peacekeeper ship id"
-	access = list(access_tcfl_peacekeeper_ship, access_external_airlocks)
+	access = list(access_tcfl_peacekeeper_ship, access_external_airlocks)
@@ -43,6 +43,8 @@
 		"nav_tramp_freighter_2"
 	)

+	invisible_until_ghostrole_spawn = TRUE
+
 /obj/effect/overmap/visitable/ship/tramp_freighter/New()
    designation = "[pick("Tuckerbag", "Do No Harm", "Volatile Cargo", "Stay Clear", "Entrepreneurial", "Good Things Only", "Worthless", "Skip This One", "Pay No Mind", "Customs-Cleared", "Friendly", "Reactor Leak", "Fool's Gold", "Cursed Cargo", "Guards Aboard")]"
    ..()
@@ -107,4 +109,4 @@
 /obj/effect/shuttle_landmark/freighter_shuttle/transit
 	name = "In transit"
 	landmark_tag = "nav_transit_freighter_shuttle"
-	base_turf = /turf/space/transit/north
+	base_turf = /turf/space/transit/north
@@ -43,6 +43,8 @@
 		"nav_militia_ship_2"
 	)

+	invisible_until_ghostrole_spawn = TRUE
+
 /obj/effect/overmap/visitable/ship/militia_ship/New()
    designation = "[pick("Volunteer", "Part-Timer", "Last Line", "Fearless", "Protector", "Minuteman", "Watchdog", "Family Man", "Guardian", "Hoplite", "Home Guard", "Defender")]"
    ..()