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

PRA Minor Fixes and Code Documentation (#19253)

Browse Source 
Very small fixes to PRA-related sites like the people's station and
headmaster, as well as code comment improvements to some files.

People's Station frankly has alot of bugs in part due to the system
being designed around ships, not stations

---------

Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
This commit is contained in:
Ben
2024-05-31 20:14:41 +00:00
committed by GitHub
co-authored by Ben10083
parent 8ba7366f71
commit 97661bc7fd
7 changed files with 110 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/overmap/sectors.dm
+26 -13
View File
@@ -1,18 +1,22 @@
//===================================================================================
//Overmap object representing zlevel(s)
//===================================================================================
var/global/area/overmap/map_overmap // Global object used to locate the overmap area.
/// Global object used to locate the overmap area.
var/global/area/overmap/map_overmap
/obj/effect/overmap/visitable
name = "map object"
scannable = TRUE
sensor_range_override = TRUE
var/designation //Actual name of the object.
var/class //Imagine a ship or station's class. "NTCC" Odin, "SCCV" Horizon, ...
/// Actual name of the object.
var/designation
/// Imagine a ship or station's class. "NTCC" Odin, "SCCV" Horizon, ...
var/class
unknown_id = "Bogey"
var/obfuscated_name = "unidentified object"
var/obfuscated_desc = "This object is not displaying its IFF signature."
var/obfuscated = FALSE //Whether we hide our name and class or not.
/// Whether we hide our name and class or not.
var/obfuscated = FALSE
/// Landmark tags of landmarks that should be added to the actual lists below on init.
/// Generic, meaning usable by any shuttle.
@@ -25,14 +29,20 @@ var/global/area/overmap/map_overmap // Global object used to locate the overmap
/// Can contain nested lists, as it is flattened on init.
var/list/tracked_dock_tags
var/list/generic_waypoints = list() //waypoints that any shuttle can use
var/list/restricted_waypoints = list() //waypoints for specific shuttles
/// Waypoints that any shuttle can use
var/list/generic_waypoints = list()
/// Waypoints for specific shuttles
var/list/restricted_waypoints = list()
var/start_x //Coordinates for self placing
var/start_y //will use random values if unset
/// Coordinates for self placing
var/start_x
/// Will use random values if unset
var/start_y
var/base = 0 //starting sector, counts as station_levels
var/in_space = 1 //can be accessed via lucky EVA
/// Starting sector, counts as station_levels
var/base = FALSE
/// Can be accessed via lucky EVA
var/in_space = TRUE
var/has_called_distress_beacon = FALSE
var/image/applied_distress_overlay
@@ -52,11 +62,14 @@ var/global/area/overmap/map_overmap // Global object used to locate the overmap
var/freq_name = ""
/// Whether away ship comms have access to the common channel / PUB_FREQ
var/use_common = FALSE
var/list/navigation_viewers // list of weakrefs to people viewing the overmap via this ship
/// list of weakrefs to people viewing the overmap via this ship
var/list/navigation_viewers
var/list/consoles
var/list/datalink_requests = list()// A list of datalink requests that we received
var/list/datalinked = list()// Other effects that we are datalinked with
/// A list of datalink requests that we received
var/list/datalink_requests = list()
/// Other effects that we are datalinked with
var/list/datalinked = list()
/// null | num | list. If a num or a (num, num) list, the radius or random bounds for placing this sector near the main map's overmap icon.
var/list/place_near_main
code/modules/overmap/ship_weaponry/_ship_gun.dm
+2 -1
View File
@@ -23,7 +23,8 @@
var/screenshake_type = SHIP_GUN_SCREENSHAKE_SCREEN
var/firing = FALSE //Helper variable in case we need to track if we're firing or not. Must be set manually. Used for the Leviathan.
var/load_time = 5 SECONDS
var/mobile_platform = FALSE //When toggled, targeting computers will be able to force ammunition heading direction. Used for guns on visitables.
/// When toggled, targeting computers will be able to force ammunition heading direction. Used for guns on visitables.
var/mobile_platform = FALSE
var/weapon_id //Used to identify a gun in the targeting consoles and connect weapon systems to the relevant ammunition loader. Must be unique!
var/list/obj/structure/ship_weapon_dummy/connected_dummies = list()
code/modules/overmap/ship_weaponry/projectiles/_overmap_projectiles.dm
+10 -5
View File
@@ -7,14 +7,19 @@
requires_contact = FALSE
var/obj/item/ship_ammunition/ammunition
var/atom/target //The target is the actual overmap object we're hitting.
var/obj/entry_target //The entry target is where the projectile itself is going to spawn in world.
/// The target is the actual overmap object we're hitting.
var/atom/target
/// The entry target is where the projectile itself is going to spawn in world.
var/obj/entry_target
var/range = OVERMAP_PROJECTILE_RANGE_MEDIUM
var/current_range_counter = 0
var/speed = 0 //A projectile with 0 speed does not move. Note that this is the 'lag' variable on walk_towards! Lower speed is better.
// A projectile with 0 speed does not move. Note that this is the 'lag' variable on walk_towards! Lower speed is better.
var/speed = 0
var/moving = FALSE //Is the projectile actively moving on the overmap?
var/entering = FALSE //Are we entering an entry point?
/// Is the projectile actively moving on the overmap?
var/moving = FALSE
/// Are we entering an entry point?
var/entering = FALSE
/obj/effect/overmap/projectile/Initialize(var/maploading, var/sx, var/sy)
. = ..()
html/changelogs/Ben10083 - People's Fixes.yml
+60
View File
@@ -0,0 +1,60 @@
################################
# 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:
- rscadd: "Very minor mapping fixes for People's Space Station."
- code_imp: "Code Comment improvements for Sector variables."
- spellcheck: "PRA Exploration Drone Typo Fixed."
maps/away/away_site/tajara/peoples_station/peoples_station.dmm
+10 -15
View File
@@ -21,15 +21,6 @@
temperature = 278.15
},
/area/peoples_station/training)
"ah" = (
/obj/structure/ship_weapon_dummy{
is_barrel = 1
},
/obj/effect/floor_decal/industrial/warning{
dir = 10
},
/turf/simulated/floor/reinforced/airless,
/area/peoples_station/defenses)
"ai" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4;
@@ -1032,7 +1023,9 @@
/obj/machinery/mech_recharger,
/obj/effect/floor_decal/industrial/hatch/yellow,
/mob/living/heavy_vehicle/premade/ripley/loader,
/obj/structure/sign/flag/pra/large/north,
/obj/structure/sign/flag/pra/large/north{
pixel_y = 32
},
/turf/simulated/floor/tiled/dark{
temperature = 278.15
},
@@ -3469,7 +3462,9 @@
/obj/effect/floor_decal/corner/red/full{
dir = 8
},
/obj/machinery/media/jukebox/phonograph,
/obj/machinery/media/jukebox/phonograph{
anchored = 1
},
/obj/structure/table/standard,
/turf/simulated/floor/tiled/dark{
temperature = 278.15
@@ -4880,8 +4875,8 @@
},
/area/peoples_station)
"tz" = (
/obj/structure/ship_weapon_dummy,
/obj/effect/floor_decal/industrial/warning,
/obj/structure/ship_weapon_dummy/barrel,
/turf/simulated/floor/reinforced/airless,
/area/peoples_station/defenses)
"tB" = (
@@ -7470,10 +7465,10 @@
/turf/simulated/floor/reinforced/airless,
/area/peoples_station/defenses)
"EC" = (
/obj/structure/ship_weapon_dummy,
/obj/effect/floor_decal/industrial/warning{
dir = 10
},
/obj/structure/ship_weapon_dummy/barrel,
/turf/simulated/floor/reinforced/airless,
/area/peoples_station/defenses)
"EH" = (
@@ -10113,10 +10108,10 @@
},
/area/peoples_station)
"QC" = (
/obj/structure/ship_weapon_dummy,
/obj/effect/floor_decal/industrial/warning{
dir = 6
},
/obj/structure/ship_weapon_dummy/barrel,
/turf/simulated/floor/reinforced/airless,
/area/peoples_station/defenses)
"QD" = (
@@ -40795,7 +40790,7 @@ fE
rH
rH
rH
ah
EC
Kn
Kn
Kn
maps/away/ships/pra/headmaster/headmaster_ship.dmm
+1 -1
View File
@@ -27,7 +27,7 @@
},
/area/headmaster_ship)
"ag" = (
/obj/structure/ship_weapon_dummy,
/obj/structure/ship_weapon_dummy/barrel,
/turf/template_noop,
/area/space)
"ai" = (
maps/random_ruins/exoplanets/raskara/pra_exploration_drone.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/datum/map_template/ruin/exoplanet/pra_exploration_drone
name = "PRA Explorion Drone"
name = "PRA Exploration Drone"
id = "pra_exploration_drone"
description = "A exploration drone sent by the People's Republic to explore the surface of this planet."