cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12291 from Heroman3003/8330-fix

Browse Source 
8330 fix
This commit is contained in:
Casey
2022-02-19 17:32:34 -05:00
committed by CHOMPStation2
parent ddf594534e
commit 58a5611395
11 changed files with 1652 additions and 1198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/overmap/ships/landable.dm
View File

@@ -199,11 +199,10 @@
switch(status)
if(SHIP_STATUS_LANDED)
var/obj/effect/overmap/visitable/location = loc
if(istype(loc, /obj/effect/overmap/visitable/sector))
return "Landed on \the [location.name]. Use secondary thrust to get clear before activating primary engines."
if(istype(loc, /obj/effect/overmap/visitable/ship))
if(location.in_space)
return "Docked with \the [location.name]. Use secondary thrust to get clear before activating primary engines."
return "Docked with an unknown object."
else
return "Landed on \the [location.name]. Use secondary thrust to get clear before activating primary engines."
if(SHIP_STATUS_TRANSIT)
return "Maneuvering under secondary thrust."
if(SHIP_STATUS_OVERMAP)