From a2592483b549de5358b1cbb420394ed6212ab98f Mon Sep 17 00:00:00 2001 From: Kraseo Date: Sat, 14 Mar 2020 13:07:13 +0100 Subject: [PATCH 1/3] hey did you know there's not one, not two, but three tiles on roid7.dmm that don't have /area/ruin/space but rather /area/ruin/unpowered? yeah i'm angry too --- code/game/gamemodes/objective.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index a4b1f68265..b0092d8d67 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1163,12 +1163,16 @@ GLOBAL_LIST_EMPTY(possible_sabotages) var/payout = 0 var/payout_bonus = 0 var/area/dropoff = null + var/static/list/blacklisted_areas = typecacheof(list(/area/ai_monitored/turret_protected, + /area/solar/, + /area/ruin/, //thank you station space ruins + /area/science/test_area/)) /datum/objective/contract/proc/generate_dropoff() // Generate a random valid area on the station that the dropoff will happen. var/found = FALSE while(!found) var/area/dropoff_area = pick(GLOB.sortedAreas) - if(dropoff_area && is_station_level(dropoff_area.z) && !dropoff_area.outdoors && !istype(dropoff_area, /area/shuttle/)) + if(dropoff_area && is_station_level(dropoff_area.z) && !dropoff_area.outdoors && !is_type_in_typecache(dropoff_area, blacklisted_areas)) dropoff = dropoff_area found = TRUE From 3f44882c1ac662091a4b0abc610fa3e24474ca14 Mon Sep 17 00:00:00 2001 From: Kraseo Date: Sat, 14 Mar 2020 13:13:26 +0100 Subject: [PATCH 2/3] FUCK --- code/game/gamemodes/objective.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index b0092d8d67..192153535d 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1166,7 +1166,8 @@ GLOBAL_LIST_EMPTY(possible_sabotages) var/static/list/blacklisted_areas = typecacheof(list(/area/ai_monitored/turret_protected, /area/solar/, /area/ruin/, //thank you station space ruins - /area/science/test_area/)) + /area/science/test_area/, + /area/shuttle)) /datum/objective/contract/proc/generate_dropoff() // Generate a random valid area on the station that the dropoff will happen. var/found = FALSE From f8a365490bbdca6f4ae72354364db8403ea2dce1 Mon Sep 17 00:00:00 2001 From: Kraseo Date: Sat, 14 Mar 2020 13:15:09 +0100 Subject: [PATCH 3/3] =?UTF-8?q?FUCK=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/game/gamemodes/objective.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 192153535d..b42b41aba4 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1167,7 +1167,7 @@ GLOBAL_LIST_EMPTY(possible_sabotages) /area/solar/, /area/ruin/, //thank you station space ruins /area/science/test_area/, - /area/shuttle)) + /area/shuttle/)) /datum/objective/contract/proc/generate_dropoff() // Generate a random valid area on the station that the dropoff will happen. var/found = FALSE