Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

working hangar elevator #450

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
+286 −26
Open

working hangar elevator #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cd2ff25
working hangar elevator
AndroBetel Sep 12, 2024
63d8f9b
Update golden_arrow.dm
AndroBetel Sep 12, 2024
56d2cdb
Update shipmap_elevator.dm
AndroBetel Sep 12, 2024
210a328
1
AndroBetel Sep 12, 2024
390c945
Update mapgen_variations.json
AndroBetel Sep 12, 2024
3bb77b8
Update mapgen_variations.json
AndroBetel Sep 12, 2024
386dba5
Update shipmap_elevator.dm
AndroBetel Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/shuttles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,3 +147,4 @@
#define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_ONE "garrow_vehicle_elevator_one"
#define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_TWO "garrow_vehicle_elevator_two"
#define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_CARGO "garrow_cargo_elevator"
#define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_HANGAR "garrow_hangar_elevator"
6 changes: 5 additions & 1 deletion code/datums/shuttles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,10 @@

/datum/map_template/shuttle/trijent_elevator/golden_arrow/cargo
name = "Cargo Elevator"
elevator_network = "garrow_cargo"
shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_CARGO
elevator_network = "ArrowCargo"

/datum/map_template/shuttle/trijent_elevator/golden_arrow/hangar
name = "Hangar Elevator"
shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_HANGAR
elevator_network = "ArrowHangar"
8 changes: 8 additions & 0 deletions code/game/area/golden_arrow.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,11 @@
/area/golden_arrow/vehicle_shuttle/two/upper
name = "\improper Vehicle Elevator Two Upper"

/area/golden_arrow/hangar_shuttle
name = "\improper Hangar Elevator"

/area/golden_arrow/hangar_shuttle/upper
name = "\improper Hangar Elevator Upper"

/area/golden_arrow/hangar_shuttle/lower
name = "\improper Hangar Elevator Lower"
3 changes: 3 additions & 0 deletions code/game/turfs/floor_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,9 @@
/turf/open/floor/almayer/empty/golden_arrow/vehicle_two
area_type = /area/golden_arrow/vehicle_shuttle/two

/turf/open/floor/almayer/empty/golden_arrow/hangar
area_type = /area/golden_arrow/hangar_shuttle

//Others
/turf/open/floor/almayer/uscm
icon_state = "logo_c"
Expand Down
6 changes: 6 additions & 0 deletions code/modules/shuttle/computers/trijent_elevator_control.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,9 @@
if("button-push")
playsound(loc, get_sfx("terminal_button"), KEYBOARD_SOUND_VOLUME * 2, 1)
return FALSE

/obj/structure/machinery/computer/shuttle/elevator_controller/console
icon_state = "elevator_console"
dir = NORTH
flags_atom = ON_BORDER
density = TRUE
18 changes: 18 additions & 0 deletions code/modules/shuttle/shuttles/shipmap_elevator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@
id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_CARGO
area_type = /area/golden_arrow/cargo_shuttle/elevator

/obj/docking_port/mobile/trijent_elevator/shipmap_elevator/hangar
name = "Hangar Elevator"
id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_HANGAR
height = 3
width = 2
area_type = /area/golden_arrow/hangar_shuttle

/obj/docking_port/stationary/shipmap_elevator/visible_message()
return

Expand All @@ -74,3 +81,14 @@
name = "Cargo Elevator"
height = 6
width = 8

/obj/docking_port/stationary/trijent_elevator/shipmap_elevator/hangar
name = "Hangar Elevator"
height = 3
width = 2
var/load_post_roundstart = FALSE

/obj/docking_port/stationary/trijent_elevator/shipmap_elevator/hangar/Initialize(mapload, ...)

Check failure on line 91 in code/modules/shuttle/shuttles/shipmap_elevator.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

/obj/docking_port/stationary/trijent_elevator/shipmap_elevator/hangar/proc/Initialize sets SpacemanDMM_should_not_sleep but calls blocking proc /proc/stoplag
. = ..()
if(load_post_roundstart)
load_roundstart()
Binary file modified icons/obj/structures/machinery/computer.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/turf/almayer.dmi
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion maps/Nightmare/maps/LV624/nightmare.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@
{
"type": "include", "name": "Standalone variations",
"file": "mapgen_variations.json"
}
},
{ "type": "map_sprinkle", "path": "sprinkles/" }
]
3 changes: 2 additions & 1 deletion maps/Nightmare/maps/golden_arrow/nightmare.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
{
"type": "include", "name": "Standalone variations",
"file": "mapgen_variations.json"
}
},
{ "type": "map_sprinkle", "path": "sprinkles/" }
]
57 changes: 34 additions & 23 deletions maps/map_files/golden_arrow/golden_arrow.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1736,7 +1736,7 @@
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/golden_arrow/engineering)
/area/golden_arrow/hangar_shuttle/lower)
"afy" = (
/obj/structure/machinery/light/double/blue{
dir = 1;
Expand Down Expand Up @@ -1976,7 +1976,7 @@
icon_state = "SW-out"
},
/obj/structure/machinery/gear{
id = "supply_elevator_gear"
id = "garrow_hangar_elevator"
},
/obj/structure/cable/heavyduty{
icon_state = "1-2"
Expand Down Expand Up @@ -3877,7 +3877,7 @@
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/golden_arrow/engineering)
/area/golden_arrow/hangar_shuttle/lower)
"alS" = (
/obj/structure/machinery/light/double/blue{
dir = 4;
Expand Down Expand Up @@ -6141,11 +6141,14 @@
pixel_x = 1
},
/obj/structure/machinery/gear{
id = "supply_elevator_gear"
id = "garrow_hangar_elevator"
},
/obj/structure/pipes/standard/manifold/hidden/supply{
dir = 8
},
/obj/effect/landmark/nightmare{
insert_tag = "hangar"
},
/turf/open/floor/almayer/edge/smooth/corner{
dir = 1
},
Expand Down Expand Up @@ -8327,8 +8330,14 @@
/turf/open/floor/almayer/edge,
/area/golden_arrow/supply)
"ayS" = (
/obj/docking_port/stationary/trijent_elevator/shipmap_elevator/hangar{
id = "garrow_hangar_elevator_down";
elevator_network = "ArrowHangar";
name = "Engineering";
airlock_area = /area/golden_arrow/hangar_shuttle/lower
},
/turf/open/floor/plating,
/area/golden_arrow/engineering)
/area/golden_arrow/hangar_shuttle/lower)
"ayU" = (
/obj/effect/decal/cleanable/dirt{
layer = 2.52
Expand Down Expand Up @@ -12124,7 +12133,7 @@
pixel_y = 1
},
/obj/structure/machinery/gear{
id = "supply_elevator_gear"
id = "garrow_hangar_elevator"
},
/obj/structure/cable/heavyduty{
icon_state = "1-2"
Expand Down Expand Up @@ -15201,7 +15210,6 @@
dir = 4;
pixel_x = 21
},
/obj/structure/surface/table/almayer,
/turf/open/floor/almayer{
icon_state = "cargo"
},
Expand Down Expand Up @@ -15318,7 +15326,7 @@
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/golden_arrow/engineering)
/area/golden_arrow/hangar_shuttle/lower)
"aTu" = (
/obj/effect/decal/warning_stripes{
icon_state = "S"
Expand Down Expand Up @@ -16477,7 +16485,7 @@
pixel_x = 1
},
/obj/structure/machinery/gear{
id = "supply_elevator_gear"
id = "garrow_hangar_elevator"
},
/obj/effect/decal/cleanable/dirt{
layer = 2.52
Expand Down Expand Up @@ -16872,7 +16880,7 @@
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/golden_arrow/engineering)
/area/golden_arrow/hangar_shuttle/lower)
"aYu" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer,
Expand Down Expand Up @@ -17930,7 +17938,7 @@
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/golden_arrow/engineering)
/area/golden_arrow/hangar_shuttle/lower)
"eZR" = (
/obj/item/storage/box/guncase/flamer/fuel{
pixel_y = 8
Expand Down Expand Up @@ -18179,7 +18187,7 @@
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/golden_arrow/engineering)
/area/golden_arrow/hangar_shuttle/lower)
"hwm" = (
/obj/structure/stairs/perspective,
/obj/structure/platform{
Expand Down Expand Up @@ -18535,6 +18543,9 @@
"kQO" = (
/turf/closed/wall/almayer/outer,
/area/golden_arrow/supplydrop)
"lgm" = (
/turf/open/floor/plating,
/area/golden_arrow/hangar_shuttle/lower)
"lov" = (
/obj/effect/decal/cleanable/dirt{
layer = 2.52
Expand Down Expand Up @@ -18775,7 +18786,7 @@
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/golden_arrow/engineering)
/area/golden_arrow/hangar_shuttle/lower)
"mHX" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2"
Expand Down Expand Up @@ -19155,7 +19166,7 @@
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/golden_arrow/engineering)
/area/golden_arrow/hangar_shuttle/lower)
"pRt" = (
/obj/effect/decal/warning_stripes{
icon_state = "cargo_arrow";
Expand Down Expand Up @@ -19256,7 +19267,7 @@
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/golden_arrow/engineering)
/area/golden_arrow/hangar_shuttle/lower)
"qds" = (
/obj/effect/decal/warning_stripes{
icon_state = "cargo"
Expand Down Expand Up @@ -19614,7 +19625,7 @@
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/golden_arrow/engineering)
/area/golden_arrow/hangar_shuttle/lower)
"txJ" = (
/obj/structure/machinery/door/poddoor/almayer{
name = "\improper Lower Storage Bay Six Blast Door";
Expand Down Expand Up @@ -20021,7 +20032,7 @@
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/golden_arrow/engineering)
/area/golden_arrow/hangar_shuttle/lower)
"xOB" = (
/obj/effect/decal/cleanable/dirt{
layer = 2.52
Expand All @@ -20047,7 +20058,7 @@
/turf/open/floor/almayer{
icon_state = "plate"
},
/area/golden_arrow/engineering)
/area/golden_arrow/hangar_shuttle/lower)
"xXR" = (
/obj/effect/decal/warning_stripes{
icon_state = "S"
Expand Down Expand Up @@ -25586,8 +25597,8 @@ wAd
oTo
fWu
hhQ
ayS
ayS
lgm
lgm
ayS
afx
fWu
Expand Down Expand Up @@ -25738,9 +25749,9 @@ bPy
kQO
fWu
pPt
ayS
ayS
ayS
lgm
lgm
lgm
qcH
fWu
ngb
Expand Down
Loading
Loading