From 19faeefc895de5c8d48fed4c9716c9521484cf56 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Mon, 24 Jun 2024 23:32:58 -0400 Subject: [PATCH] Fixes2 (#2399) * Update CentCom.dmm * Update shuttle.dm * Update Blueshift.dmm * Update shuttle.dm * ? * Update CentCom.dmm * ... * Update CentCom.dmm --- _maps/blueshift.json | 1 - _maps/map_files/generic/CentCom.dmm | 2 +- code/modules/shuttle/shuttle.dm | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/_maps/blueshift.json b/_maps/blueshift.json index 15c2b52ef814..2a685910e3c0 100644 --- a/_maps/blueshift.json +++ b/_maps/blueshift.json @@ -5,7 +5,6 @@ "map_file": "Blueshift.dmm", "shuttles": { "cargo": "cargo_nova", - "ferry": "ferry_nova", "whiteship": "whiteship_blueshift", "emergency": "emergency_nova" }, diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index b3605566b5ea..1f36125564c3 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -13412,7 +13412,7 @@ "Km" = ( /obj/docking_port/stationary{ dir = 8; - dwidth = 12; + dwidth = 10; height = 30; json_key = "ferry"; name = "CentCom Ferry Dock"; diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index e794e1a44627..769de2efb336 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -653,7 +653,7 @@ return "[SHUTTLE_DWIDTH_TOO_LARGE] [stationary_dock.dwidth] vs [dwidth]" if(width-dwidth > stationary_dock.width-stationary_dock.dwidth) - return SHUTTLE_WIDTH_TOO_LARGE + return "[SHUTTLE_WIDTH_TOO_LARGE] [stationary_dock.dwidth] vs [dwidth] + [width]" if(dheight > stationary_dock.dheight) return SHUTTLE_DHEIGHT_TOO_LARGE