Skip to content

Commit

Permalink
TCAF Ship Docking Fixes (#19985)
Browse files Browse the repository at this point in the history
TCAF Docking Fixes + Shuttle can dock again

---------

Co-authored-by: Ben10083 <[email protected]>
  • Loading branch information
Ben10083 and Ben10083 authored Oct 4, 2024
1 parent 424cbb8 commit 4969c73
Show file tree
Hide file tree
Showing 4 changed files with 86 additions and 11 deletions.
58 changes: 58 additions & 0 deletions html/changelogs/Ben10083 - TCAF Dock Fix.yml
Original file line number Diff line number Diff line change
@@ -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: Ben10083

# 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:
- bugfix: "TCAF shuttle should now dock and undock with Hangar properly."
17 changes: 14 additions & 3 deletions maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dm
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
/obj/effect/shuttle_landmark/tcaf_shuttle/hangar
name = "Gunship Hangar"
landmark_tag = "nav_hangar_tcaf"
docking_controller = "tcaf_dock"
docking_controller = "tcaf_shuttle_dock"
base_area = /area/tcaf_corvette/hangar
base_turf = /turf/simulated/floor/plating
movable_flags = MOVABLE_FLAG_EFFECTMOVE
Expand All @@ -123,8 +123,19 @@
landmark_tag = "nav_transit_tcaf_shuttle"
base_turf = /turf/space/transit/north

// So people know how to use the engine. There's also a pre-wired spare PACMAN.
/// So people know how to use the engine. There's also a pre-wired spare PACMAN.
/obj/item/paper/fluff/tcaf_corvette_engine_guide
name = "Antlion-class engine operational notes"
desc = "This is a handwritten list of steps to operating the combustion engine of an Antlion-class scout corvette."
info = "<font face=\"Verdana\"><b>Obey these instructions! I swear to god, if we have one single more 'mishap' I am going to see you all assigned to the Zoleth line while I pray for another Solarian invasion.<BR><BR>STEP 1: Enable the connectors to cold loop pump, and the cooling array to generator pump, to get the cold loop circulating.<BR><BR>STEP 2: Configure the gas mixer to output north, and inject the contents of as many hydrogen and oxygen tanks into the combustion chamber as you wish, at the pre-set ratio of 60% oxygen and 40% hydrogen.<BR><BR>STEP 3: Disable injection! Do not leave injection on!<BR><BR>STEP 4: Ignite the mix inside the combustion chamber, and wait for it to fully burn out. Some strain on the glass at this step is expected.<BR><BR>STEP 5: Once the fire has stopped and the contents of the tank are 100% CO2, enable circulation: I recommend 700L/s input and 500kpa output. Higher you put the output, more power it generates.<BR><BR>WARNING: If you feel it's going to break the glass, lower the blast doors and vent the chamber immediately! We have a portable generator in the back if we run out of fuel or suffer another mishap.</b></font>"
info = "<font face=\"Verdana\"><b>Obey these instructions! I swear to god, \
if we have one single more 'mishap' I am going to see you all assigned to the Zoleth line while I pray for another Solarian invasion.<BR>\
<BR>STEP 1: Enable the connectors to cold loop pump, and the cooling array to generator pump, to get the cold loop circulating.<BR>\
<BR>STEP 2: Configure the gas mixer to output north, and inject the contents of as many hydrogen and oxygen tanks into the combustion chamber as you wish, \
at the pre-set ratio of 60% oxygen and 40% hydrogen.<BR>\
<BR>STEP 3: Disable injection! Do not leave injection on!<BR>\
<BR>STEP 4: Ignite the mix inside the combustion chamber, and wait for it to fully burn out. \
Some strain on the glass at this step is expected.<BR>\
<BR>STEP 5: Once the fire has stopped and the contents of the tank are 100% CO2, \
enable circulation: I recommend 700L/s input and 500kpa output. Higher you put the output, more power it generates.<BR>\
<BR>WARNING: If you feel it's going to break the glass, lower the blast doors and vent the chamber immediately! \
We have a portable generator in the back if we run out of fuel or suffer another mishap.</b></font>"
6 changes: 6 additions & 0 deletions maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -13069,6 +13069,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 8
},
/obj/machinery/embedded_controller/radio/simple_docking_controller{
frequency = 1380;
name = "TCAF Gunship Hangar Docking Controller";
id_tag = "tcaf_shuttle_dock";
pixel_y = 24
},
/turf/simulated/floor/tiled,
/area/tcaf_corvette/hangar)
"ZZ" = (
Expand Down
16 changes: 8 additions & 8 deletions maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_landmarks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -84,20 +84,20 @@
// Docking airlock markers, for deck one.
/obj/effect/map_effect/marker/airlock/docking/tcaf_corvette/aft_dock
name = "Aft"
master_tag = "tcaf_aft_dock"
landmark_tag = "airlock_tcaf_fore_dock"
master_tag = "airlock_tcaf_aft_dock"
landmark_tag = "tcaf_corvette_aft_dock"

/obj/effect/map_effect/marker/airlock/docking/tcaf_corvette/fore_dock
name = "Fore"
master_tag = "tcaf_fore_dock"
landmark_tag = "airlock_tcaf_fore_dock"
master_tag = "airlock_tcaf_fore_dock"
landmark_tag = "tcaf_corvette_fore_dock"

/obj/effect/map_effect/marker/airlock/docking/tcaf_corvette/port_dock
name = "Port"
master_tag = "tcaf_port_dock"
landmark_tag = "airlock_tcaf_port_dock"
master_tag = "airlock_tcaf_port_dock"
landmark_tag = "tcaf_corvette_port_dock"

/obj/effect/map_effect/marker/airlock/docking/tcaf_corvette/starboard_dock
name = "Starboard"
master_tag = "tcaf_starboard_dock"
landmark_tag = "airlock_tcaf_starboard_dock"
master_tag = "airlock_tcaf_starboard_dock"
landmark_tag = "tcaf_corvette_starboard_dock"

0 comments on commit 4969c73

Please sign in to comment.