mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-21 20:14:31 +01:00
Casey
@@ -121,6 +121,7 @@
|
||||
var/old_icon1 = T.icon
|
||||
var/old_decals = T.decals ? T.decals.Copy() : null
|
||||
|
||||
B.Destroy()
|
||||
X = B.ChangeTurf(T.type)
|
||||
X.set_dir(old_dir1)
|
||||
X.icon_state = old_icon_state1
|
||||
|
||||
@@ -103,7 +103,7 @@ var/global/ntnet_card_uid = 1
|
||||
var/holderz = get_z(holder2)
|
||||
if(!holderz) //no reception in nullspace
|
||||
return 0
|
||||
var/list/zlevels_in_range = using_map.get_map_levels(holderz, FALSE)
|
||||
var/list/zlevels_in_range = using_map.get_map_levels(holderz, FALSE)// VOREStation Edit - , om_range = DEFAULT_OVERMAP_RANGE)
|
||||
var/list/zlevels_in_long_range = using_map.get_map_levels(holderz, TRUE, om_range = DEFAULT_OVERMAP_RANGE) - zlevels_in_range
|
||||
var/best = 0
|
||||
for(var/obj/machinery/ntnet_relay/R as anything in ntnet_global.relays)
|
||||
|
||||
@@ -199,11 +199,10 @@
|
||||
switch(status)
|
||||
if(SHIP_STATUS_LANDED)
|
||||
var/obj/effect/overmap/visitable/location = loc
|
||||
if(istype(loc, /obj/effect/overmap/visitable/sector))
|
||||
return "Landed on \the [location.name]. Use secondary thrust to get clear before activating primary engines."
|
||||
if(istype(loc, /obj/effect/overmap/visitable/ship))
|
||||
if(location.in_space)
|
||||
return "Docked with \the [location.name]. Use secondary thrust to get clear before activating primary engines."
|
||||
return "Docked with an unknown object."
|
||||
else
|
||||
return "Landed on \the [location.name]. Use secondary thrust to get clear before activating primary engines."
|
||||
if(SHIP_STATUS_TRANSIT)
|
||||
return "Maneuvering under secondary thrust."
|
||||
if(SHIP_STATUS_OVERMAP)
|
||||
|
||||
@@ -106,11 +106,16 @@
|
||||
|
||||
//lipstick wiping is in code/game/objects/items/weapons/cosmetics.dm!
|
||||
|
||||
/obj/item/weapon/paper/Initialize(mapload)
|
||||
. = ..()
|
||||
/obj/item/weapon/paper/Initialize(mapload, var/text, var/title)
|
||||
. = ..()
|
||||
|
||||
if(mapload) // Jank, but we do this to prevent maploaded papers from somehow stacking across rounds if re-added to the board by a player.
|
||||
was_maploaded = TRUE
|
||||
if(istext(title))
|
||||
name = title
|
||||
if(istext(text))
|
||||
info = text
|
||||
|
||||
if(mapload) // Jank, but we do this to prevent maploaded papers from somehow stacking across rounds if re-added to the board by a player.
|
||||
was_maploaded = TRUE
|
||||
|
||||
/obj/item/weapon/paper/New(var/newloc, var/text, var/title)
|
||||
..()
|
||||
|
||||
@@ -16534,6 +16534,9 @@
|
||||
/area/surface/station/hallway/primary/bmt/west/elevator)
|
||||
"Kc" = (
|
||||
/obj/structure/stairs/spawner/south,
|
||||
/obj/structure/railing{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/surface/station/medical/hallway/bmt)
|
||||
"Kd" = (
|
||||
@@ -19063,6 +19066,9 @@
|
||||
/turf/simulated/floor/plating,
|
||||
/area/surface/station/maintenance/incineratormaint)
|
||||
"Ph" = (
|
||||
/obj/structure/railing{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/surface/station/medical/hallway/bmt)
|
||||
"Pi" = (
|
||||
@@ -54513,7 +54519,7 @@ RQ
|
||||
RQ
|
||||
xW
|
||||
xW
|
||||
RQ
|
||||
xW
|
||||
RQ
|
||||
RQ
|
||||
RQ
|
||||
@@ -55025,7 +55031,7 @@ RQ
|
||||
RQ
|
||||
RQ
|
||||
RQ
|
||||
xW
|
||||
RQ
|
||||
xW
|
||||
xW
|
||||
xW
|
||||
@@ -56327,7 +56333,7 @@ RQ
|
||||
RQ
|
||||
RQ
|
||||
RQ
|
||||
RQ
|
||||
Kj
|
||||
Kj
|
||||
Kj
|
||||
Kj
|
||||
|
||||
@@ -2056,6 +2056,12 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/surface/station/ai/upload_foyer)
|
||||
"aZV" = (
|
||||
/obj/structure/railing{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/surface/station/engineering/hallway)
|
||||
"aZZ" = (
|
||||
/obj/machinery/portable_atmospherics/hydroponics,
|
||||
/obj/effect/floor_decal/borderfloorwhite/corner{
|
||||
@@ -6768,7 +6774,6 @@
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/window/reinforced,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/surface/station/engineering/hallway)
|
||||
"dfs" = (
|
||||
@@ -8592,7 +8597,6 @@
|
||||
/obj/machinery/camera/network/medbay{
|
||||
c_tag = "MED - Operating Theatre 2"
|
||||
},
|
||||
/obj/machinery/optable,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/surface/station/medical/surgery2)
|
||||
"ecL" = (
|
||||
@@ -14432,12 +14436,8 @@
|
||||
/area/surface/station/crew_quarters/heads/hop)
|
||||
"gEG" = (
|
||||
/obj/machinery/power/smes/buildable{
|
||||
<<<<<<< HEAD
|
||||
RCon_tag = "Solar - Northeast";
|
||||
=======
|
||||
RCon_tag = "Solar - West";
|
||||
cur_coils = 2;
|
||||
>>>>>>> 339281e2f8d... Merge pull request #8382 from PrismaticGynoid/mapfixes8
|
||||
input_attempt = 1;
|
||||
input_level = 300000;
|
||||
output_level = 200000
|
||||
@@ -21729,6 +21729,10 @@
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
d2 = 4;
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/machinery/power/sensor{
|
||||
name = "Powernet Sensor - Master Grid";
|
||||
name_tag = "Master"
|
||||
@@ -22531,6 +22535,9 @@
|
||||
/area/surface/station/medical/emt_bay)
|
||||
"kxM" = (
|
||||
/obj/structure/stairs/spawner/east,
|
||||
/obj/structure/railing{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/surface/station/engineering/hallway)
|
||||
"kyJ" = (
|
||||
@@ -25996,9 +26003,6 @@
|
||||
dir = 6
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals_central7,
|
||||
/obj/machinery/recharger/wallcharger{
|
||||
pixel_x = 32
|
||||
},
|
||||
/obj/structure/table/steel_reinforced,
|
||||
/obj/item/ammo_magazine/s45/practice,
|
||||
/obj/item/ammo_magazine/s45/practice,
|
||||
@@ -26015,6 +26019,12 @@
|
||||
/obj/item/ammo_magazine/m9mmt/practice,
|
||||
/obj/item/weapon/storage/box/blanks/large,
|
||||
/obj/item/weapon/storage/box/blanks/large,
|
||||
/obj/machinery/magnetic_controller{
|
||||
autolink = 1;
|
||||
density = 0;
|
||||
dir = 4;
|
||||
pixel_x = 30
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/surface/station/security/range)
|
||||
"maD" = (
|
||||
@@ -31500,6 +31510,10 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
/area/surface/station/medical/reception)
|
||||
"otX" = (
|
||||
/obj/machinery/optable,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/surface/station/medical/surgery2)
|
||||
"oub" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
@@ -37594,7 +37608,6 @@
|
||||
/obj/machinery/camera/network/medbay{
|
||||
c_tag = "MED - Operating Theatre 1"
|
||||
},
|
||||
/obj/machinery/optable,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/surface/station/medical/surgery)
|
||||
"qVW" = (
|
||||
@@ -39226,6 +39239,10 @@
|
||||
/obj/random/maintenance/clean,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/surface/station/maintenance/surgery)
|
||||
"rIW" = (
|
||||
/obj/machinery/optable,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/surface/station/medical/surgery)
|
||||
"rJl" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 10
|
||||
@@ -42586,6 +42603,10 @@
|
||||
/obj/machinery/recharger/wallcharger{
|
||||
pixel_x = 32
|
||||
},
|
||||
/obj/machinery/recharger/wallcharger{
|
||||
pixel_x = 32;
|
||||
pixel_y = -10
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/surface/station/security/range)
|
||||
"toQ" = (
|
||||
@@ -47994,7 +48015,6 @@
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/window/reinforced,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/surface/station/engineering/hallway)
|
||||
"vNz" = (
|
||||
@@ -86168,7 +86188,7 @@ dns
|
||||
red
|
||||
kBa
|
||||
kMw
|
||||
psC
|
||||
rIW
|
||||
lVJ
|
||||
ykd
|
||||
suW
|
||||
@@ -88738,7 +88758,7 @@ bBP
|
||||
vJx
|
||||
esD
|
||||
dRW
|
||||
ycR
|
||||
otX
|
||||
vVA
|
||||
uBt
|
||||
toG
|
||||
@@ -92132,7 +92152,7 @@ ekV
|
||||
eJU
|
||||
rxO
|
||||
dfk
|
||||
lsu
|
||||
aZV
|
||||
dlE
|
||||
sUN
|
||||
drL
|
||||
|
||||
@@ -8771,15 +8771,19 @@
|
||||
/turf/simulated/floor/tiled/techfloor/grid,
|
||||
/area/surface/station/ai_monitored/storage/eva)
|
||||
"fSH" = (
|
||||
/obj/machinery/computer/general_air_control/supermatter_core{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/corner/yellow/border{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/computer/general_air_control/supermatter_core{
|
||||
dir = 8;
|
||||
input_tag = "cooling_in";
|
||||
name = "Engine Cooling Control";
|
||||
output_tag = "cooling_out";
|
||||
sensors = list("engine_sensor" = "Engine Core")
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/surface/station/engineering/reactor_monitoring)
|
||||
"fTe" = (
|
||||
|
||||
@@ -1473,7 +1473,11 @@
|
||||
/obj/effect/floor_decal/techfloor/corner{
|
||||
dir = 5
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/turf/simulated/floor/tiled/techfloor{
|
||||
nitrogen = 100;
|
||||
oxygen = 0;
|
||||
temperature = 73
|
||||
},
|
||||
/area/tcommsat/cynosure/chamber)
|
||||
"pq" = (
|
||||
/obj/structure/cable/yellow,
|
||||
@@ -1572,7 +1576,11 @@
|
||||
/obj/effect/floor_decal/techfloor/corner{
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/turf/simulated/floor/tiled/techfloor{
|
||||
nitrogen = 100;
|
||||
oxygen = 0;
|
||||
temperature = 73
|
||||
},
|
||||
/area/tcommsat/cynosure/chamber)
|
||||
"qc" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
@@ -1899,7 +1907,11 @@
|
||||
/obj/effect/floor_decal/techfloor/corner{
|
||||
dir = 10
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/turf/simulated/floor/tiled/techfloor{
|
||||
nitrogen = 100;
|
||||
oxygen = 0;
|
||||
temperature = 73
|
||||
},
|
||||
/area/tcommsat/cynosure/chamber)
|
||||
"ta" = (
|
||||
/obj/structure/cable{
|
||||
@@ -2461,13 +2473,21 @@
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/turf/simulated/floor/tiled/techfloor{
|
||||
nitrogen = 100;
|
||||
oxygen = 0;
|
||||
temperature = 73
|
||||
},
|
||||
/area/tcommsat/cynosure/chamber)
|
||||
"zJ" = (
|
||||
/obj/effect/floor_decal/techfloor/corner{
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/turf/simulated/floor/tiled/techfloor{
|
||||
nitrogen = 100;
|
||||
oxygen = 0;
|
||||
temperature = 73
|
||||
},
|
||||
/area/tcommsat/cynosure/chamber)
|
||||
"zO" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/black,
|
||||
@@ -2586,7 +2606,11 @@
|
||||
/obj/effect/floor_decal/techfloor/corner{
|
||||
dir = 9
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/turf/simulated/floor/tiled/techfloor{
|
||||
nitrogen = 100;
|
||||
oxygen = 0;
|
||||
temperature = 73
|
||||
},
|
||||
/area/tcommsat/cynosure/chamber)
|
||||
"BD" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
@@ -2855,7 +2879,11 @@
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 5
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/turf/simulated/floor/tiled/techfloor{
|
||||
nitrogen = 100;
|
||||
oxygen = 0;
|
||||
temperature = 73
|
||||
},
|
||||
/area/tcommsat/cynosure/chamber)
|
||||
"Eq" = (
|
||||
/obj/structure/cable{
|
||||
@@ -3024,7 +3052,11 @@
|
||||
/obj/effect/floor_decal/techfloor/corner{
|
||||
dir = 9
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/turf/simulated/floor/tiled/techfloor{
|
||||
nitrogen = 100;
|
||||
oxygen = 0;
|
||||
temperature = 73
|
||||
},
|
||||
/area/tcommsat/cynosure/chamber)
|
||||
"Gq" = (
|
||||
/obj/structure/bed/chair/shuttle,
|
||||
@@ -3148,7 +3180,11 @@
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 9
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/turf/simulated/floor/tiled/techfloor{
|
||||
nitrogen = 100;
|
||||
oxygen = 0;
|
||||
temperature = 73
|
||||
},
|
||||
/area/tcommsat/cynosure/chamber)
|
||||
"Hk" = (
|
||||
/obj/effect/floor_decal/techfloor,
|
||||
@@ -4212,7 +4248,11 @@
|
||||
/obj/effect/floor_decal/techfloor/corner{
|
||||
dir = 10
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/turf/simulated/floor/tiled/techfloor{
|
||||
nitrogen = 100;
|
||||
oxygen = 0;
|
||||
temperature = 73
|
||||
},
|
||||
/area/tcommsat/cynosure/chamber)
|
||||
"QG" = (
|
||||
/obj/structure/window/reinforced{
|
||||
@@ -4733,7 +4773,11 @@
|
||||
/obj/effect/floor_decal/techfloor/corner{
|
||||
dir = 5
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/turf/simulated/floor/tiled/techfloor{
|
||||
nitrogen = 100;
|
||||
oxygen = 0;
|
||||
temperature = 73
|
||||
},
|
||||
/area/tcommsat/cynosure/chamber)
|
||||
"UY" = (
|
||||
/obj/structure/window/reinforced,
|
||||
@@ -5050,7 +5094,11 @@
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 10
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/turf/simulated/floor/tiled/techfloor{
|
||||
nitrogen = 100;
|
||||
oxygen = 0;
|
||||
temperature = 73
|
||||
},
|
||||
/area/tcommsat/cynosure/chamber)
|
||||
"Yb" = (
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
|
||||
@@ -94,7 +94,7 @@
|
||||
},
|
||||
/obj/machinery/access_button{
|
||||
command = "cycle_interior";
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
master_tag = "ninja_shuttle";
|
||||
name = "interior access button";
|
||||
pixel_x = -25;
|
||||
@@ -530,7 +530,7 @@
|
||||
/obj/machinery/atmospherics/pipe/manifold4w/visible,
|
||||
/obj/machinery/access_button{
|
||||
command = "cycle_interior";
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
master_tag = "merc_shuttle";
|
||||
name = "interior access button";
|
||||
pixel_x = 25;
|
||||
@@ -797,7 +797,7 @@
|
||||
"aTS" = (
|
||||
/obj/machinery/access_button{
|
||||
command = "cycle_exterior";
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
master_tag = "vox_west_control";
|
||||
req_one_access = list(150)
|
||||
},
|
||||
@@ -1267,7 +1267,7 @@
|
||||
opacity = 0
|
||||
},
|
||||
/obj/machinery/door/airlock/voidcraft{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "merc_shuttle_outer";
|
||||
name = "Ship External Access";
|
||||
req_access = list(150)
|
||||
@@ -1786,7 +1786,7 @@
|
||||
/area/holodeck/source_courtroom)
|
||||
"ccc" = (
|
||||
/obj/machinery/airlock_sensor{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "ninja_shuttle_sensor";
|
||||
pixel_y = 28
|
||||
},
|
||||
@@ -2055,7 +2055,7 @@
|
||||
/area/syndicate_station)
|
||||
"ctM" = (
|
||||
/obj/machinery/door/airlock/hatch{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "vox_southwest_lock";
|
||||
req_access = list(150)
|
||||
},
|
||||
@@ -2292,7 +2292,7 @@
|
||||
/area/shuttle/supply)
|
||||
"cKC" = (
|
||||
/obj/machinery/airlock_sensor{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "vox_east_sensor";
|
||||
pixel_x = -25
|
||||
},
|
||||
@@ -2789,8 +2789,8 @@
|
||||
"dqX" = (
|
||||
/obj/machinery/access_button{
|
||||
command = "cycle_exterior";
|
||||
frequency = 1331;
|
||||
master_tag = "vox_east_control";
|
||||
frequency = 1380;
|
||||
master_tag = "skipjack_shuttle";
|
||||
req_access = list(150)
|
||||
},
|
||||
/turf/simulated/wall/skipjack,
|
||||
@@ -4011,7 +4011,7 @@
|
||||
/area/ninja_dojo/start)
|
||||
"eOt" = (
|
||||
/obj/machinery/door/airlock/voidcraft/vertical{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "ninja_shuttle_outer";
|
||||
name = "Ship External Hatch";
|
||||
req_access = list(150)
|
||||
@@ -4327,8 +4327,8 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/visible,
|
||||
/obj/machinery/access_button{
|
||||
command = "cycle_interior";
|
||||
frequency = 1331;
|
||||
master_tag = "vox_east_control";
|
||||
frequency = 1380;
|
||||
master_tag = "skipjack_shuttle";
|
||||
pixel_x = 22;
|
||||
req_access = list(150)
|
||||
},
|
||||
@@ -4344,6 +4344,15 @@
|
||||
name = "plating"
|
||||
},
|
||||
/area/skipjack_station)
|
||||
"fgd" = (
|
||||
/obj/structure/bed/chair{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/shuttle/floor/darkred,
|
||||
/area/shuttle/syndicate_elite/mothership)
|
||||
"fhd" = (
|
||||
/obj/structure/table/rack,
|
||||
/obj/item/weapon/gun/projectile/automatic/wt550,
|
||||
@@ -4979,13 +4988,12 @@
|
||||
/obj/structure/bed/chair{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/embedded_controller/radio/airlock/docking_port{
|
||||
frequency = 1331;
|
||||
/obj/machinery/embedded_controller/radio/simple_docking_controller{
|
||||
frequency = 1380;
|
||||
id_tag = "merc_elite_shuttle";
|
||||
pixel_x = -24;
|
||||
pixel_y = -2;
|
||||
req_access = list(150);
|
||||
tag_exterior_door = "merc_elite_shuttle_hatch"
|
||||
pixel_x = -25;
|
||||
req_one_access = list(150);
|
||||
tag_door = "merc_elite_shuttle_hatch"
|
||||
},
|
||||
/turf/simulated/shuttle/floor/darkred,
|
||||
/area/shuttle/syndicate_elite/mothership)
|
||||
@@ -6931,7 +6939,7 @@
|
||||
/area/syndicate_station/start)
|
||||
"idR" = (
|
||||
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "vox_west_control";
|
||||
pixel_x = 24;
|
||||
req_access = list(150);
|
||||
@@ -6942,7 +6950,7 @@
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
|
||||
dir = 8;
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "vox_west_vent"
|
||||
},
|
||||
/obj/machinery/light/small,
|
||||
@@ -8983,7 +8991,7 @@
|
||||
"kqh" = (
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
|
||||
dir = 4;
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "merc_shuttle_pump"
|
||||
},
|
||||
/obj/machinery/light/small,
|
||||
@@ -8994,7 +9002,7 @@
|
||||
/area/skipjack_station/start)
|
||||
"kqS" = (
|
||||
/obj/machinery/airlock_sensor{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "vox_west_sensor";
|
||||
pixel_x = 25
|
||||
},
|
||||
@@ -10883,7 +10891,7 @@
|
||||
/area/holodeck/source_picnicarea)
|
||||
"mrF" = (
|
||||
/obj/machinery/door/airlock/hatch{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "vox_southeast_lock";
|
||||
req_access = list(150)
|
||||
},
|
||||
@@ -11582,6 +11590,9 @@
|
||||
/obj/structure/bed/chair{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/shuttle/floor/darkred,
|
||||
/area/shuttle/syndicate_elite/mothership)
|
||||
"ngK" = (
|
||||
@@ -11761,7 +11772,7 @@
|
||||
/area/centcom/specops)
|
||||
"nsa" = (
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "vox_west_vent"
|
||||
},
|
||||
/turf/simulated/shuttle/plating,
|
||||
@@ -12228,7 +12239,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/door/airlock/voidcraft/vertical{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "ninja_shuttle_inner";
|
||||
name = "Ship Internal Hatch";
|
||||
req_access = list(150)
|
||||
@@ -12601,7 +12612,7 @@
|
||||
/area/syndicate_station/start)
|
||||
"otk" = (
|
||||
/obj/machinery/door/airlock/hatch{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "vox_northeast_lock";
|
||||
req_access = list(150)
|
||||
},
|
||||
@@ -13651,7 +13662,7 @@
|
||||
"pFK" = (
|
||||
/obj/machinery/access_button{
|
||||
command = "cycle_interior";
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
master_tag = "merc_shuttle";
|
||||
name = "interior access button";
|
||||
pixel_x = -25;
|
||||
@@ -14779,7 +14790,7 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/visible,
|
||||
/obj/machinery/access_button{
|
||||
command = "cycle_interior";
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
master_tag = "vox_west_control";
|
||||
pixel_x = -22;
|
||||
req_one_access = list(150)
|
||||
@@ -15526,7 +15537,7 @@
|
||||
"rzx" = (
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
|
||||
dir = 8;
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "merc_shuttle_pump"
|
||||
},
|
||||
/obj/effect/shuttle_landmark{
|
||||
@@ -15676,7 +15687,7 @@
|
||||
/area/syndicate_station/start)
|
||||
"rGU" = (
|
||||
/obj/machinery/door/airlock/voidcraft/vertical{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "merc_shuttle_inner";
|
||||
name = "Ship External Access";
|
||||
req_access = list(150)
|
||||
@@ -15688,7 +15699,7 @@
|
||||
/area/syndicate_station/start)
|
||||
"rHT" = (
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "vox_east_vent"
|
||||
},
|
||||
/turf/simulated/shuttle/plating,
|
||||
@@ -15731,7 +15742,7 @@
|
||||
"rKS" = (
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
|
||||
dir = 8;
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "merc_shuttle_pump"
|
||||
},
|
||||
/turf/simulated/shuttle/floor/voidcraft/dark,
|
||||
@@ -15837,10 +15848,10 @@
|
||||
/area/centcom/main_hall)
|
||||
"rOP" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible{
|
||||
dir = 8
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/door/airlock/voidcraft/vertical{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "merc_shuttle_inner";
|
||||
name = "Ship External Access";
|
||||
req_access = list(150)
|
||||
@@ -17084,18 +17095,18 @@
|
||||
"teW" = (
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
|
||||
dir = 4;
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "merc_shuttle_pump"
|
||||
},
|
||||
/obj/machinery/embedded_controller/radio/airlock/docking_port{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "merc_shuttle";
|
||||
pixel_x = 24;
|
||||
pixel_y = -2;
|
||||
req_access = list(150)
|
||||
},
|
||||
/obj/machinery/airlock_sensor{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "merc_shuttle_sensor";
|
||||
pixel_x = 28;
|
||||
pixel_y = 8
|
||||
@@ -17213,10 +17224,7 @@
|
||||
},
|
||||
/area/skipjack_station)
|
||||
"tnL" = (
|
||||
/turf/simulated/shuttle/wall/dark{
|
||||
hard_corner = 1;
|
||||
join_group = "shuttle_ert"
|
||||
},
|
||||
/turf/simulated/shuttle/wall/dark/hard_corner,
|
||||
/area/shuttle/response_ship/start)
|
||||
"tos" = (
|
||||
/obj/machinery/light{
|
||||
@@ -20354,7 +20362,7 @@
|
||||
/area/syndicate_station/start)
|
||||
"wJs" = (
|
||||
/obj/machinery/door/airlock/hatch{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "vox_northwest_lock";
|
||||
req_access = list(150)
|
||||
},
|
||||
@@ -20402,12 +20410,12 @@
|
||||
"wNk" = (
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
|
||||
dir = 4;
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "vox_east_vent"
|
||||
},
|
||||
/obj/machinery/light/small,
|
||||
/obj/machinery/embedded_controller/radio/airlock/docking_port{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "skipjack_shuttle";
|
||||
pixel_x = -24;
|
||||
req_access = list(150);
|
||||
@@ -21809,14 +21817,14 @@
|
||||
/area/shuttle/escape/centcom)
|
||||
"ymb" = (
|
||||
/obj/machinery/embedded_controller/radio/airlock/docking_port{
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "ninja_shuttle";
|
||||
pixel_y = -25;
|
||||
req_access = list(150)
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
|
||||
dir = 4;
|
||||
frequency = 1331;
|
||||
frequency = 1380;
|
||||
id_tag = "ninja_shuttle_pump"
|
||||
},
|
||||
/obj/machinery/button/remote/blast_door{
|
||||
@@ -85785,7 +85793,7 @@ dFI
|
||||
eUF
|
||||
eUF
|
||||
fSe
|
||||
fSe
|
||||
fgd
|
||||
hht
|
||||
iai
|
||||
iSX
|
||||
|
||||
+1423
-1110
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,50 @@
|
||||
// Overmap object for Sif, hanging in the void of space
|
||||
/obj/effect/overmap/visitable/planet/Sif
|
||||
name = "Sif"
|
||||
desc = "A cold, Earth-like planet. Cynosure Station is located here."
|
||||
map_z = list(
|
||||
Z_LEVEL_STATION_ONE,
|
||||
Z_LEVEL_STATION_TWO,
|
||||
Z_LEVEL_STATION_THREE,
|
||||
Z_LEVEL_SURFACE_WILD
|
||||
)
|
||||
base = 1
|
||||
in_space = 0
|
||||
start_x = 10
|
||||
start_y = 10
|
||||
skybox_offset_x = 128
|
||||
skybox_offset_y = 128
|
||||
surface_color = "#2D545B"
|
||||
mountain_color = "#735555"
|
||||
ice_color = "FFFFFF"
|
||||
icecaps = "icecaps"
|
||||
initial_generic_waypoints = list(
|
||||
"nav_pad3_cynosure", //Northwest Pad 3,
|
||||
"nav_pad4_cynosure" //Northwest Pad 4
|
||||
)
|
||||
|
||||
|
||||
/obj/effect/overmap/visitable/planet/Sif/Initialize()
|
||||
atmosphere = new(CELL_VOLUME)
|
||||
atmosphere.adjust_gas_temp("oxygen", MOLES_O2STANDARD, 273)
|
||||
atmosphere.adjust_gas_temp("nitrogen", MOLES_N2STANDARD, 273)
|
||||
|
||||
. = ..()
|
||||
|
||||
docking_codes = null
|
||||
|
||||
/obj/effect/overmap/visitable/planet/Sif/get_skybox_representation()
|
||||
var/image/tmp = ..()
|
||||
tmp.pixel_x = skybox_offset_x
|
||||
tmp.pixel_y = skybox_offset_y
|
||||
return tmp
|
||||
/obj/effect/overmap/visitable/telecomm_sat
|
||||
name = "Telecommunications Satellite"
|
||||
icon_state = "object"
|
||||
initial_generic_waypoints = list(
|
||||
"nav_telecomm_dockarm" //Tcomm sat docking
|
||||
)
|
||||
in_space = 1
|
||||
start_x = 10
|
||||
start_y = 10
|
||||
map_z = list(Z_LEVEL_TCOMM, Z_LEVEL_EMPTY_SPACE)
|
||||
Reference in New Issue
Block a user