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

Merge pull request #5617 from Novacat/nova-shuttle

Browse Source 
New Expedition Shuttle
This commit is contained in:
Novacat
2019-08-19 16:56:51 -04:00
committed by GitHub
parent dea67ec3bb d667f30304
commit 66967f6d02
11 changed files with 2656 additions and 1845 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/handrail_vr.dm
+8
View File
@@ -0,0 +1,8 @@
/obj/structure/handrail
name = "handrail"
icon = 'icons/obj/handrail_vr.dmi'
icon_state = "handrail"
desc = "A safety railing with buckles to secure yourself to when floor isn't stable enough."
density = 0
anchored = 1
can_buckle = 1
icons/obj/handrail_vr.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 385 B

maps/tether/submaps/aerostat/aerostat.dmm
+106 -106
View File
@@ -4742,10 +4742,10 @@ aw
aw
aw
aw
aw
aw
aw
aw
cv
cv
cv
cv
aw
aw
aw
@@ -4874,21 +4874,21 @@ aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
aw
aw
aw
@@ -5016,21 +5016,21 @@ aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
aw
aw
aw
@@ -5157,15 +5157,15 @@ aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
@@ -5299,24 +5299,24 @@ aw
aw
aw
aw
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
aw
aw
aw
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
aw
aw
aw
aw
aw
@@ -5440,25 +5440,25 @@ aw
aw
aw
aw
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
aw
aw
aw
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
aw
aw
aw
aw
aw
@@ -5582,9 +5582,9 @@ aw
aw
aw
aw
aw
aw
aw
cv
cv
cv
cv
cv
cv
@@ -5724,9 +5724,6 @@ aw
aw
aw
aw
aw
aw
aw
cv
cv
cv
@@ -5739,7 +5736,10 @@ cv
cv
cv
cv
aw
cv
cv
cv
cv
aw
aw
aw
@@ -5866,9 +5866,6 @@ aw
aw
aw
aw
aw
aw
aw
cv
cv
cv
@@ -5881,7 +5878,10 @@ cv
cv
cv
cv
aw
cv
cv
cv
cv
aw
aw
aw
@@ -6008,9 +6008,9 @@ aw
aw
aw
aw
aw
aw
aw
cv
cv
cv
cv
cv
cv
@@ -6151,8 +6151,8 @@ aw
aw
aw
aw
aw
aw
cv
cv
cv
cv
cv
@@ -6293,8 +6293,8 @@ aw
aw
aw
aw
aw
aw
cv
cv
cv
cv
cv
@@ -6436,8 +6436,8 @@ aw
aw
aw
aw
aw
aw
cv
cv
cv
cv
cv
@@ -6578,14 +6578,14 @@ aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
aw
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
cv
@@ -6727,13 +6727,13 @@ aw
aw
aw
aw
aw
aw
cv
cv
aw
cc
cY
aw
aw
cv
cv
aw
aw
aw
maps/tether/submaps/beach/beach.dmm
+107 -107
View File
@@ -8218,10 +8218,10 @@ aa
aa
aa
aa
aa
aa
aa
aa
bm
bm
bm
bm
aa
aa
aa
@@ -8350,21 +8350,21 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
aa
aa
aa
@@ -8492,14 +8492,14 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
@@ -8633,9 +8633,9 @@ aa
aa
aa
aa
aa
aa
aa
bm
bm
bm
bm
bm
bm
@@ -8775,23 +8775,23 @@ aa
aa
aa
aa
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
aa
aa
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
aa
aa
aa
aa
@@ -8916,9 +8916,9 @@ aa
aa
aa
aa
aa
aa
aa
bm
bm
bm
bm
bm
bm
@@ -9058,9 +9058,6 @@ aa
aa
aa
aa
aa
aa
aa
bm
bm
bm
@@ -9073,7 +9070,10 @@ bm
bm
bm
bm
aa
bm
bm
bm
bm
aa
aa
aa
@@ -9200,9 +9200,6 @@ aa
aa
aa
aa
aa
aa
aa
bm
bm
bm
@@ -9215,7 +9212,10 @@ bm
bm
bm
bm
aa
bm
bm
bm
bm
aa
aa
bs
@@ -9342,9 +9342,9 @@ aa
aa
aa
aa
aa
aa
aa
bm
bm
bm
bm
bm
bm
@@ -9484,9 +9484,9 @@ aa
aa
aa
aa
aa
aa
aa
bm
bm
bm
bm
bm
bm
@@ -9627,23 +9627,23 @@ aa
aa
aa
aa
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
aa
aa
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
aa
aa
aa
aa
@@ -9769,9 +9769,9 @@ aa
aa
aa
aa
aa
aa
aa
bm
bm
bm
bm
bm
bm
@@ -9912,14 +9912,14 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
@@ -10054,21 +10054,21 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
bm
aa
aa
aa
@@ -10203,13 +10203,13 @@ aa
aa
aa
aa
bm
bm
aa
aa
aa
aa
aa
aa
aa
bm
bm
aa
aa
aa
maps/tether/submaps/space/debrisfield.dmm
+107 -107
View File
@@ -8623,10 +8623,10 @@ b
b
b
b
b
b
b
b
f
f
f
f
b
b
b
@@ -8755,21 +8755,21 @@ b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
b
b
b
@@ -8897,14 +8897,14 @@ b
b
b
b
b
b
b
b
b
b
b
b
f
f
f
f
f
f
f
f
f
f
f
@@ -9038,9 +9038,9 @@ b
b
b
b
b
b
b
f
f
f
f
f
f
@@ -9180,23 +9180,23 @@ b
b
b
b
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
b
b
f
f
f
f
f
f
f
f
f
f
f
f
f
f
b
b
b
b
@@ -9321,9 +9321,9 @@ a
b
b
b
b
b
b
f
f
f
f
f
f
@@ -9463,9 +9463,6 @@ a
b
b
b
b
b
b
f
f
f
@@ -9478,7 +9475,10 @@ f
f
f
f
b
f
f
f
f
b
b
b
@@ -9605,9 +9605,6 @@ a
b
b
b
b
b
b
f
f
f
@@ -9620,7 +9617,10 @@ f
f
f
f
b
f
f
f
f
b
b
c
@@ -9747,9 +9747,9 @@ a
b
b
b
b
b
b
f
f
f
f
f
f
@@ -9889,9 +9889,9 @@ a
b
b
b
b
b
b
f
f
f
f
f
f
@@ -10032,23 +10032,23 @@ b
b
b
b
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
b
b
f
f
f
f
f
f
f
f
f
f
f
f
f
f
b
b
b
b
@@ -10174,9 +10174,9 @@ b
b
b
b
b
b
b
f
f
f
f
f
f
@@ -10317,14 +10317,14 @@ b
b
b
b
b
b
b
b
b
b
b
b
f
f
f
f
f
f
f
f
f
f
f
@@ -10459,21 +10459,21 @@ b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
b
f
f
f
f
f
f
f
f
f
f
f
f
f
f
f
b
b
b
@@ -10608,13 +10608,13 @@ b
b
b
b
f
f
b
b
b
b
b
b
b
f
f
b
b
b
maps/tether/submaps/tether_ships.dmm
+671 -759
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-05-station1.dmm
+201 -207
View File
@@ -10336,12 +10336,6 @@
"ayp" = (
/turf/space,
/area/shuttle/excursion/tether_dockarm)
"ayq" = (
/obj/effect/landmark{
name = "carpspawn"
},
/turf/space,
/area/shuttle/excursion/tether_dockarm)
"ays" = (
/obj/structure/cable{
d1 = 1;
@@ -25453,10 +25447,10 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
ayp
ayp
ayp
ayp
aaa
aaa
aaa
@@ -25585,21 +25579,21 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
aaa
aaa
aaa
@@ -25727,21 +25721,21 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
aaa
aaa
aaa
@@ -25868,15 +25862,15 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
@@ -26010,24 +26004,24 @@ aaa
aaa
aaa
aaa
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
aaa
aaa
aaa
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
aaa
aaa
aaa
aaa
aaa
@@ -26151,9 +26145,6 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
ayp
ayp
ayp
@@ -26167,7 +26158,10 @@ ayp
ayp
ayp
ayp
ayq
ayp
ayp
ayp
aab
aaa
aaa
aaa
@@ -26293,9 +26287,9 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
ayp
ayp
ayp
ayp
ayp
ayp
@@ -26435,9 +26429,6 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
ayp
ayp
ayp
@@ -26450,7 +26441,10 @@ ayp
ayp
ayp
ayp
aaa
ayp
ayp
ayp
ayp
aaa
aaa
aaa
@@ -26577,9 +26571,6 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
ayp
ayp
ayp
@@ -26592,7 +26583,10 @@ ayp
ayp
ayp
ayp
aaa
ayp
ayp
ayp
ayp
aaa
aaa
aaa
@@ -26719,9 +26713,9 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
ayp
ayp
ayp
ayp
ayp
ayp
@@ -26862,8 +26856,8 @@ aac
aac
cbM
cbM
aaa
aaa
ayp
ayp
ayp
ayp
ayp
@@ -27004,8 +26998,8 @@ bYP
bYP
aac
aac
aac
aaa
ayp
ayp
ayp
ayp
ayp
@@ -27147,8 +27141,8 @@ bYP
aac
aac
aac
aaa
aaa
ayp
ayp
ayp
ayp
ayp
@@ -27289,14 +27283,14 @@ bYP
aac
aac
aac
aac
aaa
aaa
aaa
aaa
aaa
aaa
aaa
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
ayp
@@ -27438,13 +27432,13 @@ aac
aac
aaa
aaa
aaa
aaa
ayp
ayp
bGo
bHt
bJl
aaa
aaa
ayp
ayp
aaa
aaa
aaa
@@ -37318,10 +37312,10 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaf
aaf
aaf
aaf
aaa
aaa
aaa
@@ -37450,21 +37444,21 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaa
aaa
aaa
@@ -37592,14 +37586,14 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
@@ -37733,9 +37727,9 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaf
aaf
aaf
aaf
aaf
aaf
@@ -37875,23 +37869,23 @@ aaa
aaa
aaa
aaa
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaa
aaa
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaa
aaa
aaa
aaa
@@ -38016,9 +38010,9 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaf
aaf
aaf
aaf
aaf
aaf
@@ -38158,9 +38152,6 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaf
aaf
aaf
@@ -38173,7 +38164,10 @@ aaf
aaf
aaf
aaf
aaa
aaf
aaf
aaf
aaf
aaa
aaa
aaa
@@ -38300,9 +38294,6 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaf
aaf
aaf
@@ -38315,7 +38306,10 @@ aaf
aaf
aaf
aaf
aaa
aaf
aaf
aaf
aaf
aaa
aaa
aaa
@@ -38442,9 +38436,9 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaf
aaf
aaf
aaf
aaf
aaf
@@ -38584,9 +38578,9 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaf
aaf
aaf
aaf
aaf
aaf
@@ -38727,23 +38721,23 @@ aaa
aaa
aaa
aaa
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaa
aaa
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaa
aaa
aaa
aaa
@@ -38869,9 +38863,9 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaf
aaf
aaf
aaf
aaf
aaf
@@ -39012,14 +39006,14 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
@@ -39154,21 +39148,21 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaf
aaa
aaa
aaa
@@ -39303,13 +39297,13 @@ aaa
aaa
aaa
aaa
aaf
aaf
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaf
aaf
aaa
aaa
aaa
maps/tether/tether-06-station2.dmm
+8 -9
View File
@@ -1894,19 +1894,12 @@
/turf/simulated/floor/tiled,
/area/tether/exploration/crew)
"cI" = (
/obj/structure/table/rack/shelf,
/obj/effect/floor_decal/borderfloor{
dir = 5
},
/obj/effect/floor_decal/corner/purple/border{
dir = 5
},
/obj/item/weapon/storage/toolbox/mechanical{
pixel_y = -4
},
/obj/item/device/multitool/tether_buffered{
pixel_y = 2
},
/obj/machinery/requests_console{
department = "Exploration";
name = "Exploration Requests Console";
@@ -7765,7 +7758,6 @@
/turf/simulated/floor/tiled,
/area/tether/exploration/equipment)
"lp" = (
/obj/machinery/suit_cycler/exploration,
/obj/effect/floor_decal/borderfloor{
dir = 1;
icon_state = "borderfloor";
@@ -7780,16 +7772,23 @@
dir = 4
},
/obj/machinery/camera/network/exploration,
/obj/structure/table/rack/shelf,
/obj/item/device/multitool/tether_buffered{
pixel_y = 2
},
/obj/item/weapon/storage/toolbox/mechanical{
pixel_y = -4
},
/turf/simulated/floor/tiled,
/area/tether/exploration/equipment)
"lq" = (
/obj/machinery/suit_cycler/pilot,
/obj/effect/floor_decal/borderfloor{
dir = 5
},
/obj/effect/floor_decal/corner/purple/border{
dir = 5
},
/obj/machinery/suit_cycler/exploration,
/turf/simulated/floor/tiled,
/area/tether/exploration/equipment)
"lr" = (
maps/tether/tether-07-station3.dmm
+1446 -550
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether_areas2.dm
+1
View File
@@ -572,6 +572,7 @@
name = "\improper Excursion Shuttle"
icon_state = "shuttle2"
base_turf = /turf/space
requires_power = 1
/area/shuttle/excursion/tether
name = "\improper Excursion Shuttle - Tether"
vorestation.dme
+1
View File
@@ -1216,6 +1216,7 @@
#include "code\game\objects\structures\girders.dm"
#include "code\game\objects\structures\gravemarker.dm"
#include "code\game\objects\structures\grille.dm"
#include "code\game\objects\structures\handrail_vr.dm"
#include "code\game\objects\structures\holoplant.dm"
#include "code\game\objects\structures\inflatable.dm"
#include "code\game\objects\structures\janicart.dm"