cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some issues with custom shuttles' initial docks (#91312)

Browse Source 
## About The Pull Request

The initial dock for a custom shuttle - created when the shuttle is -
had the name of the shuttle area it was created in, rather than the name
of the area underneath the shuttle. Additionally, this dock was not
deleted when the shuttle left, preventing it from setting down a dock
back at that initial location. This PR fixes both of those issues.

## Why It's Good For The Game

Fixes an issue someone on Manuel couldn't be bothered to open on github
due to lack of motivation.

## Changelog

🆑
fix: An initially created custom shuttle will no longer state it is
located at some place within itself.
fix: Custom shuttles will no longer have their docking computers blocked
by the area they were initially created at.
/🆑
This commit is contained in:
Y0SH1M4S73R
2025-05-29 16:15:21 -04:00
committed by Roxy
parent 03b48b96ee
commit f211db92bb
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/shuttle.dm
+11 -6
View File
@@ -378,6 +378,15 @@ GLOBAL_LIST_EMPTY(shuttle_frames_by_turf)
CRASH("docking_port_type must be /obj/docking_port/mobile or a subpath")
if(!ispath(area_type, /area/shuttle))
CRASH("area_type must be /area/shuttle or a subpath")
if(!istype(dock_at))
dock_at = new(origin)
dock_at.unregister()
dock_at.delete_after = TRUE
dock_at.shuttle_id = null
var/area/origin_area = get_area(origin)
dock_at.name = origin_area.name
dock_at.dir = port_dir
var/list/default_area_turfs = turfs.Copy()
// Convert each custom area into a shuttle area, then remove the affected turfs from the list of turfs to add to the default area
var/list/shuttle_areas = list()
@@ -426,13 +435,9 @@ GLOBAL_LIST_EMPTY(shuttle_frames_by_turf)
new_ceiling.stack_ontop_of_baseturf(/turf/open/openspace, /turf/open/floor/engine/hull/ceiling)
new_ceiling.stack_ontop_of_baseturf(/turf/open/space/openspace, /turf/open/floor/engine/hull/ceiling)
if(!istype(dock_at))
dock_at = new(origin)
var/area/origin_area = get_area(origin)
dock_at.name = origin_area.name
dock_at.dir = port_dir
mobile_port.register(replace, custom)
if(mobile_port.get_docked() != dock_at)
mobile_port.initiate_docking(dock_at, force = TRUE)
message_admins("[key_name(user)] has created a shuttle at [ADMIN_VERBOSEJMP(origin)].")
log_shuttle("[key_name(user)] has created a shuttle at [get_area(origin)].")