Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685

code/modules/events/operative.dm

@@ -19,6 +19,8 @@
 	var/list/spawn_locs = list()
 	for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list)
 		spawn_locs += L.loc
+	for(var/obj/effect/landmark/loneopspawn/L in GLOB.landmarks_list)
+		spawn_locs += L.loc
 	if(!spawn_locs.len)
 		return MAP_ERROR
 

code/modules/events/pirates.dm

@@ -61,6 +61,9 @@
 	var/list/candidates = pollGhostCandidates("Do you wish to be considered for pirate crew?", ROLE_TRAITOR)
 	shuffle_inplace(candidates)
 
+	if(!SSmapping.empty_space)
+		SSmapping.empty_space = SSmapping.add_new_zlevel("Empty Area For Pirates", list(ZTRAIT_LINKAGE = SELFLOOPING))
+	
 	var/datum/map_template/shuttle/pirate/default/ship = new
 	var/x = rand(TRANSITIONEDGE,world.maxx - TRANSITIONEDGE - ship.width)
 	var/y = rand(TRANSITIONEDGE,world.maxy - TRANSITIONEDGE - ship.height)

code/modules/events/sentience.dm

@@ -9,6 +9,8 @@
 	role_name = "random animal"
 	var/animals = 1
 	var/one = "one"
+	/// Blacklisted mob_biotypes - Hey can we like, not have player controlled megafauna?
+	var/blacklisted_biotypes = MOB_EPIC
 	fakeable = TRUE
 
 /datum/round_event/ghost_role/sentience/announce(fake)
@@ -33,6 +35,8 @@
 		var/turf/T = get_turf(L)
 		if(!T || !is_station_level(T.z))
 			continue
+		if(L.mob_biotypes & blacklisted_biotypes)		//hey can you don't
+			continue
 		if(!(L in GLOB.player_list) && !L.mind)
 			potential += L
 
@@ -50,7 +54,7 @@
 
 		SG.transfer_ckey(SA, FALSE)
 
-		SA.grant_all_languages(TRUE)
+		SA.grant_all_languages(TRUE, FALSE, FALSE)
 
 		SA.sentience_act()