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 03:36:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consolidates Asteroid into 2 Z Levels (#3269)

Browse Source 
* Map consolidation phase one.

* I don't know why, but VSC is forcing me to commit these files, and will not acknowledge that I've not changed them.

* It's doing it again?

* Quick lighting and cosmetic fixes.

* Missed a pair of parens.

* Fixes multiple bugs, and renames Tether Lift areas.

* Adjusts wiring layout oversights.

* Removes spawn points ahead of full wipe.

* Pipe adjustment

* Delete tether_underdark.dmm

* Delete tether_misc.dmm

* Delete tether-09-solars.dmm

* Delete tether-08-mining.dmm

* Fixes Space Turf bug, adjusts wiring and pipes.

* Piping adjustments. Incomplete.

* Disposals and Mail pipenet repairs. Complete.

* Bartender Equip and Grav Gen Door Alignment

* Adds cameras to some new areas.

* Disables Z7 and Fixes Pipe Network

* Deletes Z7 and Partially Updates NanoUI Maps

* Updates relevant .dms to remove references to Station 3.

* Level 2 Area Corrections.

* Elevator fix, active turf fix.

* JASON!

* Corrects Area bug affecting Linter.

* Mech Air Ports. Last tweak.

* Tweak to Mining to test.

* Repairs strange offset bug, hopefully.

* Attaches a power cable.

* Fixes PF Area issue.

* The for real final update. Almost forgot this.
This commit is contained in:
Captain277
2021-07-23 01:46:05 -07:00
committed by GitHub
parent 5f38c227bb
commit 4045b6277e
17 changed files with 44180 additions and 83848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
maps/tether/tether.dm
View File

@@ -15,7 +15,6 @@
#include "../../_maps/map_files/tether/tether-04-transit.dmm"
#include "../../_maps/map_files/tether/tether-05-station1.dmm"
#include "../../_maps/map_files/tether/tether-06-station2.dmm"
#include "../../_maps/map_files/tether/tether-07-station3.dmm"
#include "../../_maps/map_files/tether/tether-08-mining.dmm"
#include "../../_maps/map_files/tether/tether-09-solars.dmm"

18
maps/tether/tether_areas.dm
View File

@@ -46,33 +46,27 @@
/area/turbolift/t_surface/level2
name = "surface (level 2)"
lift_floor_label = "Surface 2"
lift_floor_name = "Atmos, Chapel, Maintenance"
lift_floor_name = "Atmos, Maintenance"
lift_announce_str = "Arriving at Base Level 2."
/area/turbolift/t_surface/level3
name = "surface (level 3)"
lift_floor_label = "Surface 3"
lift_floor_name = "Bridge, Science, Bar, Pool"
lift_floor_name = "Bar, Bridge, Pool, Science"
lift_announce_str = "Arriving at Base Level 3."
/area/turbolift/t_station/level1
name = "asteroid (level 1)"
lift_floor_label = "Asteroid 1"
lift_floor_name = "Eng, Secondary Bridge, Park, Cryo, Visitor Offices"
lift_floor_name = "AI Core, Eng, Exploration, Secondary Bridge"
lift_announce_str = "Arriving at Station Level 1."
/area/turbolift/t_station/level2
name = "asteroid (level 2)"
lift_floor_label = "Asteroid 2"
lift_floor_name = "Exploration, AI Core, EVA Gear"
lift_floor_name = "Chapel, Cargo, EVA, Gateway"
lift_announce_str = "Arriving at Station Level 2."
/area/turbolift/t_station/level3
name = "asteroid (level 3)"
lift_floor_label = "Asteroid 3"
lift_floor_name = "Medical, Security, Cargo"
lift_announce_str = "Arriving at Station Level 3."
/area/vacant/vacant_restaurant_upper
name = "\improper Vacant Restaurant"
icon_state = "vacant_site"
@@ -1222,7 +1216,9 @@
/area/security/recstorage
name = "\improper Brig Recreation Storage"
icon_state = "brig"
/area/security/customs
name = "\improper Security Customs Checkpoint"
icon_state = "security"
/area/engineering/atmos/backup
name = "\improper Backup Atmospherics"
/area/engineering/engine_balcony

57
maps/tether/tether_defines.dm
View File

@@ -4,24 +4,23 @@
#define Z_LEVEL_SURFACE_HIGH 4
#define Z_LEVEL_TRANSIT 5
#define Z_LEVEL_SPACE_LOW 6
#define Z_LEVEL_SPACE_MID 7
#define Z_LEVEL_SPACE_HIGH 8
#define Z_LEVEL_SURFACE_MINE 9
#define Z_LEVEL_SOLARS 10
#define Z_LEVEL_MISC 11
#define Z_LEVEL_UNDERDARK 12
#define Z_LEVEL_PLAINS 13
#define Z_LEVEL_OFFMAP1 14
#define Z_LEVEL_OFFMAP2 15
#define Z_LEVEL_ROGUEMINE_1 16
#define Z_LEVEL_ROGUEMINE_2 17
#define Z_LEVEL_BEACH 18
#define Z_LEVEL_BEACH_CAVE 19
#define Z_LEVEL_AEROSTAT 20
#define Z_LEVEL_AEROSTAT_SURFACE 21
#define Z_LEVEL_DEBRISFIELD 22
#define Z_LEVEL_FUELDEPOT 23
#define Z_LEVEL_GATEWAY 24
#define Z_LEVEL_SPACE_HIGH 7
#define Z_LEVEL_SURFACE_MINE 8
#define Z_LEVEL_SOLARS 9
#define Z_LEVEL_MISC 10
#define Z_LEVEL_UNDERDARK 11
#define Z_LEVEL_PLAINS 12
#define Z_LEVEL_OFFMAP1 13
#define Z_LEVEL_OFFMAP2 14
#define Z_LEVEL_ROGUEMINE_1 15
#define Z_LEVEL_ROGUEMINE_2 16
#define Z_LEVEL_BEACH 17
#define Z_LEVEL_BEACH_CAVE 18
#define Z_LEVEL_AEROSTAT 19
#define Z_LEVEL_AEROSTAT_SURFACE 20
#define Z_LEVEL_DEBRISFIELD 21
#define Z_LEVEL_FUELDEPOT 22
#define Z_LEVEL_GATEWAY 23
//Camera networks
#define NETWORK_TETHER "Tether"
@@ -65,7 +64,6 @@
Z_LEVEL_SURFACE_MID,
Z_LEVEL_SURFACE_HIGH,
Z_LEVEL_SPACE_LOW,
Z_LEVEL_SPACE_MID,
Z_LEVEL_SPACE_HIGH))
station_name = "NSB Adephagia"
@@ -176,7 +174,6 @@
Z_LEVEL_SURFACE_HIGH,
Z_LEVEL_TRANSIT,
Z_LEVEL_SPACE_LOW,
Z_LEVEL_SPACE_MID,
Z_LEVEL_SPACE_HIGH,
Z_LEVEL_SURFACE_MINE,
Z_LEVEL_SOLARS,
@@ -240,7 +237,7 @@
"tether_dockarm_d2l", //End of right arm,
"tether_space_SE", //station1, bottom right of space,
"tether_space_NE", //station1, top right of space,
"tether_space_SW", //station3, bottom left of space,
"tether_space_SW", //station2, bottom left of space,
"tether_excursion_hangar", //Excursion shuttle hangar,
"tether_medivac_dock", //Medical shuttle dock,
"tourbus_dock" //Surface large hangar
@@ -368,7 +365,7 @@ Allignment: Neutral to NanoTrasen. No Discount for services expected."}
announce_atc(AM,going = TRUE)
/obj/effect/overmap/visitable/sector/virgo3b/get_space_zlevels()
return list(Z_LEVEL_SPACE_LOW, Z_LEVEL_SPACE_MID, Z_LEVEL_SPACE_HIGH)
return list(Z_LEVEL_SPACE_LOW, Z_LEVEL_SPACE_HIGH)
/obj/effect/overmap/visitable/sector/virgo3b/proc/announce_atc(var/atom/movable/AM, var/going = FALSE)
var/message = "Sensor contact for vessel '[AM.name]' has [going ? "left" : "entered"] ATC control area."
@@ -428,25 +425,17 @@ Allignment: Neutral to NanoTrasen. No Discount for services expected."}
z = Z_LEVEL_SPACE_LOW
name = "Asteroid 1"
base_turf = /turf/space
transit_chance = 33
transit_chance = 50
holomap_offset_x = HOLOMAP_ICON_SIZE - TETHER_HOLOMAP_MARGIN_X - TETHER_MAP_SIZE
holomap_offset_y = TETHER_HOLOMAP_MARGIN_Y + TETHER_MAP_SIZE*0
/datum/map_z_level/tether/station/space_mid
z = Z_LEVEL_SPACE_MID
name = "Asteroid 2"
base_turf = /turf/simulated/open
transit_chance = 33
holomap_offset_x = HOLOMAP_ICON_SIZE - TETHER_HOLOMAP_MARGIN_X - TETHER_MAP_SIZE
holomap_offset_y = TETHER_HOLOMAP_MARGIN_Y + TETHER_MAP_SIZE*1
/datum/map_z_level/tether/station/space_high
z = Z_LEVEL_SPACE_HIGH
name = "Asteroid 3"
name = "Asteroid 2"
base_turf = /turf/simulated/open
transit_chance = 33
transit_chance = 50
holomap_offset_x = HOLOMAP_ICON_SIZE - TETHER_HOLOMAP_MARGIN_X - TETHER_MAP_SIZE
holomap_offset_y = TETHER_HOLOMAP_MARGIN_Y + TETHER_MAP_SIZE*2
holomap_offset_y = TETHER_HOLOMAP_MARGIN_Y + TETHER_MAP_SIZE*1
/datum/map_z_level/tether/mine
z = Z_LEVEL_SURFACE_MINE

7
maps/tether/tether_things.dm
View File

@@ -1,10 +1,10 @@
//Special map objects
/obj/effect/landmark/map_data/virgo3b
height = 7
height = 6
/obj/turbolift_map_holder/tether
name = "Tether Climber"
depth = 7
depth = 6
lift_size_x = 3
lift_size_y = 3
icon = 'icons/obj/turbolift_preview_3x3.dmi'
@@ -16,8 +16,7 @@
/area/turbolift/t_surface/level3,
/area/turbolift/tether/transit,
/area/turbolift/t_station/level1,
/area/turbolift/t_station/level2,
/area/turbolift/t_station/level3
/area/turbolift/t_station/level2
)
/datum/turbolift