diff --git a/code/modules/overmap/ships/ship.dm b/code/modules/overmap/ships/ship.dm index e932bfd0eb6..2d0250b73c6 100644 --- a/code/modules/overmap/ships/ship.dm +++ b/code/modules/overmap/ships/ship.dm @@ -31,28 +31,37 @@ var/const/OVERMAP_SPEED_CONSTANT = (1 SECOND) var/list/known_ships = list() //List of ships known at roundstart - put types here. var/base_sensor_visibility - vessel_mass = 10000 //tonnes, arbitrary number, affects acceleration provided by engines - var/vessel_size = SHIP_SIZE_LARGE //arbitrary number, affects how likely are we to evade meteors - var/max_speed = 1/(1 SECOND) //"speed of light" for the ship, in turfs/tick. - var/min_speed = 1/(2 MINUTES) // Below this, we round speed to 0 to avoid math errors. + /// Tonnes, arbitrary number, affects acceleration provided by engines. Will help determine the speed of the ship. + vessel_mass = 10000 + /// Arbitrary number, affects how likely the ship is to evade meteors. + var/vessel_size = SHIP_SIZE_LARGE + /// The "speed of light" for the ship, in turfs/tick. + var/max_speed = 1/(1 SECOND) + /// Below this, we round speed to 0 to avoid math errors. + var/min_speed = 1/(2 MINUTES) - var/list/speed = list(0,0) //speed in x,y direction - var/list/position = list(0,0) // position within a tile. - var/last_burn = 0 // worldtime when ship last acceleated - var/burn_delay = 1 SECOND // how often ship can do burns - var/fore_dir = NORTH // what dir ship flies towards for purpose of moving stars effect procs + /// Ship speed in x,y direction + var/list/speed = list(0,0) + /// The ship's position within a tile. + var/list/position = list(0,0) + /// The worldtime when ship last accelerated + var/last_burn = 0 + /// Determines how often the ship can accelerate or decelerate. + var/burn_delay = 1 SECOND + /// The direction ships fly towards. Make sure this is correct or else entry points will not work correctly. + var/fore_dir = NORTH var/last_combat_roll = 0 var/last_turn = 0 var/last_combat_turn = 0 var/list/engines = list() - var/engines_state = 0 //global on/off toggle for all engines - var/thrust_limit = 1 //global thrust limit for all engines, 0..1 - var/halted = 0 //admin halt or other stop. + var/engines_state = 0 // Global on/off toggle for all engines. + var/thrust_limit = 1 // Global thrust limit for all engines, 0..1 + var/halted = 0 // Admin halt or other stop. comms_support = TRUE - var/list/colors = list() //Pick a color from this list on init + var/list/colors = list() // Pick a color from this list on init. /obj/effect/overmap/visitable/ship/Initialize() . = ..() diff --git a/html/changelogs/hazelmouse-dirshenanigans.yml b/html/changelogs/hazelmouse-dirshenanigans.yml new file mode 100644 index 00000000000..da9accb2fd8 --- /dev/null +++ b/html/changelogs/hazelmouse-dirshenanigans.yml @@ -0,0 +1,59 @@ +################################ +# 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: hazelmouse + +# 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: "Fixed the fore directions of a few ships and shuttles so they can be correctly targeted in ship combat." + - qol: "Adds some DMDocs for ship variables" diff --git a/maps/away/away_site/tajara/scrapper/scrapper.dm b/maps/away/away_site/tajara/scrapper/scrapper.dm index a0cfc1dcd4b..254e454b3a3 100644 --- a/maps/away/away_site/tajara/scrapper/scrapper.dm +++ b/maps/away/away_site/tajara/scrapper/scrapper.dm @@ -64,7 +64,7 @@ max_speed = 1/(3 SECONDS) burn_delay = 2 SECONDS vessel_mass = 3000 //very inefficient pod - fore_dir = NORTH + fore_dir = SOUTH vessel_size = SHIP_SIZE_TINY /obj/effect/overmap/visitable/ship/landable/tajara_scrapper/New() diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm index d48fd800d3d..7196743fa67 100644 --- a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm +++ b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm @@ -33,7 +33,7 @@ shiptype = "Short-distance military tasking, low-level naval interdiction" vessel_mass = 10000 max_speed = 1/(2 SECONDS) - fore_dir = NORTH + fore_dir = SOUTH vessel_size = SHIP_SIZE_SMALL initial_generic_waypoints = list( "nav_hailstorm_ship_1", diff --git a/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dm b/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dm index b29f657dc45..b6bb14a51f2 100644 --- a/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dm +++ b/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dm @@ -118,7 +118,7 @@ max_speed = 1/(3 SECONDS) burn_delay = 2 SECONDS vessel_mass = 3000 //very inefficient pod - fore_dir = NORTH + fore_dir = SOUTH vessel_size = SHIP_SIZE_TINY /obj/machinery/computer/shuttle_control/explore/fsf_shuttle diff --git a/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dm b/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dm index 77ad0cf0e5e..2420aadd0df 100644 --- a/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dm +++ b/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dm @@ -181,7 +181,7 @@ max_speed = 1/(3 SECONDS) burn_delay = 2 SECONDS vessel_mass = 3000 //very inefficient pod - fore_dir = NORTH + fore_dir = SOUTH vessel_size = SHIP_SIZE_TINY /obj/machinery/computer/shuttle_control/explore/sfa_shuttle diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm index 4126927dedf..f14ad1a0123 100644 --- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm +++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm @@ -84,7 +84,7 @@ max_speed = 1/(3 SECONDS) burn_delay = 2 SECONDS vessel_mass = 3000 //very inefficient pod - fore_dir = NORTH + fore_dir = SOUTH vessel_size = SHIP_SIZE_TINY /obj/machinery/computer/shuttle_control/explore/tajaran_smuggler_shuttle @@ -123,7 +123,7 @@ max_speed = 1/(3 SECONDS) burn_delay = 2 SECONDS vessel_mass = 3000 //very inefficient pod - fore_dir = NORTH + fore_dir = SOUTH vessel_size = SHIP_SIZE_TINY /obj/machinery/computer/shuttle_control/explore/tajaran_smuggler_cargo