cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2025-12-09 21:53:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

POI's to Rift, Bug Fixes, and more! (#4482)

Browse Source 
* Touching stuff, yay

* Submaps seeding now functional

* Why arent largecrates subtypes of crates

* Minor changes

* Added Random crystals and directional APCs

I refuse to manually var edit alarms_hidden apcs. Went ahead and added directional bump versions of all the other ones too

* Fixed Icon_state for window spawners

* Fiddling with POI's

* Fine then, no air alarms in this POI.

* Added in placeholder submaps to make datums happy

* Cleaned up some stuff and move a few things
This commit is contained in:
KT
2022-10-05 03:11:07 -04:00
committed by GitHub
parent b7f3578cfc
commit 8048c004b5
30 changed files with 66338 additions and 64300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
maps/rift/rift_defines.dm
View File

@@ -7,8 +7,8 @@
#define Z_LEVEL_SURFACE_HIGH 7
#define Z_LEVEL_WEST_BASE 8
#define Z_LEVEL_WEST_CAVERN 9
#define Z_LEVEL_WEST_DEEP 10
#define Z_LEVEL_WEST_DEEP 9
#define Z_LEVEL_WEST_CAVERN 10
#define Z_LEVEL_WEST_PLAIN 11
#define Z_LEVEL_MISC 12
@@ -172,6 +172,7 @@
lateload_z_levels = list(
// list("Rift - Misc"), // Stock Rift lateload maps || Currently not in use, takes too long to load, breaks shuttles.
// list("Western Canyon","Western Deep Caves","Western Caves","Western Plains"), ///Integration Test says these arent valid maps but everything works, will leave in for now but this prolly isnt needed -Bloop
list("Debris Field - Z1 Space"), // Debris Field
list("Away Mission - Pirate Base"), // Vox Pirate Base & Mining Planet
list("ExoPlanet - Z1 Planet"),//Mining planet
@@ -211,13 +212,6 @@
/datum/planet/classp,
/datum/planet/classm)
/datum/map/rift/perform_map_generation()
new /datum/random_map/automata/cave_system/no_cracks/rift(null, 1, 1, Z_LEVEL_WEST_CAVERN, world.maxx - 4, world.maxy - 4) // Create the mining ore distribution map.
new /datum/random_map/automata/cave_system/no_cracks/rift(null, 1, 1, Z_LEVEL_WEST_DEEP, world.maxx - 4, world.maxy - 4) // Create the mining ore distribution map.
new /datum/random_map/automata/cave_system/no_cracks/rift(null, 1, 1, Z_LEVEL_WEST_BASE, world.maxx - 4, world.maxy - 4) // Create the mining ore distribution map.
new /datum/random_map/automata/cave_system/no_cracks/rift(null, 1, 1, Z_LEVEL_UNDERGROUND_FLOOR, world.maxx - 4, world.maxy - 4) // Create the mining ore distribution map.
return 1
/*
// For making the 6-in-1 holomap, we calculate some offsets
@@ -287,19 +281,38 @@
flags = MAP_LEVEL_STATION|MAP_LEVEL_PLAYER
base_turf = /turf/simulated/mineral/floor/icerock/lythios43c/indoors
/datum/map_z_level/rift/caves
z = Z_LEVEL_WEST_CAVERN
name = "Western Caves"
flags = MAP_LEVEL_STATION|MAP_LEVEL_PLAYER
base_turf = /turf/simulated/mineral/floor/icerock/lythios43c/indoors
/datum/map_z_level/rift/plains
z = Z_LEVEL_WEST_PLAIN
name = "Western Plains"
flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER
base_turf = /turf/simulated/floor/outdoors/safeice/lythios43c
/// Cave Generation
/datum/map/rift/perform_map_generation()
. = ..()
seed_submaps(list(Z_LEVEL_WEST_CAVERN), 50, /area/rift/surfacebase/outside/west_caves/submap_seedzone, /datum/map_template/submap/level_specific/rift/west_caves)
seed_submaps(list(Z_LEVEL_WEST_DEEP), 50, /area/rift/surfacebase/outside/west_deep/submap_seedzone, /datum/map_template/submap/level_specific/rift/west_deep)
seed_submaps(list(Z_LEVEL_WEST_BASE), 50, /area/rift/surfacebase/outside/west_base/submap_seedzone, /datum/map_template/submap/level_specific/rift/west_base)
new /datum/random_map/automata/cave_system/no_cracks/rift(null, 3, 3, Z_LEVEL_WEST_CAVERN, world.maxx - 3, world.maxy - 3) // Create the mining ore distribution map.
new /datum/random_map/automata/cave_system/no_cracks/rift(null, 3, 3, Z_LEVEL_WEST_DEEP, world.maxx - 3, world.maxy - 3) // Create the mining ore distribution map.
new /datum/random_map/automata/cave_system/no_cracks/rift(null, 3, 3, Z_LEVEL_WEST_BASE, world.maxx - 3, world.maxy - 3) // Create the mining ore distribution map.
new /datum/random_map/automata/cave_system/no_cracks/rift(null, 3, 3, Z_LEVEL_UNDERGROUND_FLOOR, world.maxx - 3, world.maxy - 3) // Create the mining ore distribution map.
return 1
/datum/map_z_level/rift/colony
z = Z_LEVEL_MISC
name = "Orbital Relay"
flags = MAP_LEVEL_ADMIN|MAP_LEVEL_CONTACT|MAP_LEVEL_XENOARCH_EXEMPT

12
maps/rift/rift_turfs.dm
View File

@@ -42,6 +42,15 @@ LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/shuttle/floor/voidcraft)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/mineral/icerock)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/mineral/icerock/floor)
LYTHIOS43C_TURF_CREATE_UN(/turf/unsimulated/mineral/icerock)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/mineral/ignore_cavegen)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/mineral/floor/ignore_cavegen)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/mineral/floor/icerock)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/mineral/icerock/ignore_cavegen)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/mineral/icerock/floor/ignore_cavegen)
/turf/simulated/mineral/icerock/ignore_cavegen/lythios43c
baseturfs = /turf/simulated/mineral/icerock/floor/ignore_cavegen/lythios43c
/turf/simulated/floor/outdoors/snow/lythios43c
baseturfs = /turf/simulated/floor/outdoors/safeice/lythios43c
@@ -57,6 +66,9 @@ LYTHIOS43C_TURF_CREATE_UN(/turf/unsimulated/mineral/icerock)
/turf/simulated/mineral/floor/icerock/lythios43c/indoors
outdoors = FALSE
/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen // I hate having to make such a long typepath for this, very annyoing -Bloop
ignore_cavegen = TRUE
/turf/simulated/floor/lythios43c/indoors
outdoors = FALSE

34
maps/rift/submaps/_rift_submaps.dm
View File

@@ -13,13 +13,32 @@
name = "Misc"
flags = MAP_LEVEL_ADMIN|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_XENOARCH_EXEMPT
//Use this template to update the Western Z when POIs are created for it.
/datum/map_template/rift_lateload/lavaland/on_map_loaded(z)
. = ..()
seed_submaps(list(Z_LEVEL_LAVALAND), 40, /area/lavaland/central/unexplored, /datum/map_template/submap/level_specific/lavaland)
new /datum/random_map/noise/ore/lavaland(null, 1, 1, Z_LEVEL_LAVALAND, 64, 64) // Create the mining ore distribution map.
new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_LAVALAND, world.maxx - 4, world.maxy - 4) // Create the lavaland Z-level.
*/
/datum/map_template/rift_lateload
allow_duplicates = FALSE
var/associated_map_datum
/datum/map_template/rift_lateload/on_map_loaded(z)
if(!associated_map_datum || !ispath(associated_map_datum))
log_game("Extra z-level [src] has no associated map datum")
return
new associated_map_datum(GLOB.using_map, z)
/datum/map_z_level/rift_lateload
z = 0
flags = MAP_LEVEL_SEALED
/datum/map_z_level/rift_lateload/New(var/datum/map/map, mapZ)
if(mapZ && !z)
z = mapZ
return ..(map)
//////////////////////////////////////////////////////////////////////////////
/// Away Missions
@@ -260,6 +279,8 @@
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////
// Code Shenanigans for rift lateload maps
/* // Move to the top for organzation sake
/datum/map_template/rift_lateload
allow_duplicates = FALSE
var/associated_map_datum
@@ -279,6 +300,7 @@
if(mapZ && !z)
z = mapZ
return ..(map)
*/
/turf/unsimulated/wall/seperator //to block vision between transit zones
name = ""