cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 06:07:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5635 from tacoguy7765093/steel-beams

Browse Source 
adds some missing overmap shuttle features and fixes charging
This commit is contained in:
Nadyr
2023-02-02 20:40:00 -05:00
committed by GitHub
parent 6945894ad7 e9305daf70
commit b7d6d81c72
2 changed files with 114 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/southern_cross/overmap/shuttles.dm
+8 -3
View File
@@ -4,6 +4,7 @@
name = "Stargazer"
warmup_time = 1
current_location = "stargazer_dock"
docking_controller_tag = "stargazer"
shuttle_area = /area/shuttle/stargazer
fuel_consumption = 2
move_direction = NORTH
@@ -25,8 +26,9 @@
name = "Baby_mammoth"
warmup_time = 5
current_location = "baby_mammoth_dock"
docking_controller_tag = "shuttle4_shuttle"
shuttle_area = /area/shuttle/baby_mammoth
fuel_consumption = 5
fuel_consumption = 2
move_direction = NORTH
/obj/effect/overmap/visitable/ship/landable/baby_mammoth
@@ -46,8 +48,9 @@
name = "Ursula"
warmup_time = 2
current_location = "ursula_dock"
docking_controller_tag = "ursula"
shuttle_area = /area/shuttle/ursula
fuel_consumption = 3
fuel_consumption = 2
move_direction = NORTH
/obj/effect/overmap/visitable/ship/landable/ursula
@@ -67,6 +70,7 @@
name = "Needle"
warmup_time = 0
current_location = "needle_dock"
docking_controller_tag = "needle"
shuttle_area = /area/shuttle/needle
fuel_consumption = 1
move_direction = NORTH
@@ -88,6 +92,7 @@
name = "Echidna"
warmup_time = 4
current_location = "echidna_dock"
docking_controller_tag = "echidna"
shuttle_area = /area/shuttle/echidna
fuel_consumption = 2
move_direction = NORTH
@@ -102,4 +107,4 @@
/obj/machinery/computer/shuttle_control/explore/echidna
name = "short jump console"
shuttle_tag = "Echidna"
req_one_access = list(access_pilot)
req_one_access = list(access_pilot)
maps/southern_cross/southern_cross-7.dmm
+106 -71
View File
@@ -2058,6 +2058,7 @@
pixel_y = -24
},
/obj/structure/cable/green,
/obj/structure/cable/green,
/turf/simulated/shuttle/plating,
/area/shuttle/ursula)
"fb" = (
@@ -5496,9 +5497,9 @@
dir = 6
},
/obj/structure/cable/green{
d1 = 2;
d1 = 4;
d2 = 8;
icon_state = "2-8"
icon_state = "4-8"
},
/turf/simulated/shuttle/floor/yellow,
/area/shuttle/ursula)
@@ -5511,8 +5512,18 @@
opacity = 1
},
/obj/structure/cable/green{
d2 = 2;
icon_state = "0-2"
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable/green{
d2 = 8;
icon_state = "0-8"
},
/obj/structure/cable/green{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/simulated/shuttle/plating,
/area/shuttle/ursula)
@@ -5524,11 +5535,11 @@
dir = 1;
opacity = 1
},
/obj/structure/cable/green{
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/port_gen/pacman,
/obj/structure/cable/green{
d2 = 8;
icon_state = "0-8"
},
/turf/simulated/shuttle/plating,
/area/shuttle/ursula)
"qC" = (
@@ -5605,6 +5616,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 6
},
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/shuttle/floor/yellow,
/area/shuttle/ursula)
"qR" = (
@@ -5613,10 +5629,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 8
},
/obj/structure/cable/green{
d1 = 1;
d2 = 4;
icon_state = "1-4"
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/shuttle/floor/yellow,
/area/shuttle/ursula)
@@ -5626,29 +5642,19 @@
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable/green{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable/green{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable/green{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable/green{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/atmospherics/binary/pump{
dir = 4
},
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/shuttle/floor/yellow,
/area/shuttle/ursula)
"qT" = (
@@ -5659,11 +5665,6 @@
/turf/simulated/floor/plating,
/area/maintenance/expoutpost/outerportmaint)
"qU" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/closet/walllocker/emerglocker{
dir = 1;
pixel_x = 25;
@@ -5675,7 +5676,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 10
},
/obj/structure/cable/green{
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -5701,6 +5702,11 @@
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/shuttle/plating,
/area/shuttle/ursula)
"qW" = (
@@ -5717,7 +5723,7 @@
tag_interior_door = "ursula_inner"
},
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/structure/cable/green{
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -5741,7 +5747,7 @@
landmark_tag = "ursula_dock";
name = "Ursula Dock"
},
/obj/structure/cable/green{
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -5762,7 +5768,7 @@
locked = 1;
name = "External Access"
},
/obj/structure/cable/green{
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -8417,14 +8423,20 @@
/obj/structure/sign/poster/nanotrasen{
dir = 1
},
/obj/structure/cable/green{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/shuttle/plating,
/area/shuttle/baby_mammoth)
"wI" = (
/obj/structure/cable/green{
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/power/port_gen/pacman,
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/shuttle/plating,
/area/shuttle/baby_mammoth)
"wJ" = (
@@ -8433,6 +8445,11 @@
dir = 1
},
/obj/machinery/mech_recharger,
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/shuttle/plating,
/area/shuttle/baby_mammoth)
"wK" = (
@@ -8627,14 +8644,24 @@
pixel_x = -25;
pixel_y = 32
},
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/shuttle/floor/yellow,
/area/shuttle/baby_mammoth)
"wY" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/yellow,
/obj/structure/cable/green{
d1 = 2;
d2 = 4;
icon_state = "2-4"
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/shuttle/floor/yellow,
/area/shuttle/baby_mammoth)
@@ -8642,18 +8669,13 @@
/obj/structure/fuel_port{
pixel_y = -28
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 8
},
/obj/structure/cable/green{
d1 = 1;
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "1-8"
icon_state = "4-8"
},
/turf/simulated/shuttle/floor/yellow,
/area/shuttle/baby_mammoth)
@@ -8670,28 +8692,33 @@
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/shuttle/floor/black,
/area/shuttle/baby_mammoth)
"xb" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 10
},
/obj/effect/floor_decal/industrial/warning,
/obj/structure/cable/green{
d1 = 1;
d2 = 4;
icon_state = "1-4"
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/shuttle/floor/black,
/area/shuttle/baby_mammoth)
"xc" = (
/obj/effect/floor_decal/industrial/warning,
/obj/structure/cable/green{
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -8715,7 +8742,7 @@
locked = 1;
name = "Internal Access"
},
/obj/structure/cable/green{
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -8728,7 +8755,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
/obj/structure/cable/green{
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -8748,7 +8775,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
/obj/structure/cable/green{
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -8775,7 +8802,7 @@
layer = 2.5;
name = "window blast shield"
},
/obj/structure/cable/green{
/obj/structure/cable/blue{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -13174,6 +13201,14 @@
/obj/item/device/cataloguer,
/turf/simulated/floor/tiled,
/area/expoutpost/prep)
"Nv" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/simulated/shuttle/floor/black,
/area/shuttle/baby_mammoth)
"Nx" = (
/obj/machinery/atmospherics/portables_connector,
/obj/structure/cable/blue{
@@ -45894,7 +45929,7 @@ vr
vr
vr
ws
vr
Nv
xb
xz
xU