cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 03:27:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10235 from Enzo-Leon/asteroid

Browse Source 
[Ready for final reviews] Tether Asteroid Remodel - Asteroid Converted to 1 Z-Level
This commit is contained in:
Novacat
2021-05-22 15:33:06 -04:00
committed by GitHub
parent fb56cd4573 c33ddd7fe2
commit 45e710fa51
9 changed files with 32664 additions and 107018 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/tether/tether-02-surface2.dmm
+1791 -2334
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-03-surface3.dmm
+12 -3
View File
@@ -430,6 +430,7 @@
},
/obj/structure/closet/secure_closet/medical3,
/obj/item/weapon/soap/nanotrasen,
/obj/item/weapon/storage/belt/medical,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/storage)
"aaK" = (
@@ -450,6 +451,7 @@
/obj/effect/floor_decal/corner/paleblue/border{
dir = 4
},
/obj/item/weapon/storage/belt/medical,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/storage)
"aaL" = (
@@ -578,6 +580,7 @@
},
/obj/structure/closet/secure_closet/medical3,
/obj/item/weapon/soap/nanotrasen,
/obj/item/weapon/storage/belt/medical,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/storage)
"aaU" = (
@@ -948,6 +951,7 @@
/obj/machinery/camera/network/medbay{
dir = 8
},
/obj/item/weapon/storage/belt/medical,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/storage)
"abv" = (
@@ -3745,7 +3749,7 @@
/area/tether/surfacebase/security/upperhall)
"afx" = (
/obj/machinery/door/airlock/medical{
name = "Operating Theatre 2";
name = "Operating Theatre 1";
req_access = list(45)
},
/obj/machinery/door/firedoor/glass,
@@ -3767,7 +3771,7 @@
/obj/machinery/door/firedoor/glass,
/obj/structure/grille,
/obj/structure/window/reinforced/polarized/full{
id = "surfsurgery2"
id = "surfsurgery1"
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/medical/surgery1)
@@ -3790,7 +3794,7 @@
pixel_y = -22
},
/obj/machinery/button/windowtint{
id = "surfsurgery2";
id = "surfsurgery1";
pixel_x = -3;
pixel_y = -22
},
@@ -26613,6 +26617,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/structure/closet/secure_closet/medical3,
/obj/item/weapon/soap/nanotrasen,
/obj/item/weapon/storage/belt/medical,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/storage)
"aTq" = (
@@ -27303,6 +27308,7 @@
},
/obj/structure/closet/secure_closet/medical3,
/obj/item/weapon/soap/nanotrasen,
/obj/item/weapon/storage/belt/medical,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/storage)
"aUB" = (
@@ -30060,6 +30066,9 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
/obj/item/weapon/disk/nuclear{
name = "authentication disk"
},
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"aZn" = (
maps/tether/tether-05-station1.dmm
+30829 -18755
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-06-station2.dmm
-40796
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-07-station3.dmm
-45063
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether.dm
-2
View File
@@ -16,8 +16,6 @@
#include "tether-03-surface3.dmm"
#include "tether-04-transit.dmm"
#include "tether-05-station1.dmm"
#include "tether-06-station2.dmm"
#include "tether-07-station3.dmm"
#include "tether-08-mining.dmm"
#include "tether-09-solars.dmm"
#endif
maps/tether/tether_areas.dm
+9 -18
View File
@@ -46,32 +46,20 @@
/area/turbolift/t_surface/level2
name = "surface (level 2)"
lift_floor_label = "Surface 2"
lift_floor_name = "Atmos, Chapel, Maintenance"
lift_floor_name = "Atmos, Chapel, Maintenance, AI"
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 = "Bridge, Science, Bar, Pool, Medical, Security"
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_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_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."
name = "asteroid station"
lift_floor_label = "Asteroid"
lift_floor_name = "Eng, Cryo, Docks, Cargo, Explo, T-comms, EVA, Gateway"
lift_announce_str = "Arriving at Asteroid Station Level."
/area/vacant/vacant_restaurant_upper
name = "\improper Vacant Restaurant"
@@ -959,6 +947,9 @@
/area/tether/station/dock_two
name = "\improper Dock Two"
icon_state = "dk_yellow"
/area/tether/station/dock_three
name = "\improper Dock Three"
icon_state = "dk_yellow"
/area/maintenance/station/abandonedholodeck
name = "\improper Old Holodeck"
maps/tether/tether_defines.dm
+20 -42
View File
@@ -4,24 +4,22 @@
#define Z_LEVEL_SURFACE_HIGH 3
#define Z_LEVEL_TRANSIT 4
#define Z_LEVEL_SPACE_LOW 5
#define Z_LEVEL_SPACE_MID 6
#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 14
#define Z_LEVEL_ROGUEMINE_2 15
#define Z_LEVEL_BEACH 16
#define Z_LEVEL_BEACH_CAVE 17
#define Z_LEVEL_AEROSTAT 18
#define Z_LEVEL_AEROSTAT_SURFACE 19
#define Z_LEVEL_DEBRISFIELD 20
#define Z_LEVEL_FUELDEPOT 21
#define Z_LEVEL_GATEWAY 22
#define Z_LEVEL_SURFACE_MINE 6
#define Z_LEVEL_SOLARS 7
#define Z_LEVEL_MISC 8
#define Z_LEVEL_UNDERDARK 9
#define Z_LEVEL_PLAINS 10
#define Z_LEVEL_OFFMAP1 11
//#define Z_LEVEL_OFFMAP2 12
#define Z_LEVEL_ROGUEMINE_1 12
#define Z_LEVEL_ROGUEMINE_2 13
#define Z_LEVEL_BEACH 14
#define Z_LEVEL_BEACH_CAVE 15
#define Z_LEVEL_AEROSTAT 16
#define Z_LEVEL_AEROSTAT_SURFACE 17
#define Z_LEVEL_DEBRISFIELD 18
#define Z_LEVEL_FUELDEPOT 19
#define Z_LEVEL_GATEWAY 20
//Camera networks
#define NETWORK_TETHER "Tether"
@@ -64,9 +62,7 @@
Z_LEVEL_SURFACE_LOW,
Z_LEVEL_SURFACE_MID,
Z_LEVEL_SURFACE_HIGH,
Z_LEVEL_SPACE_LOW,
Z_LEVEL_SPACE_MID,
Z_LEVEL_SPACE_HIGH))
Z_LEVEL_SPACE_LOW))
station_name = "NSB Adephagia"
station_short = "Tether"
@@ -176,20 +172,18 @@
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,
Z_LEVEL_MISC,
Z_LEVEL_BEACH
)
belter_docked_z = list(Z_LEVEL_SPACE_HIGH)
belter_docked_z = list(Z_LEVEL_SPACE_LOW)
belter_transit_z = list(Z_LEVEL_MISC)
belter_belt_z = list(Z_LEVEL_ROGUEMINE_1,
Z_LEVEL_ROGUEMINE_2)
mining_station_z = list(Z_LEVEL_SPACE_HIGH)
mining_station_z = list(Z_LEVEL_SPACE_LOW)
mining_outpost_z = list(Z_LEVEL_SURFACE_MINE)
lateload_single_pick = null //Nothing right now.
@@ -276,7 +270,7 @@
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)
/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."
@@ -340,22 +334,6 @@
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"
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*2
/datum/map_z_level/tether/mine
z = Z_LEVEL_SURFACE_MINE
name = "Mining Outpost"
maps/tether/tether_things.dm
+3 -5
View File
@@ -1,10 +1,10 @@
//Special map objects
/obj/effect/landmark/map_data/virgo3b
height = 7
height = 5
/obj/turbolift_map_holder/tether
name = "Tether Climber"
depth = 7
depth = 5
lift_size_x = 3
lift_size_y = 3
icon = 'icons/obj/turbolift_preview_3x3.dmi'
@@ -15,9 +15,7 @@
/area/turbolift/t_surface/level2,
/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/level1
)
/datum/turbolift