Canary minor qol (#19011)

Flips the sensor and landing control sprites for the canary consoles so
they'd fit on the opposite sides, swaps the pipes around for the fuel to
thrusters, to accomodate moving the pump for the fuel can inside, and
shifts the sensors and engine control consoles around so the WSO has the
Sensors and gun, and the pilot has the engines, landing control, and
helm.

Requested by Firstact.
This commit is contained in:
LynxSolstice
2024-05-01 22:34:56 +00:00
committed by GitHub
parent 3e43bea584
commit 27e616c673
5 changed files with 147 additions and 72 deletions
@@ -26,6 +26,15 @@
icon_keyboard = null
circuit = null
/obj/machinery/computer/ship/sensors/cockpit/right
density = 0
icon = 'icons/obj/cockpit_console.dmi'
working_sound = 'sound/machines/sensors/ping.ogg'
icon_state = "right_wide"
icon_screen = "sensors_right"
icon_keyboard = null
circuit = null
/obj/machinery/computer/ship/sensors/terminal
name = "sensors terminal"
icon = 'icons/obj/machinery/modular_terminal.dmi'
@@ -0,0 +1,58 @@
################################
# 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
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################
# Your name.
author: LynxSolstice
# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- qol: "Swaps the sensors console to the WSO in the Canary, the Engine controls to the pilot, and moves the fuel pump for the fuel can to the thrusters, internally."
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

@@ -164,3 +164,14 @@
icon_keyboard = null
circuit = null
/obj/machinery/computer/shuttle_control/explore/canary/left
name = "\improper Canary control console"
shuttle_tag = "Canary"
req_access = list(ACCESS_INTREPID)
density = 0
icon = 'icons/obj/cockpit_console.dmi'
icon_state = "left"
icon_screen = "blue_left"
icon_keyboard = null
circuit = null
+69 -72
View File
@@ -663,7 +663,7 @@
"aBK" = (
/obj/structure/shuttle_part/scc/scout{
density = 0;
icon_state = "1,12";
icon_state = "1,12"
},
/turf/simulated/floor/plating,
/area/shuttle/canary)
@@ -1200,7 +1200,7 @@
/area/hangar/intrepid)
"aUC" = (
/obj/structure/table/rack{
dir = 8;
dir = 8
},
/obj/effect/floor_decal/corner/yellow/diagonal,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -1518,7 +1518,7 @@
/area/engineering/atmos/propulsion/starboard)
"beF" = (
/obj/structure/table/rack{
dir = 8;
dir = 8
},
/obj/item/storage/toolbox/electrical,
/obj/item/storage/toolbox,
@@ -1594,7 +1594,7 @@
outside_part = 0
},
/obj/structure/window/shuttle/unique/scc/tall{
icon_state = "short1_top";
icon_state = "short1_top"
},
/turf/simulated/floor/plating,
/area/shuttle/intrepid/quarters)
@@ -2095,7 +2095,7 @@
dir = 1
},
/obj/structure/sign/emergency/evacuation{
dir = 4;
dir = 4
},
/turf/simulated/floor/tiled,
/area/hangar/auxiliary)
@@ -2494,7 +2494,7 @@
"bKP" = (
/obj/machinery/conveyor{
dir = 1;
id = "mining_2";
id = "mining_2"
},
/obj/structure/plasticflaps/mining,
/turf/simulated/floor/plating,
@@ -3443,10 +3443,10 @@
},
/obj/machinery/light/spot,
/obj/structure/bed/stool/chair/cockpit,
/obj/machinery/computer/shuttle_control/explore/canary{
pixel_x = 25
/obj/machinery/computer/ship/engines/cockpit{
pixel_x = 26
},
/obj/machinery/computer/ship/sensors/cockpit{
/obj/machinery/computer/shuttle_control/explore/canary/left{
pixel_x = -25
},
/turf/simulated/floor/carpet/rubber,
@@ -3658,7 +3658,6 @@
/turf/simulated/floor/tiled/white,
/area/rnd/xenoarch_atrium)
"czo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/obj/effect/landmark/entry_point/port{
name = "port, compartment"
},
@@ -4402,7 +4401,9 @@
/turf/space/dynamic,
/area/horizon/exterior)
"day" = (
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 10
},
/turf/simulated/wall/shuttle/unique/scc/scout{
icon_state = "6,6"
},
@@ -4594,7 +4595,7 @@
"dir" = (
/obj/structure/lattice/catwalk/indoor,
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1;
dir = 1
},
/obj/effect/map_effect/marker/airlock/shuttle{
cycle_to_external_air = 1;
@@ -4678,7 +4679,7 @@
dir = 4
},
/obj/structure/table/rack{
dir = 8;
dir = 8
},
/obj/item/device/suit_cooling_unit,
/obj/item/device/suit_cooling_unit,
@@ -4943,7 +4944,7 @@
/area/maintenance/wing/starboard/deck1)
"dsT" = (
/obj/structure/table/rack{
dir = 8;
dir = 8
},
/obj/effect/floor_decal/corner_wide/blue/full,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -6324,7 +6325,7 @@
outside_part = 0
},
/obj/structure/window/shuttle/unique/scc/tall{
icon_state = "short2_top";
icon_state = "short2_top"
},
/turf/simulated/floor/plating,
/area/shuttle/intrepid/crew_compartment)
@@ -7288,7 +7289,7 @@
dir = 1
},
/obj/structure/table/rack{
dir = 8;
dir = 8
},
/obj/item/stock_parts/matter_bin{
pixel_y = 8
@@ -8923,8 +8924,7 @@
},
/area/shuttle/mining)
"fZQ" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume,
/obj/machinery/access_button{
dir = 4;
pixel_x = -22;
@@ -9035,8 +9035,7 @@
/obj/structure/window/shuttle/scc_space_ship,
/obj/structure/grille,
/obj/machinery/door/firedoor,
/obj/structure/stairs_lower/stairs_upper{
},
/obj/structure/stairs_lower/stairs_upper,
/turf/simulated/floor/plating,
/area/maintenance/wing/starboard/deck1)
"gds" = (
@@ -9260,7 +9259,7 @@
"glb" = (
/obj/structure/railing/mapped,
/obj/structure/sign/emergency/evacuation{
dir = 8;
dir = 8
},
/turf/simulated/floor/tiled,
/area/hangar/operations)
@@ -10745,7 +10744,7 @@
"hmD" = (
/obj/structure/shuttle_part/scc/scout{
density = 0;
icon_state = "7,11";
icon_state = "7,11"
},
/turf/simulated/floor/plating,
/area/shuttle/canary)
@@ -10996,7 +10995,7 @@
/area/engineering/atmos/air)
"hwy" = (
/obj/structure/table/rack{
dir = 8;
dir = 8
},
/obj/item/tank/jetpack/carbondioxide,
/obj/item/tank/jetpack/carbondioxide,
@@ -11250,7 +11249,7 @@
/area/engineering/storage/tech)
"hEh" = (
/obj/machinery/conveyor{
id = "mining_1";
id = "mining_1"
},
/obj/machinery/door/firedoor,
/obj/structure/plasticflaps/mining,
@@ -11494,7 +11493,7 @@
"hPZ" = (
/obj/structure/shuttle_part/scc/scout{
density = 0;
icon_state = "1,11";
icon_state = "1,11"
},
/turf/simulated/floor/plating,
/area/shuttle/canary)
@@ -13918,7 +13917,7 @@
"jDU" = (
/obj/machinery/conveyor{
dir = 8;
id = "warehousetomail";
id = "warehousetomail"
},
/obj/effect/floor_decal/corner/brown{
dir = 9
@@ -14692,7 +14691,7 @@
welded = 1
},
/obj/item/tape/engineering{
icon_state = "engineering_door";
icon_state = "engineering_door"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -14760,7 +14759,7 @@
},
/obj/structure/lattice/catwalk/indoor,
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1;
dir = 1
},
/obj/effect/map_effect/marker/airlock/shuttle{
cycle_to_external_air = 1;
@@ -14938,7 +14937,7 @@
"koV" = (
/obj/effect/floor_decal/industrial/warning,
/obj/machinery/atmospherics/portables_connector{
dir = 1;
dir = 1
},
/turf/simulated/floor/reinforced,
/area/shuttle/intrepid/quarters)
@@ -15161,8 +15160,7 @@
/turf/simulated/floor/tiled/dark/full,
/area/horizon/custodial/disposals)
"kxk" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume,
/obj/structure/lattice/catwalk/indoor/grate,
/obj/structure/bed/handrail{
dir = 8
@@ -17497,10 +17495,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
/obj/machinery/atmospherics/binary/pump/fuel{
dir = 1;
name = "Fuel Tank to Thrusters"
},
/obj/machinery/atmospherics/pipe/simple/visible/fuel,
/turf/simulated/floor/reinforced,
/area/shuttle/canary)
"maM" = (
@@ -17664,6 +17659,10 @@
dir = 8
},
/obj/machinery/power/apc/canary/east,
/obj/machinery/atmospherics/binary/pump/fuel{
dir = 1;
name = "Fuel Tank to Thrusters"
},
/turf/simulated/floor/tiled/dark/full,
/area/shuttle/canary)
"mhb" = (
@@ -18379,7 +18378,7 @@
/area/hangar/auxiliary)
"mFO" = (
/obj/structure/sign/emergency/evacuation{
dir = 8;
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
@@ -19042,7 +19041,6 @@
/obj/effect/floor_decal/corner/dark_blue{
dir = 6
},
/obj/machinery/atmospherics/pipe/manifold/hidden/fuel,
/obj/machinery/meter{
name = "Fuel Reserve";
pixel_x = -23;
@@ -19063,6 +19061,7 @@
/obj/item/rig/eva/pilot/equipped{
pixel_x = -5
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel,
/turf/simulated/floor/tiled/dark/full,
/area/shuttle/canary)
"ncq" = (
@@ -19120,7 +19119,7 @@
"ndI" = (
/obj/structure/shuttle_part/scc/scout{
density = 0;
icon_state = "2,12";
icon_state = "2,12"
},
/turf/simulated/floor/plating,
/area/shuttle/canary)
@@ -19653,8 +19652,7 @@
/turf/simulated/floor/tiled/dark,
/area/hangar/control)
"nvn" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume,
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/door/blast/shutters/open{
dir = 2;
@@ -20516,7 +20514,7 @@
"nYB" = (
/obj/machinery/conveyor{
dir = 8;
id = "warehousetomail";
id = "warehousetomail"
},
/obj/machinery/door/firedoor,
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -20845,7 +20843,7 @@
"oji" = (
/obj/structure/shuttle_part/scc/scout{
density = 0;
icon_state = "7,12";
icon_state = "7,12"
},
/turf/simulated/floor/plating,
/area/shuttle/canary)
@@ -20854,7 +20852,7 @@
dir = 10
},
/obj/structure/sign/emergency/evacuation{
dir = 8;
dir = 8
},
/turf/simulated/floor/tiled,
/area/horizon/stairwell/central)
@@ -21316,7 +21314,7 @@
"oDv" = (
/obj/machinery/conveyor{
dir = 8;
id = "mining_2";
id = "mining_2"
},
/obj/structure/railing/mapped{
dir = 1
@@ -21575,8 +21573,8 @@
opacity = 1;
outside_part = 0
},
/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
dir = 4
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 9
},
/turf/simulated/floor/reinforced{
blocks_air = 1;
@@ -22033,7 +22031,7 @@
/area/engineering/atmos)
"pfQ" = (
/obj/structure/table/rack{
dir = 8;
dir = 8
},
/obj/item/device/flash,
/obj/item/device/flash,
@@ -23202,8 +23200,7 @@
/obj/structure/window/shuttle/unique/scc/research/over{
density = 0
},
/obj/machinery/computer/ship/helm/cockpit{
},
/obj/machinery/computer/ship/helm/cockpit,
/obj/effect/floor_decal/corner/dark_blue{
dir = 5
},
@@ -23221,8 +23218,7 @@
/area/engineering/atmos)
"pTp" = (
/obj/structure/lattice/catwalk/indoor,
/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux,
/obj/effect/map_effect/marker/airlock/shuttle{
cycle_to_external_air = 1;
master_tag = "airlock_shuttle_intrepid";
@@ -23326,7 +23322,7 @@
"pWZ" = (
/obj/machinery/conveyor{
dir = 1;
id = "mining_1";
id = "mining_1"
},
/obj/structure/plasticflaps/mining,
/turf/simulated/floor/plating,
@@ -24672,7 +24668,7 @@
"qSi" = (
/obj/structure/shuttle_part/scc/scout{
density = 0;
icon_state = "6,12";
icon_state = "6,12"
},
/turf/simulated/floor/plating,
/area/shuttle/canary)
@@ -24902,7 +24898,7 @@
welded = 1
},
/obj/item/tape/engineering{
icon_state = "engineering_door";
icon_state = "engineering_door"
},
/obj/structure/cable/yellow{
d1 = 1;
@@ -27049,7 +27045,7 @@
icon_state = "1-4"
},
/obj/structure/platform_deco{
dir = 4;
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/rnd/xenoarch_atrium)
@@ -27193,7 +27189,7 @@
},
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/structure/table/rack{
dir = 8;
dir = 8
},
/obj/item/device/suit_cooling_unit,
/obj/item/device/suit_cooling_unit,
@@ -27589,6 +27585,9 @@
pixel_x = 23;
pixel_y = -9
},
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 5
},
/turf/simulated/floor/tiled/dark/full,
/area/shuttle/canary)
"sWq" = (
@@ -28167,7 +28166,7 @@
/area/engineering/atmos/propulsion/starboard)
"tsv" = (
/obj/structure/table/rack{
dir = 8;
dir = 8
},
/obj/effect/floor_decal/corner/yellow/diagonal,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -28675,7 +28674,7 @@
"tIS" = (
/obj/machinery/conveyor{
dir = 8;
id = "mining_1";
id = "mining_1"
},
/turf/simulated/floor/plating,
/area/outpost/mining_main/refinery)
@@ -28811,7 +28810,7 @@
pixel_y = -8
},
/obj/structure/table/rack{
dir = 8;
dir = 8
},
/obj/machinery/power/apc/north,
/turf/simulated/floor/tiled/dark,
@@ -29134,7 +29133,7 @@
"tYS" = (
/obj/machinery/conveyor{
dir = 1;
id = "mining_2";
id = "mining_2"
},
/turf/simulated/floor/plating,
/area/outpost/mining_main/refinery)
@@ -31716,7 +31715,7 @@
/area/maintenance/wing/starboard/deck1)
"vKa" = (
/obj/machinery/conveyor{
id = "mining_2";
id = "mining_2"
},
/obj/machinery/door/firedoor,
/obj/structure/plasticflaps/mining,
@@ -32687,7 +32686,7 @@
/area/operations/storage)
"wsF" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
dir = 4;
dir = 4
},
/turf/simulated/floor/reinforced/airless,
/area/engineering/atmos/propulsion)
@@ -33143,7 +33142,7 @@
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/table/rack{
dir = 8;
dir = 8
},
/obj/effect/floor_decal/corner/yellow/diagonal,
/obj/machinery/light/small,
@@ -33281,8 +33280,8 @@
pixel_x = -25
},
/obj/structure/bed/stool/chair/cockpit,
/obj/machinery/computer/ship/engines/cockpit{
pixel_x = 26
/obj/machinery/computer/ship/sensors/cockpit/right{
pixel_x = 25
},
/turf/simulated/floor/carpet/rubber,
/area/shuttle/canary)
@@ -33878,8 +33877,7 @@
dir = 4
},
/obj/structure/lattice/catwalk/indoor,
/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux,
/obj/effect/map_effect/marker/airlock/shuttle{
cycle_to_external_air = 1;
master_tag = "airlock_shuttle_intrepid";
@@ -34227,8 +34225,7 @@
/turf/simulated/floor/tiled/dark/full,
/area/turbolift/scc_ship/operations_lift)
"xqo" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux,
/obj/structure/lattice/catwalk/indoor,
/obj/item/device/radio/intercom/expedition/east,
/obj/effect/map_effect/marker/airlock/shuttle{
@@ -34831,7 +34828,7 @@
/area/maintenance/research_port)
"xLq" = (
/obj/structure/table/rack{
dir = 8;
dir = 8
},
/obj/effect/floor_decal/corner_wide/blue/full{
dir = 8
@@ -35456,7 +35453,7 @@
dir = 1
},
/obj/structure/table/rack{
dir = 8;
dir = 8
},
/obj/item/device/flash{
pixel_x = -4;
@@ -35566,7 +35563,7 @@
},
/obj/structure/lattice/catwalk/indoor,
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1;
dir = 1
},
/obj/effect/map_effect/marker/airlock/shuttle{
cycle_to_external_air = 1;