Merge pull request #11637 from datlo/lavalandgolemsintospace

Move free golems to lavaland, let them move shuttle still

code/controllers/configuration.dm

@@ -80,9 +80,6 @@
 	var/auto_cryo_ssd_mins = 0
 	var/ssd_warning = 0
 
-	var/prob_free_golems = 75 //chance for free golems spawners to appear roundstart
-	var/unrestricted_free_golems = FALSE //if true, free golems can appear on all roundtypes
-
 	var/traitor_objectives_amount = 2
 	var/shadowling_max_age = 0
 
@@ -310,12 +307,6 @@
 				if("jobs_have_minimal_access")
 					config.jobs_have_minimal_access = 1
 
-				if("prob_free_golems")
-					config.prob_free_golems = text2num(value)
-
-				if("unrestricted_free_golems")
-					config.unrestricted_free_golems = TRUE
-
 				if("shadowling_max_age")
 					config.shadowling_max_age = text2num(value)
 

code/datums/ruins/lavaland.dm

@@ -46,6 +46,15 @@ datum/map_template/ruin/lavaland/ash_walker
 	cost = 20
 	allow_duplicates = FALSE
 
+/datum/map_template/ruin/lavaland/free_golem
+	name = "Free Golem Ship"
+	id = "golem-ship"
+	description = "Lumbering humanoids, made out of precious metals, move inside this ship. They frequently leave to mine more minerals, which they somehow turn into more of them. \
+	Seem very intent on research and individual liberty, and also geology based naming?"
+	cost = 20
+	suffix = "lavaland_surface_golem_ship.dmm"
+	allow_duplicates = FALSE
+
 /datum/map_template/ruin/lavaland/animal_hospital
 	name = "Animal Hospital"
 	id = "animal-hospital"

code/game/area/areas/ruins/lavaland.dm

@@ -16,7 +16,7 @@
 	icon_state = "dk_yellow"
 
 /area/ruin/powered/golem_ship
-	name = "Free Golem Ship"
+	name = "Free Golem Landing"
 	icon_state = "dk_yellow"
 
 /area/ruin/powered/greed

code/game/gamemodes/blob/blob.dm

@@ -14,7 +14,6 @@ var/list/blob_nodes = list()
 	required_enemies = 1
 	recommended_enemies = 1
 	restricted_jobs = list("Cyborg", "AI")
-	free_golems_disabled = TRUE
 
 	var/declared = 0
 	var/burst = 0

code/game/gamemodes/cult/cult.dm

@@ -43,7 +43,6 @@ var/global/list/all_cults = list()
 	required_players = 30
 	required_enemies = 3
 	recommended_enemies = 4
-	free_golems_disabled = TRUE
 
 	var/datum/mind/sacrifice_target = null
 	var/finished = 0

code/game/gamemodes/game_mode.dm

@@ -27,7 +27,6 @@
 	var/recommended_enemies = 0
 	var/newscaster_announcements = null
 	var/ert_disabled = 0
-	var/free_golems_disabled = FALSE
 	var/uplink_welcome = "Syndicate Uplink Console:"
 	var/uplink_uses = 20
 
@@ -81,7 +80,6 @@
 //		feedback_set_details("revision","[revdata.revision]")
 	feedback_set_details("server_ip","[world.internet_address]:[world.port]")
 	generate_station_goals()
-	check_free_golems()
 	start_state = new /datum/station_state()
 	start_state.count()
 	return 1
@@ -513,12 +511,6 @@ proc/display_roundstart_logout_report()
 		var/datum/station_goal/G = V
 		G.print_result()
 
-/datum/game_mode/proc/check_free_golems() //check config and gamemode for free golems setting and run the prob to check if the round will have free golems spawned or not
-	if((config.unrestricted_free_golems || !free_golems_disabled) && prob(config.prob_free_golems))
-		for(var/obj/effect/landmark/free_golem_spawn/L in GLOB.landmarks_list)
-			if(isturf(L.loc))
-				new /obj/effect/mob_spawn/human/golem/adamantine(L.loc)
-
 /datum/game_mode/proc/update_eventmisc_icons_added(datum/mind/mob_mind)
 	var/datum/atom_hud/antag/antaghud = huds[ANTAG_HUD_EVENTMISC]
 	antaghud.join_hud(mob_mind.current)

code/game/gamemodes/nuclear/nuclear.dm

@@ -12,7 +12,6 @@ proc/issyndicate(mob/living/M as mob)
 	required_players = 30	// 30 players - 5 players to be the nuke ops = 25 players remaining
 	required_enemies = 5
 	recommended_enemies = 5
-	free_golems_disabled = TRUE
 
 	var/const/agents_possible = 5 //If we ever need more syndicate agents.
 

code/game/gamemodes/wizard/wizard.dm

@@ -7,7 +7,6 @@
 	required_players = 20
 	required_enemies = 1
 	recommended_enemies = 1
-	free_golems_disabled = TRUE
 	var/use_huds = 0
 	var/finished = 0
 	var/but_wait_theres_more = 0

code/game/machinery/computer/buildandrepair.dm

@@ -334,9 +334,6 @@
 /obj/item/circuitboard/white_ship
 	name = "circuit Board (White Ship)"
 	build_path = /obj/machinery/computer/shuttle/white_ship
-/obj/item/circuitboard/golem_ship
-	name = "circuit Board (Golem Ship)"
-	build_path = /obj/machinery/computer/shuttle/golem_ship
 /obj/item/circuitboard/shuttle/syndicate
 	name = "circuit board (Syndicate Shuttle)"
 	build_path = /obj/machinery/computer/shuttle/syndicate
@@ -346,7 +343,9 @@
 /obj/item/circuitboard/shuttle/syndicate/drop_pod
 	name = "circuit board (Syndicate Drop Pod)"
 	build_path = /obj/machinery/computer/shuttle/syndicate/drop_pod
-
+/obj/item/circuitboard/shuttle/golem_ship
+	name = "circuit Board (Golem Ship)"
+	build_path = /obj/machinery/computer/shuttle/golem_ship
 
 /obj/item/circuitboard/HolodeckControl
 	name = "Circuit board (Holodeck Control)"

code/modules/mining/equipment_locker.dm

@@ -474,7 +474,9 @@
 		new /datum/data/mining_equipment("Royal Cape of the Liberator", /obj/item/bedsheet/rd/royal_cape, 								500),
 		new /datum/data/mining_equipment("Grey Slime Extract",			/obj/item/slime_extract/grey,									1000),
 		new /datum/data/mining_equipment("KA Trigger Modification Kit",	/obj/item/borg/upgrade/modkit/trigger_guard,					1000),
+		new /datum/data/mining_equipment("Shuttle Console Board",		/obj/item/circuitboard/shuttle/golem_ship,						2000),
 		new /datum/data/mining_equipment("The Liberator's Legacy",  	/obj/item/storage/box/rndboards,								2000)
+
 		)
 
 /datum/data/mining_equipment

code/modules/shuttle/shuttle.dm

@@ -503,7 +503,7 @@
 		SSair.remove_from_active(T1)
 		T1.CalculateAdjacentTurfs()
 		SSair.add_to_active(T1,1)
-		
+
 		T1.lighting_build_overlay()
 
 		T0.ChangeTurf(turf_type)
@@ -836,20 +836,6 @@
 	shuttleId = "whiteship"
 	possible_destinations = "whiteship_away;whiteship_home;whiteship_z4"
 
-/obj/machinery/computer/shuttle/golem_ship
-	name = "Golem Ship Console"
-	desc = "Used to control the Golem Ship."
-	circuit = /obj/item/circuitboard/golem_ship
-	shuttleId = "freegolem"
-	possible_destinations = "freegolem_z3;freegolem_z5;freegolem_z1;freegolem_z6"
-	resistance_flags = INDESTRUCTIBLE
-
-/obj/machinery/computer/shuttle/golem_ship/attack_hand(mob/user)
-	if(!isgolem(user))
-		to_chat(user, "<span class='notice'>The console is unresponsive. Seems only golems can use it.</span>")
-		return
-	..()
-
 /obj/machinery/computer/shuttle/engineering
 	name = "Engineering Shuttle Console"
 	desc = "Used to call and send the engineering shuttle."
@@ -893,6 +879,25 @@
 	possible_destinations = "trade_sol_base;trade_dock"
 	shuttleId = "trade_sol"
 
+/obj/machinery/computer/shuttle/golem_ship
+	name = "Golem Ship Console"
+	desc = "Used to control the Golem Ship."
+	circuit = /obj/item/circuitboard/shuttle/golem_ship
+	shuttleId = "freegolem"
+	possible_destinations = "freegolem_lavaland;freegolem_z5;freegolem_z4;freegolem_z6"
+
+/obj/machinery/computer/shuttle/golem_ship/attack_hand(mob/user)
+	if(!isgolem(user) && !isobserver(user))
+		to_chat(user, "<span class='notice'>The console is unresponsive. Seems only golems can use it.</span>")
+		return
+	..()
+
+/obj/machinery/computer/shuttle/golem_ship/recall
+	name = "golem ship recall terminal"
+	desc = "Used to recall the Golem Ship."
+	possible_destinations = "freegolem_lavaland"
+	resistance_flags = INDESTRUCTIBLE
+
 //#undef DOCKING_PORT_HIGHLIGHT
 
 /turf/proc/copyTurf(turf/T)