cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 15:01:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ops lift extended to third deck (#16867)

Browse Source 
* m

* a

* a

* a

* a

* a

* a

* fix post merge

* lift!!!!!

* req console fix

* a

* third deck landmark fix

* fix stuff

* CHANGELOG

* changelog.....

* CHANGELOGGGGGGGGGGG

* tests rerun please

* tests rerun please

* tests rerun please

* potted plant replace?

* post merge fix

* cmo office reinf walls

---------

Co-authored-by: DreamySkrell <>
This commit is contained in:
DreamySkrell
2023-08-04 11:31:50 +00:00
committed by GitHub
co-authored by DreamySkrell <>
parent fb7db43be2
commit d30086aa71
7 changed files with 1775 additions and 1183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/changelogs/DreamySkrell-ops-lift-3515.yml
+42
View File
@@ -0,0 +1,42 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: DreamySkrell
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- maptweak: "Extends the operations lift to third deck, to a new auxiliary operations office."
- maptweak: "Top deck medbay is rearranged slightly to accomodate the new auxiliary operations office."
maps/sccv_horizon/code/sccv_horizon.dm
+1 -1
View File
@@ -99,8 +99,8 @@
map_shuttles = list(
/datum/shuttle/autodock/ferry/lift/scc_ship/cargo,
/datum/shuttle/autodock/ferry/lift/scc_ship/morgue,
/datum/shuttle/autodock/multi/lift/operations,
/datum/shuttle/autodock/multi/lift/robotics,
/datum/shuttle/autodock/ferry/escape_pod/pod/escape_pod1,
/datum/shuttle/autodock/ferry/escape_pod/pod/escape_pod2,
maps/sccv_horizon/code/sccv_horizon_areas.dm
+5
View File
@@ -176,6 +176,11 @@
icon_state = "quartoffice"
sound_env = MEDIUM_SOFTFLOOR
/area/operations/office_aux
name = "Operations Office (Aux)"
icon_state = "quartoffice"
sound_env = MEDIUM_SOFTFLOOR
/area/operations/mail_room
name = "Operations Mail Room"
icon_state = "red"
maps/sccv_horizon/code/sccv_horizon_lifts.dm
+44 -26
View File
@@ -73,32 +73,6 @@
lift_floor_label = "Deck 2"
lift_floor_name = "Main Deck"
//Cargo Lift
/datum/shuttle/autodock/ferry/lift/scc_ship/cargo
name = "Operations Lift"
location = 1
shuttle_area = /area/turbolift/scc_ship/cargo_lift
waypoint_station = "nav_cargo_lift_bottom"
waypoint_offsite = "nav_cargo_lift_top"
/obj/effect/shuttle_landmark/lift/cargo_top
name = "Operations Top"
landmark_tag = "nav_cargo_lift_top"
base_area = /area/operations/storage
base_turf = /turf/simulated/open
/obj/effect/shuttle_landmark/lift/cargo_bottom
name = "Operations Bottom"
landmark_tag = "nav_cargo_lift_bottom"
flags = SLANDMARK_FLAG_AUTOSET
base_area = /area/operations/loading
base_turf = /turf/simulated/floor/plating
/area/turbolift/scc_ship/cargo_lift
name = "Operations Lift"
sound_env = STANDARD_STATION
ambience = AMBIENCE_HANGAR
//Morgue Lift
/datum/shuttle/autodock/ferry/lift/scc_ship/morgue
name = "Morgue Lift"
@@ -125,6 +99,50 @@
sound_env = TUNNEL_ENCLOSED
ambience = AMBIENCE_GHOSTLY
//Operations Lift
/datum/shuttle/autodock/multi/lift/operations
name = "Operations Lift"
current_location = "nav_operations_lift_second_deck"
shuttle_area = /area/turbolift/scc_ship/operations_lift
destination_tags = list(
"nav_operations_lift_first_deck",
"nav_operations_lift_second_deck",
"nav_operations_lift_third_deck"
)
/obj/effect/shuttle_landmark/lift/operations_first_deck
name = "Operations Lift - First Deck"
landmark_tag = "nav_operations_lift_first_deck"
flags = SLANDMARK_FLAG_AUTOSET
base_area = /area/operations/loading
base_turf = /turf/simulated/floor/plating
/obj/effect/shuttle_landmark/lift/operations_second_deck
name = "Operations Lift - Second Deck"
landmark_tag = "nav_operations_lift_second_deck"
landmark_flags = SLANDMARK_FLAG_AUTOSET
base_area = /area/operations/storage
base_turf = /turf/simulated/open
/obj/effect/shuttle_landmark/lift/operations_third_deck
name = "Operations Lift - Third Deck"
landmark_tag = "nav_operations_lift_third_deck"
landmark_flags = SLANDMARK_FLAG_AUTOSET
base_area = /area/operations/office_aux
base_turf = /turf/simulated/open
/obj/machinery/computer/shuttle_control/multi/lift/operations
shuttle_tag = "Operations Lift"
/obj/machinery/computer/shuttle_control/multi/lift/wall/operations
shuttle_tag = "Operations Lift"
/area/turbolift/scc_ship/operations_lift
name = "Operations Lift"
sound_env = TUNNEL_ENCLOSED
ambience = AMBIENCE_GHOSTLY
//Robotics Lift
/datum/shuttle/autodock/multi/lift/robotics
name = "Robotics Lift 2"
maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
+34 -10
View File
@@ -3054,6 +3054,10 @@
},
/turf/simulated/floor/plating,
/area/turbolift/research/deck_1)
"clf" = (
/obj/effect/shuttle_landmark/lift/operations_first_deck,
/turf/simulated/floor/plating,
/area/operations/loading)
"clG" = (
/obj/structure/window/shuttle/scc_space_ship,
/obj/structure/grille,
@@ -3287,6 +3291,29 @@
/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
"crZ" = (
/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/floor_decal/corner/brown{
dir = 5
},
/obj/machinery/computer/shuttle_control/multi/lift/wall/operations{
dir = 2;
pixel_x = -26;
pixel_y = 26
},
/turf/simulated/floor/tiled,
/area/operations/loading)
"cty" = (
/obj/structure/closet/crate,
/obj/effect/floor_decal/corner/brown{
@@ -5549,10 +5576,6 @@
/mob/living/simple_animal/chicken,
/turf/simulated/floor/grass/alt,
/area/horizon/hydroponics/lower)
"dWC" = (
/obj/effect/shuttle_landmark/lift/cargo_bottom,
/turf/simulated/floor/plating,
/area/operations/loading)
"dWD" = (
/obj/machinery/camera/network/mining{
c_tag = "Mining - Suit Storage";
@@ -24771,6 +24794,11 @@
/obj/effect/floor_decal/corner/brown/full{
dir = 8
},
/obj/machinery/computer/shuttle_control/multi/lift/wall/operations{
dir = 2;
pixel_x = -8;
pixel_y = 26
},
/turf/simulated/floor/tiled,
/area/operations/loading)
"rpB" = (
@@ -25893,10 +25921,6 @@
name = "Deck 1 Warehouse - Operations Shuttle";
sortType = "Deck 1 Warehouse - Operations Shuttle"
},
/obj/machinery/computer/shuttle_control/lift/wall{
pixel_y = 32;
shuttle_tag = "Operations Lift"
},
/obj/effect/floor_decal/corner/brown{
dir = 5
},
@@ -47854,7 +47878,7 @@ gvZ
uzB
uzB
ulE
ehD
crZ
qDJ
wlh
gvZ
@@ -48054,8 +48078,8 @@ pqh
qkh
vqU
gvZ
clf
uzB
dWC
hRn
ehD
qDJ
maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+16 -22
View File
@@ -1265,13 +1265,13 @@
/obj/effect/floor_decal/industrial/warning{
dir = 5
},
/obj/machinery/computer/shuttle_control/lift{
pixel_x = 9;
pixel_y = 23;
shuttle_tag = "Operations Lift"
/obj/effect/shuttle_landmark/lift/operations_second_deck,
/obj/machinery/computer/shuttle_control/multi/lift/operations{
pixel_x = 11;
pixel_y = 18
},
/turf/simulated/floor/tiled/dark/full,
/area/turbolift/scc_ship/cargo_lift)
/area/turbolift/scc_ship/operations_lift)
"aBr" = (
/obj/effect/floor_decal/corner/mauve{
dir = 5
@@ -15616,7 +15616,7 @@
dir = 9
},
/turf/simulated/floor/tiled/dark/full,
/area/turbolift/scc_ship/cargo_lift)
/area/turbolift/scc_ship/operations_lift)
"hzC" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -16320,13 +16320,8 @@
/obj/effect/floor_decal/industrial/warning{
dir = 10
},
/obj/machinery/computer/shuttle_control/lift{
pixel_x = -7;
pixel_y = -2;
shuttle_tag = "Operations Lift"
},
/turf/simulated/floor/tiled/dark/full,
/area/turbolift/scc_ship/cargo_lift)
/area/turbolift/scc_ship/operations_lift)
"hQI" = (
/obj/effect/floor_decal/spline/fancy/wood{
dir = 4
@@ -23196,12 +23191,11 @@
/turf/simulated/floor/tiled/full,
/area/engineering/engine_airlock)
"llp" = (
/obj/effect/shuttle_landmark/lift/cargo_top,
/obj/effect/floor_decal/industrial/warning{
dir = 6
},
/turf/simulated/floor/tiled/dark/full,
/area/turbolift/scc_ship/cargo_lift)
/area/turbolift/scc_ship/operations_lift)
"llB" = (
/obj/machinery/light/small{
dir = 4
@@ -26231,15 +26225,15 @@
/obj/effect/floor_decal/corner/brown{
dir = 6
},
/obj/machinery/computer/shuttle_control/lift/wall{
dir = 8;
pixel_x = 32;
shuttle_tag = "Operations Lift"
},
/obj/machinery/camera/network/supply{
c_tag = "Operations - Upper Warehouse Port";
dir = 8
},
/obj/machinery/computer/shuttle_control/multi/lift/wall/operations{
dir = 8;
pixel_x = 26;
pixel_y = -8
},
/turf/simulated/floor/tiled,
/area/operations/office)
"mKD" = (
@@ -50203,10 +50197,10 @@
/obj/effect/floor_decal/corner/brown/full{
dir = 1
},
/obj/machinery/computer/shuttle_control/lift/wall{
/obj/machinery/computer/shuttle_control/multi/lift/wall/operations{
dir = 8;
pixel_x = 32;
shuttle_tag = "Operations Lift"
pixel_x = 26;
pixel_y = 8
},
/turf/simulated/floor/tiled,
/area/operations/office)
maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
+1633 -1124
View File
File diff suppressed because it is too large Load Diff