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-10 23:11:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Underground Weather, adds mining outpost, tweaks that weird mining elevator on station, touches ALL the rocks (#4422)

Browse Source 
* First Commit to branch lets goooo.

* Fixes integration issue, adds stairs

* Undo changes to surface1

As to not conflict with Virology Pr

* Fixed wires for mining outpost, removed stairs

Removing the stairs going alongside the mining elevator as per Blue's request

* Added in place holder elevator on west rift

* Placeholder Elevators, Snakeeater Ladders

* Alright not as easy as I thought it'd be

* Fixed Ladder

* Here comes the ROCKS for Surface1
This commit is contained in:
KT
2022-09-20 19:59:51 -04:00
committed by GitHub
parent 47ecbff98d
commit 85f24de776
30 changed files with 47317 additions and 41143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
maps/rift/rift_areas.dm
View File

@@ -11,7 +11,7 @@
requires_power = 0
// Elevator areas.
/area/turbolift
/area/turbolift //Why are we editing the base turbolift here instead of making a new child like area/turbolift/rift/---- ?
delay_time = 1 SECONDS
dynamic_lighting = FALSE //Temporary fix for elevator lighting
@@ -69,6 +69,31 @@
lift_floor_label = "Undergound Level 3"
lift_floor_name = "Mining Bottom"
lift_announce_str = "Arriving at Lower Level."
delay_time = 15 SECONDS
/area/turbolift/rwest_mining/surface
name = "mining shaft (surface)"
lift_floor_label = "Surface"
lift_floor_name = "Cargo"
lift_announce_str = "Arriving at Cargo Level."
/area/turbolift/rwest_mining/caves
name = "mining shaft (surface)"
lift_floor_label = "Surface"
lift_floor_name = "Cargo"
lift_announce_str = "Arriving at Cargo Level."
/area/turbolift/rwest_mining/deep
name = "mining shaft (surface)"
lift_floor_label = "Surface"
lift_floor_name = "Cargo"
lift_announce_str = "Arriving at Cargo Level."
/area/turbolift/rwest_mining/base
name = "mining shaft (surface)"
lift_floor_label = "Surface"
lift_floor_name = "Cargo"
lift_announce_str = "Arriving at Cargo Level."
/*

23
maps/rift/rift_areas2.dm
View File

@@ -247,6 +247,12 @@
/area/outpost/mining_main/passage
name = "\improper Mining Outpost Passage"
/area/outpost/mining_main/outpost
name = "\improper Mining Outpost"
/area/outpost/mining_main/outpost/substation
name = "\improper Outpost Substation"
// Solars map areas
/area/tether/outpost/solars_outside
name = "\improper Solar Farm"
@@ -713,18 +719,35 @@ Do this eventually. */
name = "Western Plains Surface"
icon_state = "green"
/area/rift/surfacebase/outside/west/submap_seedzone
name = "Western Plains Surface"
icon_state = "green"
/area/rift/surfacebase/outside/west_caves
name = "Western Plains Caverns"
icon_state = "red"
/area/rift/surfacebase/outside/west_caves/submap_seedzone
name = "Western Plains Caverns"
icon_state = "red"
/area/rift/surfacebase/outside/west_deep
name = "Western Plains Deep Ice"
icon_state = "yellow"
/area/rift/surfacebase/outside/west_deep/submap_seedzone
name = "Western Plains Deep Ice"
icon_state = "yellow"
/area/rift/surfacebase/outside/west_base
name = "Western Plains Canyon"
icon_state = "blue"
/area/rift/surfacebase/outside/west_base/submap_seedzone
name = "Western Plains Canyon"
icon_state = "blue"
//Trade Pad/Shop
/area/rift/trade_shop
name = "\improper Trade Shop"

19
maps/rift/rift_defines.dm
View File

@@ -37,6 +37,9 @@
usable_email_tlds = list("lythios.nt")
zlevel_datum_type = /datum/map_z_level/rift
base_turf_by_z = list(Z_LEVEL_WEST_BASE,
Z_LEVEL_WEST_DEEP,
Z_LEVEL_WEST_CAVERN)
lobby_icon = 'icons/misc/title_vr.dmi'
lobby_screens = list("title1", "title2", "title3", "title4", "title5", "title6", "title7", "title8", "bnny")
@@ -198,10 +201,10 @@
/datum/planet/classm)
/datum/map/rift/perform_map_generation()
new /datum/random_map/automata/cave_system/no_cracks(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(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(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(null, 1, 1, Z_LEVEL_UNDERGROUND_FLOOR, 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_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
@@ -265,25 +268,25 @@
z = Z_LEVEL_WEST_BASE
name = "Western Canyon"
flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER
base_turf = /turf/simulated/floor/outdoors/safeice/lythios43c/indoors
base_turf = /turf/simulated/mineral/floor/icerock/lythios43c/indoors
/datum/map_z_level/rift/deep
z = Z_LEVEL_WEST_DEEP
name = "Western Deep Caves"
flags = MAP_LEVEL_STATION|MAP_LEVEL_PLAYER
base_turf = /turf/simulated/open
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/floor/outdoors/safeice/lythios43c/indoors
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/open
base_turf = /turf/simulated/floor/outdoors/safeice/lythios43c
/datum/map_z_level/rift/colony
z = Z_LEVEL_MISC

74
maps/rift/rift_turfs.dm
View File

@@ -9,35 +9,44 @@ LYTHIOS43C_TURF_CREATE(/turf/simulated/open)
SSplanets.addTurf(src)
LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/plating)
LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/plasteel)
LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/reinforced)
LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/tiled/steel_dirty)
LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/tiled/steel_grid)
LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/tiled/techfloor/grid)
LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/tiled/techfloor)
LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/outdoors/dirt)
LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/outdoors/rocks)
LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/outdoors/gravsnow)
LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/outdoors/snow)
LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/sky/depths)
LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/sky/depths/west)
LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/outdoors/safeice)
//These commands generate turfs that are default indoors
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/floor/tiled)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/floor/trap/wood)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/floor/trap/plating)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/floor/trap/steel)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/floor/tiled/monotile)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/floor/tiled/steel)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/floor/water/deep/indoors)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/floor/water/indoors)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/floor/bluegrid)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/floor/carpet)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/floor/carpet/bcarpet)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/floor/carpet/arcadecarpet)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/wall)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/floor/wood)
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)
/turf/simulated/floor/outdoors/snow/lythios43c
baseturfs = /turf/simulated/floor/outdoors/safeice/lythios43c
LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/outdoors/safeice)
/// Indoor Variants (Cause we need em). It bugs me that outdoor varients are the default but what can you do -Bloop
/turf/simulated/floor/outdoors/safeice/indoors
outdoors = FALSE /* So that we don't get weather effects for the ice used indoors. Convuluted, I know, but this
means I don't need another, almost identical turf to be created. */
@@ -45,6 +54,37 @@ LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/outdoors/safeice)
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors
outdoors = FALSE
/turf/simulated/mineral/floor/icerock/lythios43c/indoors
outdoors = FALSE
/turf/simulated/floor/lythios43c/indoors
outdoors = FALSE
/turf/simulated/floor/outdoors/dirt/lythios43c/indoors
outdoors = FALSE
/turf/simulated/floor/outdoors/rocks/lythios43c/indoors
outdoors = FALSE
/turf/simulated/floor/outdoors/snow/lythios43c/indoors
outdoors = FALSE
/turf/simulated/floor/outdoors/gravsnow/lythios43c/indoors
outdoors = FALSE
/turf/simulated/mineral/floor/lythios43c/indoors
outdoors = FALSE
/turf/simulated/floor/plating/indoors
outdoors = FALSE
/turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors
outdoors = FALSE
/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors
outdoors = FALSE
/turf/simulated/mineral/icerock
initial_gas_mix = GAS_STRING_STP
@@ -57,14 +97,15 @@ LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/outdoors/safeice)
/turf/simulated/mineral/floor/vacuum
initial_gas_mix = GAS_STRING_VACUUM
LYTHIOS43C_TURF_CREATE(/turf/simulated/mineral/icerock)
LYTHIOS43C_TURF_CREATE(/turf/simulated/mineral/icerock/floor)
LYTHIOS43C_TURF_CREATE(/turf/unsimulated/mineral/icerock)
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)
//This proc is responsible for ore generation on surface turfs
/turf/simulated/mineral/icerock/lythios43c/make_ore(var/rare_ore)
if(mineral || ignore_mapgen)
return
var/mineral_name
outdoors = FALSE
if(rare_ore)
mineral_name = pickweight(list(
"marble" = 3,
@@ -98,6 +139,7 @@ LYTHIOS43C_TURF_CREATE(/turf/unsimulated/mineral/icerock)
if(mineral || ignore_mapgen)
return
var/mineral_name
outdoors = FALSE
if(rare_ore)
mineral_name = pickweight(list(
"marble" = 7,