diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 0c68b63810..0610357033 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -41,6 +41,9 @@ if("JoinLateTyrVillage") GLOB.latejoin_tyrvillage += loc delete_me = TRUE + if("JoinLateTheDark") + GLOB.latejoin_thedark += loc + delete_me = TRUE //CHOMPEdit End if("JoinLateElevator") latejoin_elevator += loc diff --git a/modular_chomp/code/global.dm b/modular_chomp/code/global.dm index 26e328cbb4..40f38c63bb 100644 --- a/modular_chomp/code/global.dm +++ b/modular_chomp/code/global.dm @@ -6,3 +6,4 @@ GLOBAL_LIST_EMPTY(latejoin_gatewaystation) GLOBAL_LIST_EMPTY(latejoin_plainspath) GLOBAL_LIST_EMPTY(latejoin_fueldepot) GLOBAL_LIST_EMPTY(latejoin_tyrvillage) +GLOBAL_LIST_EMPTY(latejoin_thedark) diff --git a/modular_chomp/code/modules/client/preferences_spawnpoints.dm b/modular_chomp/code/modules/client/preferences_spawnpoints.dm index fd836aa84b..914753d4f4 100644 --- a/modular_chomp/code/modules/client/preferences_spawnpoints.dm +++ b/modular_chomp/code/modules/client/preferences_spawnpoints.dm @@ -7,6 +7,9 @@ ..() turfs = GLOB.latejoin_gatewaystation +/obj/effect/landmark/stationgateway + name = "JoinLateStationGateway" + /datum/spawnpoint/plainspath display_name = "Sif plains" msg = "has checked in at the plains gate" @@ -16,6 +19,9 @@ ..() turfs = GLOB.latejoin_plainspath +/obj/effect/landmark/plainspath + name = "JoinLateSifPlains" + /datum/spawnpoint/fueldepot display_name = "Fuel Depot" msg = "woke up in the fuel depot" @@ -25,6 +31,9 @@ ..() turfs = GLOB.latejoin_fueldepot +/obj/effect/landmark/fueldepot + name = "JoinLateFuelDepot" + /datum/spawnpoint/tyrspawn display_name = "Tyr Wreckage" msg = "woke up in a ruined shuttle" @@ -33,3 +42,18 @@ /datum/spawnpoint/tyrspawn/New() ..() turfs = GLOB.latejoin_tyrvillage + +/obj/effect/landmark/tyrspawn + name = "JoinLateTyrVillage" + +/datum/spawnpoint/darkspawn + display_name = "The Dark" + msg = "phased into the dark" + restrict_job = list(JOB_ANOMALY) + +/datum/spawnpoint/darkspawn/New() + ..() + turfs = GLOB.latejoin_thedark + +/obj/effect/landmark/darkspawn + name = "JoinLateTheDark" diff --git a/modular_chomp/maps/southern_cross/southern_cross-8.dmm b/modular_chomp/maps/southern_cross/southern_cross-8.dmm index 5bc1a6e057..76ccb604ae 100644 --- a/modular_chomp/maps/southern_cross/southern_cross-8.dmm +++ b/modular_chomp/maps/southern_cross/southern_cross-8.dmm @@ -44,6 +44,14 @@ icon_state = "dark" }, /area/syndicate_station) +"aaj" = ( +/obj/effect/landmark/darkspawn, +/turf/simulated/floor/wood/sif, +/area/shadekin) +"aak" = ( +/obj/effect/landmark/darkspawn, +/turf/simulated/floor/tiled/techmaint, +/area/shadekin) "aal" = ( /obj/machinery/vending/cigarette{ dir = 4 @@ -60,6 +68,10 @@ icon_state = "lino" }, /area/tdome/tdomeobserve) +"aan" = ( +/obj/effect/landmark/darkspawn, +/turf/simulated/floor, +/area/shadekin) "aao" = ( /obj/machinery/vending/coffee{ dir = 8 @@ -68,6 +80,11 @@ icon_state = "lino" }, /area/tdome/tdomeobserve) +"aap" = ( +/obj/effect/floor_decal/milspec/monotile, +/obj/effect/landmark/darkspawn, +/turf/simulated/floor/tiled/steel_dirty, +/area/shadekin) "aaq" = ( /obj/machinery/vending/snack{ dir = 8 @@ -1670,6 +1687,7 @@ /area/shuttle/merchant) "bbP" = ( /mob/living/simple_mob/animal/sif/glitterfly/rare, +/obj/effect/landmark/darkspawn, /turf/simulated/floor/outdoors/grass/heavy, /area/shadekin) "bcb" = ( @@ -49669,7 +49687,7 @@ vDP vDP bMy kyg -oTO +aak fqz lRH avb @@ -59967,7 +59985,7 @@ bMy tLx bAY bAY -hel +aap hel bAY bAY @@ -61289,7 +61307,7 @@ oTO gSa awS omL -omL +aaj qzw pfy bMy @@ -63852,7 +63870,7 @@ qqh dWy wKW bMy -rVH +aan rVH rVH rVH diff --git a/modular_chomp/maps/southern_cross/southern_cross_defines.dm b/modular_chomp/maps/southern_cross/southern_cross_defines.dm index e622451cdb..43d33593d3 100644 --- a/modular_chomp/maps/southern_cross/southern_cross_defines.dm +++ b/modular_chomp/maps/southern_cross/southern_cross_defines.dm @@ -105,7 +105,7 @@ but they don't actually change anything about the load order NETWORK_SUPPLY ) usable_email_tlds = list("freemail.nt") - allowed_spawns = list("Arrivals Shuttle","Gateway", "Cryogenic Storage", "Cyborg Storage", "Station gateway", "Sif plains", "Fuel Depot", "Tyr Wreckage") + allowed_spawns = list("Arrivals Shuttle","Gateway", "Cryogenic Storage", "Cyborg Storage", "Station gateway", "Sif plains", "Fuel Depot", "Tyr Wreckage", "The Dark") default_skybox = /datum/skybox_settings/southern_cross unit_test_exempt_areas = list(/area/ninja_dojo, /area/shuttle/ninja) unit_test_exempt_from_atmos = list(/area/tcomm/chamber)