From fe7a17bc947a230bad12214e6c0d0e7557110786 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Tue, 26 Mar 2024 14:06:55 +1100 Subject: [PATCH] Shaded Hills cross-map compile fixes. --- maps/shaded_hills/shaded_hills.dm | 7 +++++++ maps/shaded_hills/shaded_hills_define.dm | 10 +--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/maps/shaded_hills/shaded_hills.dm b/maps/shaded_hills/shaded_hills.dm index 6e4af8e6698f..fcc09ac1aa8e 100644 --- a/maps/shaded_hills/shaded_hills.dm +++ b/maps/shaded_hills/shaded_hills.dm @@ -21,3 +21,10 @@ #elif !defined(MAP_OVERRIDE) #warn A map has already been included, ignoring Shaded Hills #endif + +/datum/map/shaded_hills + default_species = SPECIES_KOBALOI + loadout_categories = list( + /decl/loadout_category/fantasy/clothing, + /decl/loadout_category/fantasy/utility + ) diff --git a/maps/shaded_hills/shaded_hills_define.dm b/maps/shaded_hills/shaded_hills_define.dm index d72ab3b72fc9..6896c70aae3e 100644 --- a/maps/shaded_hills/shaded_hills_define.dm +++ b/maps/shaded_hills/shaded_hills_define.dm @@ -10,20 +10,12 @@ company_name = "whispers from the Deep" company_short = "the Deep" system_name = "Outward Lands" - - default_species = SPECIES_KOBALOI + survival_box_choices = list() default_spawn = /decl/spawnpoint/arrivals allowed_latejoin_spawns = list( /decl/spawnpoint/arrivals ) - loadout_categories = list( - /decl/loadout_category/fantasy/clothing, - /decl/loadout_category/fantasy/utility - ) - - survival_box_choices = list() - /datum/map/shaded_hills/get_map_info() return "You're in the [station_name] of the [system_name], nestled between the mountains and the river. On all sides, you are surrounded by untamed wilds. \ Far from the control of [boss_name], you are free to carve forward a path to survival for yourself and your comrades however you wish. Strike the earth!" \ No newline at end of file