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

Hailstorm fixes and console updates (#18863)

Browse Source 
-fixes the hailstorm shuttle not docking
-fixes the hailstorm pipes not connecting to the vents
-added primitive versions for the ship computers using sprites we had
but were never implemented
This commit is contained in:
Alberyk
2024-04-08 05:28:21 -03:00
committed by GitHub
parent 49d6029d18
commit 539e2fb01f
6 changed files with 42 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/overmap/ship_weaponry/_targeting_console.dm
-1
View File
@@ -23,7 +23,6 @@
can_pass_under = FALSE
light_power_on = 1
/obj/machinery/computer/ship/targeting/Initialize()
..()
return INITIALIZE_HINT_LATELOAD
code/modules/overmap/ships/computers/sensors.dm
-1
View File
@@ -37,7 +37,6 @@
can_pass_under = FALSE
light_power_on = 1
/obj/machinery/computer/ship/sensors/Destroy()
QDEL_NULL(sound_token)
sensors = null
html/changelogs/alberyk-hailstormfixes.yml
+6
View File
@@ -0,0 +1,6 @@
author: Alberyk
delete-after: True
changes:
- rscadd: "Added primitive versions of ship computers for less advanced factions."
maps/away/ships/dpra/hailstorm/hailstorm_landmarks.dm
+5
View File
@@ -14,6 +14,11 @@
base_turf = /turf/space
movable_flags = MOVABLE_FLAG_EFFECTMOVE
/obj/effect/map_effect/marker/airlock/docking/hailstorm_shuttle/shuttle_hangar
name = "Spacer Militia Shuttle Hangar"
landmark_tag = "nav_hailstorm_shuttle"
master_tag = "hailstorm_shuttle_dock"
// ----
/obj/effect/shuttle_landmark/hailstorm_shuttle/transit
maps/away/ships/dpra/hailstorm/hailstorm_ship.dm
+1 -3
View File
@@ -7,7 +7,6 @@
spawn_weight = 1
shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/hailstorm_shuttle)
sectors = list(SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_GAKAL)
unit_test_groups = list(1)
/singleton/submap_archetype/hailstorm_ship
@@ -73,7 +72,6 @@
name = "Hailstorm Ship Navpoint #4"
landmark_tag = "nav_hailstorm_ship_4"
//shuttle
/obj/effect/overmap/visitable/ship/landable/hailstorm_shuttle
name = "Spacer Militia Shuttle"
@@ -90,7 +88,7 @@
fore_dir = NORTH
vessel_size = SHIP_SIZE_TINY
/obj/machinery/computer/shuttle_control/explore/hailstorm_shuttle
/obj/machinery/computer/shuttle_control/explore/terminal/hailstorm_shuttle
name = "shuttle control console"
shuttle_tag = "Spacer Militia Shuttle"
maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm
+30 -47
View File
@@ -202,7 +202,7 @@
dir = 4;
status = 2
},
/obj/machinery/computer/ship/targeting{
/obj/machinery/computer/ship/targeting/terminal{
dir = 1
},
/turf/simulated/floor/tiled{
@@ -285,13 +285,12 @@
},
/area/shuttle/hailstorm_shuttle)
"bc" = (
/obj/machinery/computer/ship/helm{
dir = 1;
req_access = null
},
/obj/effect/floor_decal/corner/black{
dir = 10
},
/obj/machinery/computer/ship/helm/terminal{
dir = 1
},
/turf/simulated/floor/tiled{
temperature = 278.15
},
@@ -903,13 +902,13 @@
},
/area/shuttle/hailstorm_shuttle)
"fc" = (
/obj/machinery/atmospherics/portables_connector{
dir = 4
},
/obj/machinery/portable_atmospherics/canister/air/airlock{
start_pressure = 1000.97
},
/obj/machinery/light,
/obj/machinery/atmospherics/portables_connector/aux{
dir = 4
},
/turf/simulated/floor/tiled{
temperature = 278.15
},
@@ -1102,20 +1101,19 @@
},
/area/hailstorm_ship/engine)
"gP" = (
/obj/machinery/computer/shuttle_control/explore/hailstorm_shuttle{
dir = 4
},
/obj/structure/cable/green,
/obj/machinery/power/apc/high/west{
req_access = list(214)
},
/obj/machinery/computer/shuttle_control/explore/terminal/hailstorm_shuttle{
dir = 4
},
/turf/simulated/floor/tiled{
temperature = 278.15
},
/area/shuttle/hailstorm_shuttle)
"gU" = (
/obj/machinery/computer/ship/helm{
req_access = null;
/obj/machinery/computer/ship/helm/terminal{
dir = 1
},
/turf/simulated/floor/tiled{
@@ -1616,7 +1614,6 @@
},
/area/hailstorm_ship/engine)
"lk" = (
/obj/machinery/computer/ship/sensors,
/obj/machinery/alarm/cold/north{
req_one_access = list(214)
},
@@ -1626,6 +1623,7 @@
/obj/structure/sign/flag/dpra{
pixel_x = -32
},
/obj/machinery/computer/ship/sensors/terminal,
/turf/simulated/floor/tiled{
temperature = 278.15
},
@@ -1872,20 +1870,8 @@
/turf/simulated/floor/tiled/dark,
/area/hailstorm_ship/gun_deck/second)
"nV" = (
/obj/machinery/atmospherics/portables_connector,
/obj/structure/window/reinforced{
dir = 4;
icon_state = "rwindow"
},
/obj/structure/window/reinforced{
dir = 1;
icon_state = "rwindow"
},
/obj/structure/window/reinforced{
dir = 8
},
/obj/machinery/door/window,
/obj/machinery/portable_atmospherics/canister/air/airlock,
/obj/machinery/atmospherics/portables_connector/aux,
/turf/simulated/floor/plating{
temperature = 278.15
},
@@ -1988,13 +1974,13 @@
/turf/template_noop,
/area/space)
"pg" = (
/obj/machinery/computer/ship/navigation{
dir = 1
},
/obj/effect/floor_decal/corner/black/full,
/obj/machinery/light{
dir = 8
},
/obj/machinery/computer/ship/navigation/terminal{
dir = 1
},
/turf/simulated/floor/tiled{
temperature = 278.15
},
@@ -2110,7 +2096,8 @@
dir = 4
},
/obj/machinery/door/blast/regular{
id = "hailstorm_shuttle_torpedo"
id = "hailstorm_shuttle_torpedo";
dir = 4
},
/turf/simulated/floor/plating{
temperature = 278.15
@@ -2323,16 +2310,9 @@
},
/area/shuttle/hailstorm_shuttle)
"uD" = (
/obj/machinery/computer/ship/sensors{
/obj/machinery/computer/ship/sensors/terminal{
dir = 8
},
/obj/machinery/embedded_controller/radio/docking_port_multi{
child_names_txt = "Hailstorm Shuttle Airlock";
child_tags_txt = "hailstorm_shuttle";
frequency = 1380;
id_tag = "hailstorm_shuttle";
pixel_x = 25
},
/turf/simulated/floor/tiled{
temperature = 278.15
},
@@ -2677,7 +2657,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/black{
dir = 5
},
/obj/machinery/computer/ship/engines{
/obj/machinery/computer/ship/engines/terminal{
dir = 4
},
/turf/simulated/floor/plating{
@@ -2860,6 +2840,7 @@
id_tag = "hailstorm_dock_doors";
dir = 4
},
/obj/effect/map_effect/marker/airlock/docking/hailstorm_shuttle/shuttle_hangar,
/turf/simulated/floor/tiled{
temperature = 278.15
},
@@ -3499,7 +3480,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/black{
dir = 9
},
/obj/machinery/computer/ship/engines{
/obj/machinery/computer/ship/engines/terminal{
dir = 8
},
/turf/simulated/floor/plating{
@@ -3696,11 +3677,11 @@
},
/area/hailstorm_ship/engine)
"QL" = (
/obj/machinery/computer/ship/engines,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/black,
/obj/machinery/computer/ship/engines/terminal,
/turf/simulated/floor/tiled{
temperature = 278.15
},
@@ -3870,6 +3851,7 @@
id_tag = "hailstorm_dock_doors";
dir = 4
},
/obj/effect/map_effect/marker/airlock/docking/hailstorm_shuttle/shuttle_hangar,
/turf/simulated/floor/tiled{
temperature = 278.15
},
@@ -3946,7 +3928,8 @@
id_tag = "hailstorm_shuttle_dock";
req_one_access = list(31,48,67);
tag_door = "hailstorm_dock_doors";
pixel_x = 25
pixel_x = 25;
dir = 8
},
/turf/simulated/floor/tiled{
temperature = 278.15
@@ -14488,7 +14471,7 @@ in
in
UW
in
in
cr
cr
cr
WG
@@ -15135,7 +15118,7 @@ iB
vY
iB
iB
iB
in
in
in
tC
@@ -15783,7 +15766,7 @@ iB
iB
iB
iB
iB
in
in
in
Gu
@@ -15947,7 +15930,7 @@ in
in
in
in
in
cr
Xx
in
iB